diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-17 07:08:22 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-19 12:47:30 +0300 |
| commit | 57f82de364d9f80914cfc63cbdfd8d3f731004b8 (patch) | |
| tree | a9b6f57fb703f2d71c36e8d707894cd907e1f38e /pkgs | |
| parent | 378bfba0236967aa3af336d686fb3f3b7950e7e4 (diff) | |
| download | nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar.gz nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar.bz2 nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar.lz nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar.xz nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.tar.zst nixlib-57f82de364d9f80914cfc63cbdfd8d3f731004b8.zip | |
caffe: 1.0-rc5 -> 1.0
Fix build with cudatoolkit9.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index cb28d38bf1d0..8dc3e3ce43dc 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -22,22 +22,23 @@ assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { name = "caffe-${version}"; - version = "1.0-rc5"; + version = "1.0"; src = fetchFromGitHub { owner = "BVLC"; repo = "caffe"; - rev = "rc5"; - sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c"; + rev = version; + sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ] - ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON" - ++ lib.optional (!pythonSupport) "-DBUILD_python=OFF"; + cmakeFlags = [ + "-DCUDA_ARCH_NAME=All" + (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] ++ lib.optional cudaSupport cudatoolkit @@ -49,6 +50,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out"]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle + preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' + # CUDA 9.0 doesn't support sm_20 + sed -i 's,20 21(20) ,,' cmake/Cuda.cmake + '' + lib.optionalString (python.isPy3 or false) '' + sed -i \ + -e 's,"python-py''${boost_py_version}",python3,g' \ + -e 's,''${Boost_PYTHON-PY''${boost_py_version}_FOUND},''${Boost_PYTHON3_FOUND},g' \ + cmake/Dependencies.cmake + ''; + postInstall = '' # Internal static library. rm $out/lib/libproto.a |