Develop #24

merged 9 commits into from Jan 20, 2012

2 participants


I've been developing the CLUtil library that builds on OpenCL.

There are several patches contained in this pull request as I'd like to get my fork back in sync with upstream.

  • I use the system-installed Framework on Mac OS X rather than the included headers. This covers both headers and libraries for mac builds.
  • I commented out the extra-libraries line in the test suite definition because it prevents cabal install from working on Macs. I think it is more likely someone wanting to run cabal test will be willing to unpack the source than the typical user who will just want to cabal install opencl. I did file a bug report about this on cabal-install's trac some time ago, and will try to follow up about getting it fixed (i.e. if --enable-tests is not set, the extra-libraries shouldn't matter).
  • I let clEnqueueNDRangeKernel take an empty list for the local work size argument. This is translated into passing OpenCL a null pointer for this argument, which, according to the spec, means "...the OpenCL implementation will determine how to be[sic] break the global work-items into appropriate work-group instances."
  • I fixed the test file to use the new clSetKernelArgSto.
  • I added an export for the CLMapFlag type and constructors as they are useful when mapping buffers.

I'm happy to further discuss any of these changes.

Anthony Cowley added some commits Dec 14, 2011
Anthony Cowley Added provisional Mac OS X support.
The Test-suite is problematic as we can't use a conditional to wrap the extra-libraries line. Moreover, the package won't build even when tests are not enabled! This requires that we comment out the extra-libraries line to build on Mac.
Anthony Cowley Added support for a NULL local_work_size parameter to let the OpenCL …
…implementation determine the global work-item breakdown.
Anthony Cowley Removed unnecessary framework link for test executable. 1a2cf11
Anthony Cowley Merged with upstream. a5dddae
Anthony Cowley Merge upstream develop. 22dd724
Anthony Cowley Fixed test.
Relaxed version constraints in cabal file.
Anthony Cowley Deleted merge files with old names. 92362d2
Anthony Cowley Simplified CPP #ifdef usage. dc7ab1b
Anthony Cowley Export CLMapFlag and constructors. 0779ce2
IFCA Advanced Computing and e-Science group member

Thanks, I'll test the changes and merge it. (I think that almost all of them)

@zhensydow zhensydow added a commit that referenced this pull request Jan 20, 2012
@zhensydow zhensydow refs #24: fix linux build a8023ae
@zhensydow zhensydow merged commit 0779ce2 into IFCA:develop Jan 20, 2012
IFCA Advanced Computing and e-Science group member

I simplified the os checks, to allow developers to change only the path it can check (darwin, windows or linux) without breaking the others.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment