Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

pyopencl
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

b5018851

Commit b5018851 authored 10 years ago by Andreas Klöckner

Downloads
- Plain Diff

Merge branch 'master' into cffi

Conflicts:
	src/wrapper/wrap_cl.hpp
	test/test_wrapper.py

parents 71899eac 3adf4e2d

Branches

Tags

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/_templates/layout.html 1 addition, 1 deletion

doc/_templates/layout.html
pyopencl/__init__.py 4 additions, 4 deletions

pyopencl/__init__.py
pyopencl/array.py 27 additions, 7 deletions

pyopencl/array.py
pyopencl/clmath.py 21 additions, 13 deletions

pyopencl/clmath.py
pyopencl/elementwise.py 84 additions, 46 deletions

pyopencl/elementwise.py
pyopencl/tools.py 45 additions, 17 deletions

pyopencl/tools.py
test/test_array.py 7 additions, 0 deletions

test/test_array.py
test/test_clmath.py 36 additions, 1 deletion

test/test_clmath.py
test/test_wrapper.py 12 additions, 0 deletions

test/test_wrapper.py

with 237 additions and 89 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment