diff options
author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-03-31 15:56:07 +0300 |
---|---|---|
committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-07-20 17:27:07 +0300 |
commit | 74549ec63bb6b125590bbb0fa2db24106c257a11 (patch) | |
tree | ec5b41395a0ef07adf0c7607a6ef691e15ac9043 | |
parent | 4fafb3b90b877263bf7674a77ed7be6cd235f5e1 (diff) |
tree-wide: 'enableCuda ? false' -> 'config.cudaSupport or false' to respect global defaults
-rw-r--r-- | pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/elpa/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/science/chemistry/openmm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/ucc/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/katago/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/compression/zfp/default.nix | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d08c15dd8a6a..fe7a0030175b 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit , singlePrec ? true +, config , enableMpi ? false -, enableCuda ? false +, enableCuda ? config.cudaSupport or false , cpuAcceleration ? null }: diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 65e83437f6ba..73ebf218ee38 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -4,10 +4,11 @@ , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support , avx512Support ? stdenv.hostPlatform.avx512Support +, config # Enable NIVIA GPU support # Note, that this needs to be built on a system with a GPU # present for the tests to succeed. -, enableCuda ? false +, enableCuda ? config.cudaSupport or false # type of GPU architecture , nvidiaArch ? "sm_60" , cudatoolkit diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index fbef44bf67ea..8159f31bbbb5 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -2,7 +2,8 @@ , x11Support ? false , libX11 , cairo -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport or false , cudaPackages }: diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 2ad84249758a..8b25554c4ab1 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -11,7 +11,8 @@ , enableOpencl ? true , opencl-headers , ocl-icd -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport or false , cudaPackages , addOpenGLRunpath }: diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix index 56cebc08dccc..1c1804e9004c 100644 --- a/pkgs/development/libraries/ucc/default.nix +++ b/pkgs/development/libraries/ucc/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport or false , cudatoolkit , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index cc49d6338a66..3d0b5a141c3c 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -1,6 +1,7 @@ { stdenv , boost , cmake +, config , cudaPackages , eigen , fetchFromGitHub @@ -14,7 +15,7 @@ , openssl , writeShellScriptBin , enableAVX2 ? stdenv.hostPlatform.avx2Support -, backend ? "opencl" +, backend ? if (config.cudaSupport or false) then "cuda" else "opencl" , enableBigBoards ? false , enableContrib ? false , enableTcmalloc ? true diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 2d3890484e79..487cd02eb59c 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,6 +1,7 @@ { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv +, config , enableCfp ? true -, enableCuda ? false +, enableCuda ? config.cudaSupport or false , enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true |