Commit Graph

5830 Commits

Author SHA1 Message Date
Jerome Kieffer 714700838a This is ongoing work on tests... 2012-06-28 22:08:55 +02:00
Jerome Kieffer 4ed2a4b90b Allow variable pixel area in solid angle 2012-06-28 21:54:23 +02:00
Jerome Kieffer bd35649857 Should write some testing on the mask stuff 2012-06-28 21:53:51 +02:00
Jerome Kieffer 4bb8a0884e Port new masking to Cython, 2D as well 2012-06-28 21:53:30 +02:00
Jerome Kieffer 3cf889159a Merge pull request #6 from dkarkoulis/master
Synced your commits on setup.py and my commits on OpenCL
2012-06-28 11:28:16 -07:00
Jerome Kieffer 113cf6aa01 Merge branch 'master', remote branch 'origin' 2012-06-27 16:08:55 +02:00
Dimitris Karkoulis 5e9df1bcf8 Merged Jerome's updates which implement changes on setup.py
with my Master that has updated comments in the OpenCL code.
2012-06-26 21:48:18 +02:00
Jerome Kieffer e12d7064f3 remove old kernel (unused) 2012-06-26 18:58:21 +02:00
Jerome Kieffer de526a5485 Update setup.py 2012-06-26 18:57:39 +02:00
Dimitris Karkoulis 5db8f0d375 Merge branches 'oclazim_clog' and 'master' 2012-06-26 17:26:13 +02:00
Dimitris Karkoulis 0de1eda30e Updated comments 2012-06-26 17:22:52 +02:00
Jerome Kieffer ccf4ade68f Merge remote branch 'dimitris/oclazim_clog' 2012-06-26 14:35:34 +02:00
Dimitris Karkoulis e61b6e4804 fixed setup.py in both parent and openCL/. benchmark.py works without modifcation of ocl_azim.pyx. 2012-06-26 00:02:30 +02:00
Dimitris Karkoulis c35903b663 Few fixes 2012-06-25 19:28:29 +02:00
Dimitris Karkoulis e7238fa162 Few fixes on logs and the toolbox
Comments need to be updated
2012-06-25 02:10:40 +02:00
Dimitris Karkoulis 8442abc50c removed unused var and updated setup.py (to be checked) 2012-06-24 23:54:58 +02:00
Dimitris Karkoulis a1a5d284dd Added config report for cLog 2012-06-24 23:46:42 +02:00
Dimitris Karkoulis 0e43e89a09 Replaced stream write with a logger.
New contructor added for each class.
The old constructors, if called as before, will
default to printing all the messages:
-stdout for default constructor
-file fname for (fname) constructor if fname is not
NULL, stdout or stderr.
2012-06-24 18:23:02 +02:00
Dimitris Karkoulis 69b0ee5170 Reverted pfn_notify 2012-06-23 22:09:55 +02:00
Dimitris Karkoulis 60324256f6 Fixed solidange - dummyvalue order bug 2012-06-22 14:00:23 +02:00
Jerome Kieffer 4ef22f2cf0 Merge branch 'master', remote branch 'origin' 2012-06-22 13:09:20 +02:00
Dimitris Karkoulis 56f8a828f8 Fixed ocl_compiler problems in Windows.
Tested in Win 7 x64
2012-06-21 22:37:54 +02:00
Jerome Kieffer bc8dfba5ff Merge branch 'master', remote-tracking branch 'origin' 2012-06-21 19:04:05 +02:00
Jerome Kieffer 5162a4aff4 Merge pull request #4 from dkarkoulis/master
Merged ...
change ref-count
2012-06-21 07:38:08 -07:00
Dimitris Karkoulis 581088306a Forgot to remove refcount from within ocl_tools. 2012-06-21 15:30:05 +02:00
Dimitris Karkoulis c3d9d00141 Merged Jerome's interface fixes.
Added a few comments
2012-06-21 14:31:00 +02:00
Jerome Kieffer 802d8a254a fix & updated interface C++ -> Cython -> Python 2012-06-21 13:36:15 +02:00
Jerome Kieffer fc71ff362f integrating patches from dimitris 2012-06-21 13:49:30 +02:00
Jerome Kieffer 5c41d06821 Merge pull request #3 from dkarkoulis/master
Tidying up the OpenCL implementation lib.
I will pythonize a bit the interface.
2012-06-21 01:29:37 -07:00
Dimitris Karkoulis 2ac8dc8eeb Housekeeping: Placed the new functions in their place and rearranged …
…a few things.

Some small changes on the ocl_base header, cython interface updated accordingly.

Fixed warnings from Visual Studio (11) as well
2012-06-21 00:36:22 +02:00
Jerome Kieffer 7441b09a11 incorporate the latest changes from C++ class in cython/python 2012-06-20 21:47:03 +02:00
Jerome Kieffer 6de82f5f26 Merge pull request #2 from dkarkoulis/master
I will fix the cython wrapper
2012-06-20 11:04:56 -07:00
Dimitris Karkoulis f0dfadbfc6 Fixed warnings of ocl_tools.cc
Added functionality for ocl_tools and ocl_base to report information on current device and platform and also the (Platform.Device) pair
Small fixes in 1D kernel (SVN 260)
2012-06-20 18:14:41 +02:00
Jerome Kieffer 9b8f9fb2d6 Merge remote branch 'origin/master' 2012-06-20 15:11:54 +02:00
Jerome Kieffer ab0ec3b2d3 ensure platformid and deviceid are sent correctly 2012-06-20 15:11:12 +02:00
Jerome Kieffer adab79e6fb Merge branch 'master', remote branch 'origin' 2012-06-20 09:15:24 +02:00
Jerome Kieffer 39ec9ae1bc implement lastest modification by Dimitris (SVN 259) 2012-06-19 21:42:43 +02:00
Jerome Kieffer dfb41e8713 Test for bug in CPU opencl implementation (intel, amd) 2012-06-18 22:07:08 +02:00
Jerome Kieffer ded0ad21f1 check results from GPU vs CPU 2012-06-18 22:06:18 +02:00
Jerome Kieffer 8be35880f8 Merge branch 'master', remote branch 'origin' 2012-06-18 17:02:41 +02:00
Jerome Kieffer 97b1aa151b don't quit when one bench fails:
helps debugging with the bug specific to pilatus 1M images
2012-06-18 17:01:18 +02:00
Jerome Kieffer 9dbf3d60cc freshly cythonized 2012-06-18 16:59:06 +02:00
Jerome Kieffer 827089ae98 Merge branch 'master', remote branch 'origin' 2012-06-18 16:51:51 +02:00
Jerome Kieffer cd685c09d7 freshly compiled from cython 2012-06-18 16:47:58 +02:00
Jerome Kieffer cd5ed9a524 Merge branch 'master', remote branch 'origin' 2012-06-18 15:57:45 +02:00
Jerome Kieffer bf504af6f0 Enhancement of the benchmark 2012-06-18 15:56:38 +02:00
Jerome Kieffer f7f72ad84c Some files for benchmarking pyFAI (no images ... see in tarball) 2012-06-17 22:14:25 +02:00
Jerome Kieffer ac2d2de48e Merge branch 'master', remote-tracking branch 'origin' 2012-06-17 17:29:26 +02:00
Jerome Kieffer f4ab952bde fix numpy based histogram ... for now 2012-06-15 17:21:00 +02:00
Jerome Kieffer 4f109c354a remove commented out code 2012-06-14 23:33:55 +02:00