diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-31 06:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 06:00:58 +0000 |
| commit | 97868dae8e43d4d915e232649acf575bad87e0f6 (patch) | |
| tree | 76d0d720c57c069f3ea70300a9812001cd2f50c4 /pkgs/applications/science/math | |
| parent | 135430eb607cd5775d31287c4c233dc78cdd52e0 (diff) | |
| parent | 04ba740f89b23001077df136c216a885371533ad (diff) | |
| download | nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar.gz nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar.bz2 nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar.lz nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar.xz nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.tar.zst nixlib-97868dae8e43d4d915e232649acf575bad87e0f6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/math/mxnet/default.nix | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 5af927294d6c..42c160393595 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,12 +1,13 @@ { config, stdenv, lib , fetchFromGitHub , fetchurl +, fetchpatch , cmake , boost , gflags , glog , hdf5-cpp -, opencv3 +, opencv4 , protobuf , doxygen , blas @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + (fetchpatch { + name = "support-opencv4"; + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; + }) ] ++ lib.optional pythonSupport (substituteAll { src = ./python.patch; inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy @@ -148,7 +154,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; - broken = pythonSupport && (python.isPy310); + broken = (pythonSupport && (python.isPy310)) || cudaSupport; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d65de87d8eb9..993da2b89898 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake -, opencv3, gtest, blas, gomp, llvmPackages, perl +, opencv4, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest blas.provider ] + buildInputs = [ opencv4 gtest blas.provider ] ++ lib.optional stdenv.cc.isGNU gomp ++ lib.optional stdenv.cc.isClang llvmPackages.openmp # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib |