diff options
| author | Someone <sergei.kozlukov@aalto.fi> | 2024-04-14 18:15:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 18:15:20 +0000 |
| commit | 446fee38c13f46d13d9d2afa56b4e7e50c255174 (patch) | |
| tree | 977fa466d9d2ff052eb1c0964107e8675c68584b /pkgs/applications/science/math | |
| parent | 91ff44d5dd20cb3e6e11af1e56754197d0695fd4 (diff) | |
| parent | 2c51064b0bb9e8ef60d4dab9bf7d26678114c24b (diff) | |
Merge pull request #301188 from SomeoneSerge/cudaPackages/rename-cudatoolkit
cudaPackages.cudatoolkit: replace with symlinkJoin
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/mxnet/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 25f7229a845ae..2a84d4b27b141 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -22,7 +22,7 @@ }: let - inherit (cudaPackages) cudatoolkit nccl; + inherit (cudaPackages) backendStdenv cudatoolkit nccl; # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "-DBLAS=open" ] ++ (if cudaSupport then [ "-DCUDA_ARCH_NAME=All" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" ] else [ "-DCPU_ONLY=ON" ]) ++ ["-DUSE_NCCL=${toggle ncclSupport}"] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 993da2b898981..839537438962b 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -5,7 +5,7 @@ }: let - inherit (cudaPackages) cudatoolkit cudaFlags cudnn; + inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn; in assert cudnnSupport -> cudaSupport; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ (if cudaSupport then [ "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; |