Skip to content

Commit

Permalink
nvidia-thrust: rm as deprecated
Browse files Browse the repository at this point in the history
The GitHub repo has been archived, the new thing is
[cccl](https://github.com/nvidia/cccl)
  • Loading branch information
SomeoneSerge committed Dec 4, 2023
1 parent 0c4b1fc commit 9cc210a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 120 deletions.
102 changes: 0 additions & 102 deletions pkgs/development/libraries/nvidia-thrust/default.nix

This file was deleted.

7 changes: 0 additions & 7 deletions pkgs/development/libraries/science/math/faiss/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
, cmake
, cudaPackages ? { }
, cudaSupport ? config.cudaSupport
, nvidia-thrust
, useThrustSourceBuild ? true
, pythonSupport ? true
, pythonPackages
, llvmPackages
Expand All @@ -27,8 +25,6 @@
, runCommand
}@inputs:

assert cudaSupport -> nvidia-thrust.cudaSupport;

let
pname = "faiss";
version = "1.7.4";
Expand All @@ -44,9 +40,6 @@ let
cuda_cudart # cuda_runtime.h
libcublas
libcurand
] ++ lib.optionals useThrustSourceBuild [
nvidia-thrust
] ++ lib.optionals (!useThrustSourceBuild) [
cuda_cccl
] ++ lib.optionals (cudaPackages ? cuda_profiler_api) [
cuda_profiler_api # cuda_profiler_api.h
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@ mapAliases ({
noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16
noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
noto-fonts-extra = noto-fonts; # Added 2023-04-08
nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl";

### O ###

Expand Down
11 changes: 0 additions & 11 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11276,16 +11276,6 @@ with pkgs;

nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;

nvidia-thrust = callPackage ../development/libraries/nvidia-thrust { };

nvidia-thrust-intel = callPackage ../development/libraries/nvidia-thrust {
hostSystem = "TBB";
deviceSystem = if config.cudaSupport then "CUDA" else "TBB";
};

nvidia-thrust-cuda = callPackage ../development/libraries/nvidia-thrust {
deviceSystem = "CUDA";
};

miller = callPackage ../tools/text/miller { };

Expand Down Expand Up @@ -39988,7 +39978,6 @@ with pkgs;

faissWithCuda = faiss.override {
cudaSupport = true;
nvidia-thrust = nvidia-thrust-cuda;
};

fityk = callPackage ../applications/science/misc/fityk { };
Expand Down

0 comments on commit 9cc210a

Please sign in to comment.