cuda 0.6.0.0 → 0.6.0.1
raw patch · 5 files changed
+38/−18 lines, 5 files
Files
- Foreign/CUDA/Ptr.hs +12/−2
- configure +17/−12
- configure.ac +7/−3
- cuda.buildinfo.in +1/−0
- cuda.cabal +1/−1
Foreign/CUDA/Ptr.hs view
@@ -24,7 +24,7 @@ -------------------------------------------------------------------------------- -- |--- A reference to data stored on the device+-- A reference to data stored on the device. -- newtype DevicePtr a = DevicePtr { useDevicePtr :: Ptr a } deriving (Eq,Ord)@@ -118,7 +118,17 @@ -------------------------------------------------------------------------------- -- |--- A reference to page-locked host memory+-- A reference to page-locked host memory.+--+-- A 'HostPtr' is just a plain 'Ptr', but the memory has been allocated by the+-- CUDA runtime into page locked memory. This means that the data can be copied+-- to the GPU via DMA (direct memory access). Note that the use of the system+-- function `mlock` is not sufficient here --- the CUDA version ensures that+-- the /physical/ addresses stay this same, not just the virtual address.+--+-- To copy data into a 'HostPtr' array, you may use for example 'withHostPtr'+-- together with 'Foreign.Marshal.Array.copyArray' or+-- 'Foreign.Marshal.Array.moveArray'. -- newtype HostPtr a = HostPtr { useHostPtr :: Ptr a } deriving (Eq,Ord)
configure view
@@ -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.5.1.0.+# Generated by GNU Autoconf 2.69 for Haskell CUDA bindings 0.6.0.0. # # Report bugs to <tmcdonell@cse.unsw.edu.au>. #@@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Haskell CUDA bindings' PACKAGE_TARNAME='cuda'-PACKAGE_VERSION='0.5.1.0'-PACKAGE_STRING='Haskell CUDA bindings 0.5.1.0'+PACKAGE_VERSION='0.6.0.0'+PACKAGE_STRING='Haskell CUDA bindings 0.6.0.0' PACKAGE_BUGREPORT='tmcdonell@cse.unsw.edu.au' PACKAGE_URL='' @@ -625,6 +625,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS cuda_frameworks+cuda_libraries cuda_lib_path cuda_c2hsflags cuda_ldflags@@ -1248,7 +1249,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.5.1.0 to adapt to many kinds of systems.+\`configure' configures Haskell CUDA bindings 0.6.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1314,7 +1315,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in- short | recursive ) echo "Configuration of Haskell CUDA bindings 0.5.1.0:";;+ short | recursive ) echo "Configuration of Haskell CUDA bindings 0.6.0.0:";; esac cat <<\_ACEOF @@ -1401,7 +1402,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF-Haskell CUDA bindings configure 0.5.1.0+Haskell CUDA bindings configure 0.6.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc.@@ -1703,7 +1704,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.5.1.0, which was+It was created by Haskell CUDA bindings $as_me 0.6.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@@@ -3113,7 +3114,7 @@ darwin*) cuda_lib_path="${cuda_prefix}/lib" cuda_frameworks="CUDA"- LDFLAGS+=" -F/Library/Frameworks -framework ${cuda_frameworks}"+ LDFLAGS+=" -F/Library/Frameworks " #LDFLAGS+=" -Xlinker -rpath ${cuda_lib_path} " #CPPFLAGS+=" -arch ${target_cpu} " ;;@@ -3726,8 +3727,7 @@ # Populate the buildinfo, with the search paths and any target specific options # cuda_ccflags="$CPPFLAGS "-cuda_ldflags="$LDFLAGS $LIBS "-+cuda_ldflags="$LDFLAGS " for x in $cuda_ccflags; do cuda_ghcflags+="-optc${x} "@@ -3735,6 +3735,9 @@ for x in $cuda_ldflags; do cuda_ghcflags+="-optl${x} " done+for x in $LIBS; do+ cuda_libraries+="${x#-l} "+done @@ -3742,6 +3745,7 @@ + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure@@ -4284,7 +4288,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.5.1.0, which was+This file was extended by Haskell CUDA bindings $as_me 0.6.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES@@ -4337,7 +4341,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.5.1.0+Haskell CUDA bindings config.status 0.6.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4896,4 +4900,5 @@ { $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+
configure.ac view
@@ -39,7 +39,7 @@ darwin*) cuda_lib_path="${cuda_prefix}/lib" cuda_frameworks="CUDA"- LDFLAGS+=" -F/Library/Frameworks -framework ${cuda_frameworks}"+ LDFLAGS+=" -F/Library/Frameworks " #LDFLAGS+=" -Xlinker -rpath ${cuda_lib_path} " #CPPFLAGS+=" -arch ${target_cpu} " ;;@@ -121,8 +121,7 @@ # Populate the buildinfo, with the search paths and any target specific options # cuda_ccflags="$CPPFLAGS "-cuda_ldflags="$LDFLAGS $LIBS "-+cuda_ldflags="$LDFLAGS " for x in $cuda_ccflags; do cuda_ghcflags+="-optc${x} "@@ -130,11 +129,16 @@ for x in $cuda_ldflags; do cuda_ghcflags+="-optl${x} " done+for x in $LIBS; do+ cuda_libraries+="${x#-l} "+done AC_SUBST([cuda_ghcflags]) AC_SUBST([cuda_ccflags]) AC_SUBST([cuda_ldflags]) AC_SUBST([cuda_c2hsflags]) AC_SUBST([cuda_lib_path])+AC_SUBST([cuda_libraries]) AC_SUBST([cuda_frameworks]) AC_OUTPUT+
cuda.buildinfo.in view
@@ -3,4 +3,5 @@ ld-options: @cuda_ldflags@ x-extra-c2hs-options: @cuda_c2hsflags@ extra-lib-dirs: @cuda_lib_path@+extra-libraries: @cuda_libraries@ frameworks: @cuda_frameworks@
cuda.cabal view
@@ -1,5 +1,5 @@ Name: cuda-Version: 0.6.0.0+Version: 0.6.0.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