Skip to content
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

cudatoolkit_11_7: init at 11.7.0 #179912

Merged
merged 5 commits into from
Aug 5, 2022
Merged

cudatoolkit_11_7: init at 11.7.0 #179912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df653dc
cudatoolkit: get redistrib_11.7.0.json
dguibert Jun 29, 2022
b139e33
cudatoolkit: add 11.7
dguibert Jun 29, 2022
9aaf5da
nsight_compute: qt6 for version 2022.2.0
dguibert Jun 30, 2022
79bc66c
redistrib_11.7.0.json: add eol
dguibert Jul 2, 2022
a43d296
cudnn: add 8.4.0
dguibert Aug 2, 2022
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
1 change: 1 addition & 0 deletions pkgs/development/compilers/cudatoolkit/redist/extension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ final: prev: let
"11.4" = ./manifests/redistrib_11.4.4.json;
"11.5" = ./manifests/redistrib_11.5.2.json;
"11.6" = ./manifests/redistrib_11.6.2.json;
"11.7" = ./manifests/redistrib_11.7.0.json;
};

# Function to build a single cudatoolkit redist package
Expand Down
879 changes: 879 additions & 0 deletions pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions pkgs/development/compilers/cudatoolkit/redist/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) {
];

nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ];
buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ];
nativeBuildInputs = oldAttrs.nativeBuildInputs
++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.wrapQtAppsHook ]
++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.wrapQtAppsHook ];
buildInputs = oldAttrs.buildInputs
++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.qtwebview ]
++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.qtwebview ];
});

nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: {
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/compilers/cudatoolkit/versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@ version = "11.6.1"
url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"
sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="
gcc = "gcc11"

["11.7"]
version = "11.7.0"
url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run"
sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY="
gcc = "gcc11"
19 changes: 18 additions & 1 deletion pkgs/development/libraries/science/math/cudnn/extension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,23 @@ final: prev: let
fullVersion = "8.3.2.44";
hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ];
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ];
}
];
"8.4.0" = [
rec {
fileVersion = "10.2";
fullVersion = "8.4.0.27";
hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "10.2" ];
}
rec {
fileVersion = "11.6";
fullVersion = "8.4.0.27";
hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ];
}
];
};
Expand All @@ -111,6 +127,7 @@ final: prev: let
"11.4" = "8.3.2";
"11.5" = "8.3.2";
"11.6" = "8.3.2";
"11.7" = "8.4.0";
}.${cudaVersion};

in cuDnnPackages
3 changes: 3 additions & 0 deletions pkgs/test/cuda/cuda-samples/extension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ final: prev: let
"11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
"11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI=";
"11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE=";
# the tag 11.7 does not exists: see https://github.com/NVIDIA/cuda-samples/issues/128
# maybe fixed by https://github.com/NVIDIA/cuda-samples/pull/133
"11.7" = prev.lib.fakeSha256;
samuela marked this conversation as resolved.
Show resolved Hide resolved
}.${prev.cudaVersion};

in {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5192,7 +5192,8 @@ with pkgs;
cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; };
cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; };
cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
cudaPackages_11 = cudaPackages_11_6;
cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; };
cudaPackages_11 = cudaPackages_11_7;
samuela marked this conversation as resolved.
Show resolved Hide resolved
cudaPackages = recurseIntoAttrs cudaPackages_11;

# TODO: move to alias
Expand Down