cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: consume config.cudaSupport as required

Browse source 
Eliminate uses of `config.cudaSupport or false` and alike, since the
option is now declared in config.nix with a default value

fd .nix -t f -x sed 's/config\.cudaSupport or false, cudaPackages [?] [{][}]/config.cudaSupport, cudaPackages ? { }/' '{}' -i
fd .nix -t f -x sed 's/config\.cudaSupport or false/config.cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = pkgs.config.cudaSupport/inherit (pkgs.config) cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = config.cudaSupport/inherit (config) cudaSupport/' '{}' -i
This commit is contained in:
Someone Serge 2023-07-20 18:08:19 +03:00
parent 133993211b
commit 471dbe9bcf
No known key found for this signature in database
GPG key ID: 7B0E3B1390D61DA4
44 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/graphics/digikam/default.nix
View file

@ -54,7 +54,7 @@
, breeze-icons
, oxygen
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
}:

2
pkgs/applications/misc/blender/default.nix
View file

@ -5,7 +5,7 @@
, openvdb, libXxf86vm, tbb, alembic
, zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
, cudaSupport ? config.cudaSupport, cudaPackages ? { }
, hipSupport ? false, hip # comes with a significantly larger closure size
, colladaSupport ? true, opencollada
, spaceNavSupport ? stdenv.isLinux, libspnav

2
pkgs/applications/science/math/caffe/default.nix
View file

@ -13,7 +13,7 @@
, Accelerate, CoreGraphics, CoreVideo
, lmdbSupport ? true, lmdb
, leveldbSupport ? true, leveldb, snappy
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
, cudaSupport ? config.cudaSupport, cudaPackages ? { }
, cudnnSupport ? cudaSupport
, ncclSupport ? false
, pythonSupport ? false, python ? null, numpy ? null

2
pkgs/applications/science/math/cntk/default.nix
View file

@ -3,7 +3,7 @@
, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
, onebitSGDSupport ? false
, config
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11
, cudaSupport ? config.cudaSupport, cudaPackages ? { }, addOpenGLRunpath, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport
}:

2
pkgs/applications/science/math/mathematica/default.nix
View file

@ -2,7 +2,7 @@
, config
, lib
, cudaPackages
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, lang ? "en"
, webdoc ? false
, version ? null

2
pkgs/applications/science/math/mxnet/default.nix
View file

@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, fetchpatch, bash, cmake
, opencv3, gtest, blas, gomp, llvmPackages, perl
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11
, cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11
, cudnnSupport ? cudaSupport
}:

2
pkgs/applications/science/misc/colmap/default.nix
View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen,
freeimage, glog, libGLU, glew, qtbase,
config,
cudaSupport ? config.cudaSupport or false, cudaPackages }:
cudaSupport ? config.cudaSupport, cudaPackages }:
assert cudaSupport -> cudaPackages != { };

2
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View file

@ -2,7 +2,7 @@
, singlePrec ? true
, config
, enableMpi ? false
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cpuAcceleration ? null
}:

2
pkgs/development/libraries/arrayfire/default.nix
View file

@ -20,7 +20,7 @@
, doxygen
, buildDocs ? false
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudatoolkit
, darwin
}:

2
pkgs/development/libraries/elpa/default.nix
View file

@ -8,7 +8,7 @@
# Enable NIVIA GPU support
# Note, that this needs to be built on a system with a GPU
# present for the tests to succeed.
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
# type of GPU architecture
, nvidiaArch ? "sm_60"
, cudatoolkit

2
pkgs/development/libraries/frei0r/default.nix
View file

@ -7,7 +7,7 @@
, opencv
, pcre
, pkg-config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages
}:

2
pkgs/development/libraries/hwloc/default.nix
View file

@ -3,7 +3,7 @@
, libX11
, cairo
, config
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cudaPackages
}:

2
pkgs/development/libraries/librealsense/default.nix
View file

@ -13,7 +13,7 @@
, glfw
, libGLU
, curl
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
, cudaSupport ? config.cudaSupport, cudaPackages ? { }
, enablePython ? false, pythonPackages ? null
, enableGUI ? false,
}:

2
pkgs/development/libraries/lightgbm/default.nix
View file

@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true
, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false
, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false
, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }:
assert doCheck -> mpiSupport != true;

2
pkgs/development/libraries/mlt/default.nix
View file

@ -21,7 +21,7 @@
, sox
, vid-stab
, darwin
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
, enableJackrack ? stdenv.isLinux
, ladspa-sdk

2
pkgs/development/libraries/nvidia-thrust/default.nix
View file

@ -8,7 +8,7 @@
, symlinkJoin
, tbb
, hostSystem ? "CPP"
, deviceSystem ? if config.cudaSupport or false then "CUDA" else "OMP"
, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP"
}:
# Policy for device_vector<T>

2
pkgs/development/libraries/opencv/3.x.nix
View file

