Build fixes and other critical fixes.

axman6 · Aug 1, 2011 · ad65c8f · ad65c8f
1 parent 2ece93e
commit ad65c8f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 45 deletions.
diff --git a/OpenCLRaw.cabal b/OpenCLRaw.cabal
@@ -6,7 +6,6 @@ license: BSD3
 license-file: LICENSE
 copyright: Renaissance Computing Institute
 maintainer: J.R. Heard
-build-depends: base <= 4.1.0.0, bytestring -any, mtl -any
 stability: Experimental
 homepage: http://vis.renci.org/jeff/opencl
 package-url:
@@ -26,46 +25,46 @@ description: The OpenCL system for open heterogenous data parallel supercomputin
 
 category: Graphics
 author: J.R. Heard
-tested-with:
-data-files:
-data-dir: ""
-extra-source-files: 
-extra-tmp-files:
-exposed-modules: System.OpenCL.Raw.V10.CommandQueue
-                 System.OpenCL.Raw.V10.Context
-                 System.OpenCL.Raw.V10.DeviceInfo
-                 System.OpenCL.Raw.V10.Errors
-                 System.OpenCL.Raw.V10.Etc
-                 System.OpenCL.Raw.V10.EventObject
-                 System.OpenCL.Raw.V10.FlushFinish
-                 System.OpenCL.Raw.V10.Kernel
-                 System.OpenCL.Raw.V10.MemoryObject
-                 System.OpenCL.Raw.V10.OutOfOrder
-                 System.OpenCL.Raw.V10.PlatformInfo
-                 System.OpenCL.Raw.V10.ProgramObject
-                 System.OpenCL.Raw.V10.Sampler
-                 System.OpenCL.Raw.V10.Types
-                 System.OpenCL.Raw.V10
-exposed: True
-buildable: True
-build-tools:
-cpp-options:
-cc-options:
-ld-options:
-pkgconfig-depends:
-frameworks:
-c-sources:
-extensions:
-extra-libraries:
-extra-lib-dirs:
-includes:
-install-includes:
-include-dirs:
-hs-source-dirs: .
-other-modules: System.OpenCL.Raw.V10.Utils
-ghc-prof-options:
-ghc-shared-options:
-ghc-options:
-hugs-options:
-nhc98-options:
-jhc-options:
+
+Library
+  exposed-modules: System.OpenCL.Raw.V10.CommandQueue
+                   System.OpenCL.Raw.V10.Context
+                   System.OpenCL.Raw.V10.DeviceInfo
+                   System.OpenCL.Raw.V10.Errors
+                   System.OpenCL.Raw.V10.Etc
+                   System.OpenCL.Raw.V10.EventObject
+                   System.OpenCL.Raw.V10.FlushFinish
+                   System.OpenCL.Raw.V10.Kernel
+                   System.OpenCL.Raw.V10.MemoryObject
+                   System.OpenCL.Raw.V10.OutOfOrder
+                   System.OpenCL.Raw.V10.PlatformInfo
+                   System.OpenCL.Raw.V10.ProgramObject
+                   System.OpenCL.Raw.V10.Sampler
+                   System.OpenCL.Raw.V10.Types
+                   System.OpenCL.Raw.V10
+  build-depends: base <= 4.4,
+                 bytestring -any,
+                 mtl >= 2 && < 2.1
+  exposed: True
+  buildable: True
+  build-tools:
+  cpp-options:
+  cc-options:
+  ld-options:
+  pkgconfig-depends:
+  frameworks:
+  c-sources:
+  extensions:
+  extra-libraries:
+  extra-lib-dirs:
+  includes:
+  install-includes:
+  include-dirs:
+  hs-source-dirs: .
+  other-modules: System.OpenCL.Raw.V10.Utils
+  ghc-prof-options:
+  ghc-shared-options:
+  ghc-options:
+  hugs-options:
+  nhc98-options:
+  jhc-options:
diff --git a/System/OpenCL/Raw/V10/Kernel.hs b/System/OpenCL/Raw/V10/Kernel.hs
@@ -6,6 +6,7 @@ module System.OpenCL.Raw.V10.Kernel
     ,clRetainKernel
     ,clReleaseKernel
     ,clGetKernelInfo
+    ,clSetKernelArg
     ,clGetKernelWorkGroupInfo
     ,clEnqueueNDRangeKernel
     ,clEnqueueTask

diff --git a/System/OpenCL/Raw/V10/Utils.hs b/System/OpenCL/Raw/V10/Utils.hs
@@ -31,7 +31,7 @@ wrapGetInfo raw_infoFn param_size = alloca $ \value_size_ret -> do
 
 
 nest :: [(r -> a) -> a] -> ([r] -> a) -> a
-nest xs = runCont (sequence (map Cont xs))
+nest xs = runCont (sequence (map cont xs))
 
 withCStringArray0 :: [String] -> (Ptr CString -> IO a) -> IO a
 withCStringArray0 strings act = nest (map withCString strings)