Skip to content

Commit 257f8e4

Browse files
authored
nix : remove OpenCL remnants (#8235)
* nix : remove OpenCL remnants * minor : remove parentheses
1 parent 694c59c commit 257f8e4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

.devops/nix/package.nix

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,15 @@
1717
rocmPackages,
1818
vulkan-headers,
1919
vulkan-loader,
20-
clblast,
2120
useBlas ? builtins.all (x: !x) [
2221
useCuda
2322
useMetalKit
24-
useOpenCL
2523
useRocm
2624
useVulkan
2725
] && blas.meta.available,
2826
useCuda ? config.cudaSupport,
29-
useMetalKit ? stdenv.isAarch64 && stdenv.isDarwin && !useOpenCL,
27+
useMetalKit ? stdenv.isAarch64 && stdenv.isDarwin,
3028
useMpi ? false, # Increases the runtime closure size by ~700M
31-
useOpenCL ? false,
3229
useRocm ? config.rocmSupport,
3330
useVulkan ? false,
3431
llamaVersion ? "0.0.0", # Arbitrary version, substituted by the flake
@@ -56,7 +53,6 @@ let
5653
++ lib.optionals useCuda [ "CUDA" ]
5754
++ lib.optionals useMetalKit [ "MetalKit" ]
5855
++ lib.optionals useMpi [ "MPI" ]
59-
++ lib.optionals useOpenCL [ "OpenCL" ]
6056
++ lib.optionals useRocm [ "ROCm" ]
6157
++ lib.optionals useVulkan [ "Vulkan" ];
6258

@@ -198,7 +194,6 @@ effectiveStdenv.mkDerivation (
198194
optionals effectiveStdenv.isDarwin darwinBuildInputs
199195
++ optionals useCuda cudaBuildInputs
200196
++ optionals useMpi [ mpi ]
201-
++ optionals useOpenCL [ clblast ]
202197
++ optionals useRocm rocmBuildInputs
203198
++ optionals useBlas [ blas ]
204199
++ optionals useVulkan vulkanBuildInputs;
@@ -210,7 +205,6 @@ effectiveStdenv.mkDerivation (
210205
(cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
211206
(cmakeBool "GGML_NATIVE" false)
212207
(cmakeBool "GGML_BLAS" useBlas)
213-
(cmakeBool "GGML_CLBLAST" useOpenCL)
214208
(cmakeBool "GGML_CUDA" useCuda)
215209
(cmakeBool "GGML_HIPBLAS" useRocm)
216210
(cmakeBool "GGML_METAL" useMetalKit)
@@ -254,7 +248,6 @@ effectiveStdenv.mkDerivation (
254248
useCuda
255249
useMetalKit
256250
useMpi
257-
useOpenCL
258251
useRocm
259252
useVulkan
260253
;
@@ -281,7 +274,7 @@ effectiveStdenv.mkDerivation (
281274
# Configurations we don't want even the CI to evaluate. Results in the
282275
# "unsupported platform" messages. This is mostly a no-op, because
283276
# cudaPackages would've refused to evaluate anyway.
284-
badPlatforms = optionals (useCuda || useOpenCL) lib.platforms.darwin;
277+
badPlatforms = optionals useCuda lib.platforms.darwin;
285278

286279
# Configurations that are known to result in build failures. Can be
287280
# overridden by importing Nixpkgs with `allowBroken = true`.

0 commit comments

Comments
 (0)