@ -14,7 +14,7 @@
, enableOpenblas ? true, openblas, blas, lapack
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false) &&
, enableCuda ? config.cudaSupport &&
stdenv.hostPlatform.isx86_64
, cudaPackages ? { }
, enableUnfree ? false

2
pkgs/development/libraries/opencv/4.x.nix
View file

@ -37,7 +37,7 @@
, blas
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64
, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64
, enableCublas ? enableCuda
, enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default
, enableCufft ? enableCuda

2
pkgs/development/libraries/openmpi/default.nix
View file

@ -3,7 +3,7 @@
, libpsm2, libfabric, pmix, ucx
, config
# Enable CUDA support
, cudaSupport ? config.cudaSupport or false, cudatoolkit
, cudaSupport ? config.cudaSupport, cudatoolkit
# Enable the Sun Grid Engine bindings
, enableSGE ? false

2
pkgs/development/libraries/opensubdiv/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU
, libGL, glew, ocl-icd, python3
, cudaSupport ? config.cudaSupport or false, cudatoolkit
, cudaSupport ? config.cudaSupport, cudatoolkit
# For visibility mostly. The whole approach to cuda architectures and capabilities
# will be reworked soon.
, cudaArch ? "compute_37"

2
pkgs/development/libraries/science/chemistry/openmm/default.nix
View file

@ -12,7 +12,7 @@
, opencl-headers
, ocl-icd
, config
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cudaPackages
, addOpenGLRunpath
}:

2
pkgs/development/libraries/science/math/faiss/default.nix
View file

@ -5,7 +5,7 @@
, stdenv
, cmake
, cudaPackages ? { }
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, nvidia-thrust
, useThrustSourceBuild ? true
, pythonSupport ? true

2
pkgs/development/libraries/science/math/suitesparse/4.4.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, gfortran, blas, lapack
, config
, enableCuda ? config.cudaSupport or false, cudatoolkit
, enableCuda ? config.cudaSupport, cudatoolkit
}:
let

2
pkgs/development/libraries/science/math/suitesparse/default.nix
View file

@ -7,7 +7,7 @@
, gmp
, mpfr
, config
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cudatoolkit
}:

2
pkgs/development/libraries/ucc/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx
, config
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cudatoolkit
, enableAvx ? stdenv.hostPlatform.avxSupport
, enableSse41 ? stdenv.hostPlatform.sse4_1Support

2
pkgs/development/libraries/ucx/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl
, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config
, config
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, cudatoolkit
, enableRocm ? false
, rocm-core, rocm-runtime, rocm-device-libs, hip

2
pkgs/development/libraries/xgboost/default.nix
View file

@ -5,7 +5,7 @@
, cmake
, gtest
, doCheck ? true
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, ncclSupport ? false
, rLibrary ? false
, cudaPackages

2
pkgs/development/python-modules/chainer/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cupy
, fetchFromGitHub
, filelock

2
pkgs/development/python-modules/jaxlib/bin.nix
View file

@ -27,7 +27,7 @@
, scipy
, stdenv
# Options:
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
}:

2
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -42,7 +42,7 @@
, config
# CUDA flags:
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
# MKL:

2
pkgs/development/python-modules/libgpuarray/default.nix
View file

@ -10,7 +10,7 @@
, nose
, mako
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
, openclSupport ? true, ocl-icd, clblas
}:

2
pkgs/development/python-modules/numba/default.nix
View file

@ -21,7 +21,7 @@
, cudaPackages ? {}
# CUDA flags:
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
}:
let

2
pkgs/development/python-modules/tensorflow/bin.nix
View file

@ -22,7 +22,7 @@
, tensorflow-estimator-bin
, tensorboard
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
, zlib
, python

2
pkgs/development/python-modules/tensorflow/default.nix
View file

@ -18,7 +18,7 @@
# it would also make the default tensorflow package unfree. See
# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
, mklSupport ? false, mkl

2
pkgs/development/python-modules/theano/default.nix
View file

@ -12,7 +12,7 @@
, six
, libgpuarray
, config
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
, cudaSupport ? config.cudaSupport, cudaPackages ? { }
, cudnnSupport ? cudaSupport
}:

2
pkgs/development/python-modules/torch/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python,
config, cudaSupport ? config.cudaSupport or false, cudaPackages, magma,
config, cudaSupport ? config.cudaSupport, cudaPackages, magma,
useSystemNccl ? true,
MPISupport ? false, mpi,
buildDocs ? false,

2
pkgs/games/katago/default.nix
View file

@ -15,7 +15,7 @@
, openssl
, writeShellScriptBin
, enableAVX2 ? stdenv.hostPlatform.avx2Support
, backend ? if (config.cudaSupport or false) then "cuda" else "opencl"
, backend ? if config.cudaSupport then "cuda" else "opencl"
, enableBigBoards ? false
, enableContrib ? false
, enableTcmalloc ? true

2
pkgs/servers/sunshine/default.nix
View file

