diff options
| author | Connor Baker <connor.baker@tweag.io> | 2024-01-25 14:10:07 +0000 |
|---|---|---|
| committer | Connor Baker <connor.baker@tweag.io> | 2024-02-07 19:03:47 +0000 |
| commit | be7e7209885cfb7a6016afea29de44730e85776c (patch) | |
| tree | 9786c152292a049996e5dc8cde7218554f6c8dba | |
| parent | d4c2507dfe31f0d5c2b3455cff0f226805c1b5b2 (diff) | |
| download | nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar.gz nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar.bz2 nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar.lz nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar.xz nixlib-be7e7209885cfb7a6016afea29de44730e85776c.tar.zst nixlib-be7e7209885cfb7a6016afea29de44730e85776c.zip | |
magma: switch to cudaOlder and cudaAtLeast
| -rw-r--r-- | pkgs/development/libraries/science/math/magma/generic.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index ad58a021830b..5c195db04bad 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -30,7 +30,7 @@ let inherit (lib) lists strings trivial; - inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; + inherit (cudaPackages) backendStdenv cudaAtLeast cudaFlags cudaOlder; inherit (magmaRelease) version hash supportedGpuTargets; # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements @@ -114,11 +114,11 @@ stdenv.mkDerivation { libcublas.lib # cublas libcusparse.dev # cusparse.h libcusparse.lib # cusparse - ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + ] ++ lists.optionals (cudaOlder "11.8") [ cuda_nvprof.dev # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + ] ++ lists.optionals (cudaAtLeast "11.8") [ cuda_profiler_api.dev # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [ + ] ++ lists.optionals (cudaAtLeast "12.0") [ cuda_cccl.dev # <nv/target> ]) ++ lists.optionals rocmSupport [ rocmPackages.clr @@ -167,6 +167,6 @@ stdenv.mkDerivation { broken = !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive - || (cudaSupport && strings.versionOlder cudaVersion "9"); + || (cudaSupport && cudaOlder "9.0"); }; } |