Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

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

Snippets Groups Projects

0f89c369

Commit 0f89c369 authored 10 years ago by Andreas Klöckner

Downloads
- Plain Diff

Merge branch 'master' into cffi

Conflicts:
	setup.py

parents 97103453 aaf35ede

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pyopencl/array.py 29 additions, 0 deletions

pyopencl/array.py
pyopencl/cache.py 5 additions, 6 deletions

pyopencl/cache.py
pyopencl/scan.py 3 additions, 3 deletions

pyopencl/scan.py
pyopencl/tools.py 4 additions, 0 deletions

pyopencl/tools.py
setup.cfg 1 addition, 1 deletion

setup.cfg
setup.py 2 additions, 0 deletions

setup.py

with 44 additions and 10 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