diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/development/libraries/science | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix | 40 |
2 files changed, 21 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix index c9f00fa72ee6..52c9b4de20a5 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -14,13 +14,13 @@ assert !blas.isILP64 && !lapack.isILP64; stdenv.mkDerivation rec { pname = "dftd4"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "dftd4"; repo = pname; rev = "v${version}"; - hash = "sha256-ZCoFbjTNQD7slq5sKwPRPkrHSHofsxU9C9h/bF5jmZI="; + hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU="; }; nativeBuildInputs = [ cmake gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 155e863bf21e..2eb391dda46b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -2,24 +2,25 @@ , backendStdenv , fetchFromGitHub , which -, cudaPackages ? { } -, addOpenGLRunpath +, autoAddOpenGLRunpathHook +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaFlags +, cudaVersion }: - -with cudaPackages; - let # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" gencode = lib.concatStringsSep " " cudaFlags.gencode; in -backendStdenv.mkDerivation rec { - name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; +backendStdenv.mkDerivation (finalAttrs: { + name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; version = "2.16.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; }; @@ -27,13 +28,18 @@ backendStdenv.mkDerivation rec { nativeBuildInputs = [ which - addOpenGLRunpath + autoAddOpenGLRunpathHook cuda_nvcc ]; buildInputs = [ cuda_cudart - ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [ + ] + # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons + # against other version, like below, it's important that we use the same format. Otherwise, + # we'll get incorrect results. + # For example, lib.versionAtLeast "12.0" "12.0.0" == false. + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ cuda_cccl ]; @@ -46,27 +52,19 @@ backendStdenv.mkDerivation rec { makeFlags = [ "CUDA_HOME=${cuda_nvcc}" - "CUDA_LIB=${cuda_cudart}/lib64" - "CUDA_INC=${cuda_cudart}/include" + "CUDA_LIB=${lib.getLib cuda_cudart}/lib" + "CUDA_INC=${lib.getDev cuda_cudart}/include" "PREFIX=$(out)" ]; postFixup = '' moveToOutput lib/libnccl_static.a $dev - - # Set RUNPATH so that libnvidia-ml in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/lib*.so ''; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; enableParallelBuilding = true; - passthru = { - inherit cudaPackages; - }; - meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; @@ -74,4 +72,4 @@ backendStdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter orivej ]; }; -} +}) |