diff --git a/Foreign/CUDA/Driver/Context.chs b/Foreign/CUDA/Driver/Context.chs --- a/Foreign/CUDA/Driver/Context.chs +++ b/Foreign/CUDA/Driver/Context.chs @@ -1,8 +1,10 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} +#if MIN_VERSION_base(4,7,0) +{-# LANGUAGE EmptyCase #-} +#endif -------------------------------------------------------------------------------- -- | -- Module : Foreign.CUDA.Driver.Context @@ -88,8 +90,10 @@ -- data PeerFlag instance Enum PeerFlag where +#if MIN_VERSION_base(4,7,0) toEnum x = case x of {} fromEnum x = case x of {} +#endif #if CUDA_VERSION >= 4000 diff --git a/Foreign/CUDA/Driver/Device.chs b/Foreign/CUDA/Driver/Device.chs --- a/Foreign/CUDA/Driver/Device.chs +++ b/Foreign/CUDA/Driver/Device.chs @@ -1,8 +1,10 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} +#if MIN_VERSION_base(4,7,0) +{-# LANGUAGE EmptyCase #-} +#endif -------------------------------------------------------------------------------- -- | -- Module : Foreign.CUDA.Driver.Device @@ -114,8 +116,10 @@ -- data InitFlag instance Enum InitFlag where +#if MIN_VERSION_base(4,7,0) toEnum x = case x of {} fromEnum x = case x of {} +#endif -------------------------------------------------------------------------------- diff --git a/Foreign/CUDA/Driver/Event.chs b/Foreign/CUDA/Driver/Event.chs --- a/Foreign/CUDA/Driver/Event.chs +++ b/Foreign/CUDA/Driver/Event.chs @@ -1,6 +1,5 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} -------------------------------------------------------------------------------- diff --git a/Foreign/CUDA/Driver/Stream.chs b/Foreign/CUDA/Driver/Stream.chs --- a/Foreign/CUDA/Driver/Stream.chs +++ b/Foreign/CUDA/Driver/Stream.chs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} -------------------------------------------------------------------------------- diff --git a/Foreign/CUDA/Runtime/Device.chs b/Foreign/CUDA/Runtime/Device.chs --- a/Foreign/CUDA/Runtime/Device.chs +++ b/Foreign/CUDA/Runtime/Device.chs @@ -1,9 +1,11 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} {-# OPTIONS_GHC -fno-warn-orphans #-} +#if MIN_VERSION_base(4,7,0) +{-# LANGUAGE EmptyCase #-} +#endif -------------------------------------------------------------------------------- -- | -- Module : Foreign.CUDA.Runtime.Device @@ -323,8 +325,10 @@ -- data PeerFlag instance Enum PeerFlag where +#if MIN_VERSION_base(4,7,0) toEnum x = case x of {} fromEnum x = case x of {} +#endif -- | -- Queries if the first device can directly access the memory of the second. If diff --git a/Foreign/CUDA/Runtime/Event.chs b/Foreign/CUDA/Runtime/Event.chs --- a/Foreign/CUDA/Runtime/Event.chs +++ b/Foreign/CUDA/Runtime/Event.chs @@ -1,6 +1,5 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} {-# LANGUAGE EmptyDataDecls #-} {-# LANGUAGE ForeignFunctionInterface #-} -------------------------------------------------------------------------------- diff --git a/Foreign/CUDA/Types.chs b/Foreign/CUDA/Types.chs --- a/Foreign/CUDA/Types.chs +++ b/Foreign/CUDA/Types.chs @@ -1,6 +1,9 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE EmptyCase #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE EmptyDataDecls #-} +#if MIN_VERSION_base(4,7,0) +{-# LANGUAGE EmptyCase #-} +#endif -------------------------------------------------------------------------------- -- | -- Module : Foreign.CUDA.Types @@ -103,8 +106,10 @@ -- data WaitFlag instance Enum WaitFlag where +#if MIN_VERSION_base(4,7,0) toEnum x = case x of {} fromEnum x = case x of {} +#endif -------------------------------------------------------------------------------- @@ -127,8 +132,10 @@ -- data StreamFlag instance Enum StreamFlag where +#if MIN_VERSION_base(4,7,0) toEnum x = case x of {} fromEnum x = case x of {} +#endif -- | -- The main execution stream. No operations overlap with operations in the diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -12,7 +12,7 @@ import Control.Exception import Control.Monad -import System.Exit +import System.Exit hiding (die) import System.FilePath import System.Directory import System.Environment diff --git a/changelog.md b/changelog.md new file mode 100644 --- /dev/null +++ b/changelog.md @@ -0,0 +1,26 @@ +0.6.6.1 + + * Build fixes for ghc-7.6 and ghc-7.10 + +0.6.6.0 + + * Drop support for CUDA 3.0 and older. + + * Combine the definition of the 'Event' and 'Stream' data types. As of + CUDA-3.1 these data structures are equivalent, and can be safely shared + between runtime and driver API calls and libraries. + + * Mark FFI imports of potentially long-running API functions as safe. This + allows them to be safely called from Haskell threads without blocking the + entire HEC. + + * Add compute-capability data for 3.7, 5.2 devices. + +0.6.5.1 + + * Build fix for Mac OS X 10.10 (Yosemite) + +0.6.5.0 + + * Add support for the CUDA-6.5 release + diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Haskell CUDA bindings 0.6.5.0. +# Generated by GNU Autoconf 2.69 for Haskell CUDA bindings 0.6.6.0. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Haskell CUDA bindings' PACKAGE_TARNAME='cuda' -PACKAGE_VERSION='0.6.5.0' -PACKAGE_STRING='Haskell CUDA bindings 0.6.5.0' +PACKAGE_VERSION='0.6.6.0' +PACKAGE_STRING='Haskell CUDA bindings 0.6.6.0' PACKAGE_BUGREPORT='tmcdonell@cse.unsw.edu.au' PACKAGE_URL='' @@ -1250,7 +1250,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Haskell CUDA bindings 0.6.5.0 to adapt to many kinds of systems. +\`configure' configures Haskell CUDA bindings 0.6.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1316,7 +1316,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Haskell CUDA bindings 0.6.5.0:";; + short | recursive ) echo "Configuration of Haskell CUDA bindings 0.6.6.0:";; esac cat <<\_ACEOF @@ -1403,7 +1403,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Haskell CUDA bindings configure 0.6.5.0 +Haskell CUDA bindings configure 0.6.6.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1751,7 +1751,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Haskell CUDA bindings $as_me 0.6.5.0, which was +It was created by Haskell CUDA bindings $as_me 0.6.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3156,7 +3156,7 @@ case $target in *mingw* ) - cuda_c2hsflags="--cppopts=-E --cppopts=-arch=sm_20 --cppopts="-D${target_os}_TARGET_OS=1" " + cuda_c2hsflags="--cpp="$NVCC" --cppopts=-E --cppopts=-arch=sm_20 --cppopts="-D${target_os}_TARGET_OS=1" " CPPFLAGS+=" "-D${target_os}_TARGET_OS=1" " ;; * ) @@ -3247,6 +3247,10 @@ $as_echo "no" >&6; } fi +# Also include any cabal generated macros in the CPP configuration step +# +cuda_c2hsflags+="--cppopts=-include=dist/build/autogen/cabal_macros.h " + # Make sure both the driver and runtime are found # longerror=' @@ -4411,7 +4415,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Haskell CUDA bindings $as_me 0.6.5.0, which was +This file was extended by Haskell CUDA bindings $as_me 0.6.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4464,7 +4468,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Haskell CUDA bindings config.status 0.6.5.0 +Haskell CUDA bindings config.status 0.6.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -5023,5 +5027,4 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,10 @@ AC_MSG_RESULT(no) fi +# Also include any cabal generated macros in the CPP configuration step +# +cuda_c2hsflags+="--cppopts=-include=dist/build/autogen/cabal_macros.h " + # Make sure both the driver and runtime are found # longerror=' diff --git a/cuda.cabal b/cuda.cabal --- a/cuda.cabal +++ b/cuda.cabal @@ -1,5 +1,5 @@ Name: cuda -Version: 0.6.6.0 +Version: 0.6.6.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 @@ -39,13 +39,14 @@ config.log autom4te.cache -Extra-source-files: configure - configure.ac +Extra-source-files: cbits/stubs.h + changelog.md config.guess config.sub - install-sh + configure + configure.ac cuda.buildinfo.in - cbits/stubs.h + install-sh Library Exposed-Modules: Foreign.CUDA