cuda 0.8.0.0 → 0.8.0.1
raw patch · 3 files changed
+18/−5 lines, 3 filessetup-changed
Files
- CHANGELOG.markdown +6/−1
- Setup.hs +10/−2
- cuda.cabal +2/−2
CHANGELOG.markdown view
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). +## [0.8.0.1] - 2017-10-24+### Fixed+ * [#50] Escape backslashes used in -D flags on Windows+ ## [0.8.0.0] - 2017-08-24 ### Changed * Tested with CUDA toolkit 8.0@@ -88,7 +92,7 @@ * Add functions from CUDA-6.5 -[unreleased]: https://github.com/tmcdonell/cuda/compare/0.8.0.0...HEAD+[0.8.0.1]: https://github.com/tmcdonell/cuda/compare/0.8.0.0...0.8.0.1 [0.8.0.0]: https://github.com/tmcdonell/cuda/compare/0.7.5.3...0.8.0.0 [0.7.5.3]: https://github.com/tmcdonell/cuda/compare/0.7.5.2...0.7.5.3 [0.7.5.2]: https://github.com/tmcdonell/cuda/compare/0.7.5.1...0.7.5.2@@ -107,4 +111,5 @@ [#44]: https://github.com/tmcdonell/cuda/issues/44 [#45]: https://github.com/tmcdonell/cuda/issues/45 [#47]: https://github.com/tmcdonell/cuda/pull/47+[#50]: https://github.com/tmcdonell/cuda/pull/50
Setup.hs view
@@ -109,6 +109,10 @@ let pkg_descr' = updatePackageDescription actualBuildInfoToUse pkg_descr postConf simpleUserHooks args flags pkg_descr' lbi +escBackslash :: FilePath -> FilePath+escBackslash [] = []+escBackslash ('\\':fs) = '\\' : '\\' : escBackslash fs+escBackslash (f:fs) = f : escBackslash fs -- Generates build info with flags needed for CUDA Toolkit to be properly -- visible to underlying build tools.@@ -119,10 +123,14 @@ libraryPath = cudaLibraryPath platform installPath includePath = cudaIncludePath platform installPath + -- OS-specific escaping for -D path defines+ escDefPath | os == Windows = escBackslash+ | otherwise = id+ -- options for GHC extraLibDirs' = [ libraryPath ]- ccOptions' = [ "-DCUDA_INSTALL_PATH=\"" ++ installPath ++ "\""- , "-DCUDA_LIBRARY_PATH=\"" ++ libraryPath ++ "\""+ ccOptions' = [ "-DCUDA_INSTALL_PATH=\"" ++ escDefPath installPath ++ "\""+ , "-DCUDA_LIBRARY_PATH=\"" ++ escDefPath libraryPath ++ "\"" , "-I" ++ includePath ] ldOptions' = [ "-L" ++ libraryPath ] ghcOptions = map ("-optc"++) ccOptions'
cuda.cabal view
@@ -1,5 +1,5 @@ Name: cuda-Version: 0.8.0.0+Version: 0.8.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@@ -181,7 +181,7 @@ source-repository this type: git location: https://github.com/tmcdonell/cuda- tag: 0.8.0.0+ tag: 0.8.0.1 -- vim: nospell