Skip to content

cudaPackages.cudatoolkit: fix the setupCudaHook not being propagated correctly #273048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ConnorBaker merged 2 commits into from
Dec 11, 2023
Merged

cudaPackages.cudatoolkit: fix the setupCudaHook not being propagated correctly #273048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8105992
cudaPackages.cudatoolkit: propagate the hook to nativeBuildInputs cor…
SomeoneSerge Dec 9, 2023
7c97d5f
suitesparse: migrate to redist cuda
SomeoneSerge Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/cuda-modules/cudatoolkit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ backendStdenv.mkDerivation rec {
]
++ lib.optionals (lib.versionOlder version "11") [libsForQt5.wrapQtAppsHook]
++ lib.optionals (lib.versionAtLeast version "11.8") [qt6Packages.wrapQtAppsHook];
depsTargetTargetPropagated = [setupCudaHook];
propagatedBuildInputs = [setupCudaHook];
buildInputs =
lib.optionals (lib.versionOlder version "11") [
libsForQt5.qt5.qtwebengine
Expand Down
21 changes: 15 additions & 6 deletions pkgs/development/libraries/science/math/suitesparse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
, mpfr
, config
, enableCuda ? config.cudaSupport
, cudatoolkit
, cudaPackages
}:

stdenv.mkDerivation rec {
Expand All @@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
] ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
] ++ lib.optionals enableCuda [
cudaPackages.cuda_nvcc
];

# Use compatible indexing for lapack and blas used
buildInputs = assert (blas.isILP64 == lapack.isILP64); [
Expand All @@ -34,7 +38,12 @@ stdenv.mkDerivation rec {
gfortran.cc.lib
gmp
mpfr
] ++ lib.optional enableCuda cudatoolkit;
] ++ lib.optionals enableCuda [
cudaPackages.cuda_cudart.dev
cudaPackages.cuda_cudart.lib
cudaPackages.libcublas.dev
cudaPackages.libcublas.lib
];

preConfigure = ''
# Mongoose and GraphBLAS are packaged separately
Expand All @@ -49,9 +58,9 @@ stdenv.mkDerivation rec {
] ++ lib.optionals blas.isILP64 [
"CFLAGS=-DBLAS64"
] ++ lib.optionals enableCuda [
"CUDA_PATH=${cudatoolkit}"
"CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so"
"CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
"CUDA_PATH=${cudaPackages.cuda_nvcc}"
"CUDART_LIB=${cudaPackages.cuda_cudart.lib}/lib/libcudart.so"
"CUBLAS_LIB=${cudaPackages.libcublas.lib}/lib/libcublas.so"
] ++ lib.optionals stdenv.isDarwin [
# Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368
Expand Down