From ac5c65a71ae89a214e2f6cb16af98b856ac2d246 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Thu, 8 May 2025 20:14:24 -0700 Subject: [PATCH] ollama-rocm: fix evaluation error when clr.localGpuTargets is set --- pkgs/by-name/ol/ollama/package.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 4142c4ef3fa2..131bade17ab1 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -14,7 +14,7 @@ clblast, libdrm, rocmPackages, - rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ], + rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]), cudaPackages, cudaArches ? cudaPackages.cudaFlags.realArches or [ ], autoAddDriverRunpath, @@ -137,12 +137,6 @@ goBuild (finalAttrs: { CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; } - // lib.optionalAttrs (enableRocm && (rocmPackages.clr.localGpuTargets or false)) { - - # If rocm CLR is set to build for an exact set of targets reuse that target list, - # otherwise let ollama use its builtin defaults - HIP_ARCHS = lib.concatStringsSep ";" rocmPackages.clr.localGpuTargets; - } // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; }; nativeBuildInputs =