diff --git a/Foreign/CUDA/Analysis/Device.chs b/Foreign/CUDA/Analysis/Device.chs --- a/Foreign/CUDA/Analysis/Device.chs +++ b/Foreign/CUDA/Analysis/Device.chs @@ -91,6 +91,7 @@ -- | -- Extract some additional hardware resource limitations for a given device +-- TLM: default to highest compute capability, when no specific data available? -- resources :: DeviceProperties -> DeviceResources resources dev = fromMaybe err (lookup compute gpuData) @@ -105,5 +106,6 @@ ,(1.2, DeviceResources 32 1024 8 32 16384 512 16384 512 2 Block) ,(1.3, DeviceResources 32 1024 8 32 16384 512 16384 512 2 Block) ,(2.0, DeviceResources 32 1536 8 48 49152 128 32768 64 1 Warp) + ,(2.1, DeviceResources 32 1536 8 48 49152 128 32768 64 1 Warp) ] diff --git a/Foreign/CUDA/Internal/C2HS.hs b/Foreign/CUDA/Internal/C2HS.hs --- a/Foreign/CUDA/Internal/C2HS.hs +++ b/Foreign/CUDA/Internal/C2HS.hs @@ -61,9 +61,8 @@ hiding (Word) -- Should also hide the Foreign.Marshal.Pool exports in -- compilers that export them -import CForeign - -import Monad (liftM) +import Foreign.C +import Control.Monad (liftM) -- Composite marshalling functions diff --git a/cuda.cabal b/cuda.cabal --- a/cuda.cabal +++ b/cuda.cabal @@ -1,5 +1,5 @@ Name: cuda -Version: 0.3.2 +Version: 0.3.2.1 Synopsis: FFI binding to the CUDA interface for programming NVIDIA GPUs Description: The CUDA library provides a direct, general purpose C-like SPMD programming @@ -35,7 +35,7 @@ License: BSD3 License-file: LICENSE -Copyright: Copyright (c) [2009..2010]. Trevor L. McDonell +Copyright: Copyright (c) [2009..2011]. Trevor L. McDonell Author: Trevor L. McDonell Maintainer: Trevor L. McDonell Category: Foreign @@ -86,7 +86,7 @@ C-sources: cbits/stubs.c Build-tools: c2hs >= 0.16, hsc2hs - Build-depends: base >= 3 && < 5, haskell98, bytestring, extensible-exceptions + Build-depends: base >= 3 && < 5, bytestring, extensible-exceptions Extensions: ghc-options: -Wall -O2