ollama-rocm: fix evaluation error when rocmPackages are built for a specific arch (#405457)
This commit is contained in:
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user