@ -31,7 +31,7 @@
, vulkan-loader
, libappindicator
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
}:
let

2
pkgs/tools/compression/zfp/default.nix
View file

@ -1,7 +1,7 @@
{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv
, config
, enableCfp ? true
, enableCuda ? config.cudaSupport or false
, enableCuda ? config.cudaSupport
, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms
, enableOpenMP ? true
, enablePython ? true

2
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
View file

@ -1,6 +1,6 @@
{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL
, config
, cudaSupport ? config.cudaSupport or false, cudatoolkit ? null
, cudaSupport ? config.cudaSupport, cudatoolkit ? null
}:
stdenv.mkDerivation rec {

2
pkgs/tools/security/hashcat/default.nix
View file

@ -2,7 +2,7 @@
, addOpenGLRunpath
, config
, cudaPackages ? {}
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, fetchurl
, makeWrapper
, opencl-headers

2
pkgs/tools/security/truecrack/default.nix
View file

@ -1,6 +1,6 @@
{ lib, gccStdenv, fetchFromGitLab, cudatoolkit
, config
, cudaSupport ? config.cudaSupport or false
, cudaSupport ? config.cudaSupport
, pkg-config }:
gccStdenv.mkDerivation rec {

10
pkgs/top-level/all-packages.nix
View file

@ -4162,7 +4162,7 @@ with pkgs;
libtensorflow = python3.pkgs.tensorflow.libtensorflow;
libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix {
cudaSupport = config.cudaSupport or false;
inherit (config) cudaSupport;
};
tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };
@ -10825,7 +10825,7 @@ with pkgs;
nvidia-thrust-intel = callPackage ../development/libraries/nvidia-thrust {
hostSystem = "TBB";
deviceSystem = if config.cudaSupport or false then "CUDA" else "TBB";
deviceSystem = if config.cudaSupport then "CUDA" else "TBB";
};
nvidia-thrust-cuda = callPackage ../development/libraries/nvidia-thrust {
@ -15070,7 +15070,7 @@ with pkgs;
colm = callPackage ../development/compilers/colm { };
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { cudaSupport = config.cudaSupport or false; };
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; };
colmapWithCuda = colmap.override { cudaSupport = true; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
@ -39195,7 +39195,7 @@ with pkgs;
### SCIENCE / MATH
caffe = callPackage ../applications/science/math/caffe ({
cudaSupport = config.cudaSupport or false;
inherit (config) cudaSupport;
cudaPackages = cudaPackages_10_1;
opencv3 = opencv3WithoutCuda; # Used only for image loading.
blas = openblas;
@ -39210,7 +39210,7 @@ with pkgs;
stdenv = gcc7Stdenv;
inherit (linuxPackages) nvidia_x11;
opencv3 = opencv3WithoutCuda; # Used only for image loading.
cudaSupport = config.cudaSupport or false;
inherit (config) cudaSupport;
};
dap = callPackage ../applications/science/math/dap { };

22
pkgs/top-level/python-packages.nix
View file

@ -1816,7 +1816,7 @@ self: super: with self; {
chai = callPackage ../development/python-modules/chai { };
chainer = callPackage ../development/python-modules/chainer {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
chainmap = callPackage ../development/python-modules/chainmap { };
@ -5256,13 +5256,13 @@ self: super: with self; {
jax-jumpy = callPackage ../development/python-modules/jax-jumpy { };
jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
inherit (pkgs.darwin) cctools;
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21
};
@ -5803,7 +5803,7 @@ self: super: with self; {
libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { inherit (self) boost; };
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python;
@ -7105,7 +7105,7 @@ self: super: with self; {
num2words = callPackage ../development/python-modules/num2words { };
numba = callPackage ../development/python-modules/numba {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
numbaWithCuda = self.numba.override {
@ -7273,7 +7273,7 @@ self: super: with self; {
openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { };
openai-whisper = callPackage ../development/python-modules/openai-whisper {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
openant = callPackage ../development/python-modules/openant { };
@ -12304,12 +12304,12 @@ self: super: with self; {
tensorboardx = callPackage ../development/python-modules/tensorboardx { };
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
};
tensorflow-build = callPackage ../development/python-modules/tensorflow {
inherit (pkgs.darwin) cctools;
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
inherit (self.tensorflow-bin) cudaPackages;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
flatbuffers-core = pkgs.flatbuffers;
@ -12428,7 +12428,7 @@ self: super: with self; {
theano-pymc = callPackage ../development/python-modules/theano-pymc { };
theano = callPackage ../development/python-modules/theano rec {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
cudnnSupport = cudaSupport;
};
@ -12595,9 +12595,9 @@ self: super: with self; {
toposort = callPackage ../development/python-modules/toposort { };
torch = callPackage ../development/python-modules/torch {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.config) cudaSupport;
magma =
if pkgs.config.cudaSupport or false
if pkgs.config.cudaSupport
then pkgs.magma-cuda-static
else pkgs.magma;
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices;