diff options
| author | Christian Kögler <ck3d@gmx.de> | 2024-03-25 18:52:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-25 10:52:45 -0700 |
| commit | b06c16ef9f81d84da520232c125d4d8a1d273736 (patch) | |
| tree | bd2293d7da50f497fcac1e1b53d66252ff355156 | |
| parent | 1f2fd4e727a707f85d58e0b56075c3e6334d18d8 (diff) | |
nix: fix blas support (#6281)
Since no blas was provided to buildInputs, the executable is built without blas support.
This is a backport of NixOS/nixpkgs#298567
| -rw-r--r-- | .devops/nix/package.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index c7fa2203..76d96e63 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -10,7 +10,7 @@ git, python3, mpi, - openblas, # TODO: Use the generic `blas` so users could switch between alternative implementations + blas, cudaPackages, darwin, rocmPackages, @@ -181,6 +181,7 @@ effectiveStdenv.mkDerivation ( ++ optionals useMpi [ mpi ] ++ optionals useOpenCL [ clblast ] ++ optionals useRocm rocmBuildInputs + ++ optionals useBlas [ blas ] ++ optionals useVulkan vulkanBuildInputs; cmakeFlags = @@ -216,8 +217,7 @@ effectiveStdenv.mkDerivation ( # Should likely use `rocmPackages.clr.gpuTargets`. "-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" ] - ++ optionals useMetalKit [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ] - ++ optionals useBlas [ (lib.cmakeFeature "LLAMA_BLAS_VENDOR" "OpenBLAS") ]; + ++ optionals useMetalKit [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ]; # TODO(SomeoneSerge): It's better to add proper install targets at the CMake level, # if they haven't been added yet. |