diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-17 06:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 06:01:30 +0000 |
| commit | 05ca3d828558e6948955cc9f4de79400a1186a75 (patch) | |
| tree | c3af5f3fc40f6a76d5a4cc4a9c8d4b70303a9200 /pkgs/applications/science | |
| parent | 30b97b0e835b1ac4404fa0ef28df0b199f5d9b93 (diff) | |
| parent | 8392158289e7d1a801905bc4195983f1b7434770 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/mxnet/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 9a1b550d882d9..dcba888ce2fb1 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -2,11 +2,10 @@ , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 , cudnnSupport ? cudaSupport -, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ] }: let - inherit (cudaPackages) cudatoolkit cudnn; + inherit (cudaPackages) cudatoolkit cudaFlags cudnn; in assert cudnnSupport -> cudaSupport; @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}" + "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; |