From: Matheus Gabriel Alves Silva <redacted>
Date: Sun, 17 Dec 2023 15:23:33 +0000 (-0300)
Subject: build : Check the ROCm installation location (#4485)
X-Git-Tag: upstream/0.0.4488~2835
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=919c40660fd27157b391b5832d2a577d5afef4cb;p=pkg%2Fggml%2Fsources%2Fllama.cpp

build : Check the ROCm installation location (#4485)

* build : Check the ROCm installation location

* more generic approach

* fixup! It was returning the path instead of the command output

* fixup! Trailing whitespace
---

diff --git a/Makefile b/Makefile
index fb775ae5..8273f840 100644
--- a/Makefile
+++ b/Makefile
@@ -439,9 +439,15 @@ ggml-opencl.o: ggml-opencl.cpp ggml-opencl.h
 endif # LLAMA_CLBLAST
 
 ifdef LLAMA_HIPBLAS
-	ROCM_PATH	?= /opt/rocm
-	HIPCC	    ?= $(ROCM_PATH)/bin/hipcc
-	GPU_TARGETS ?= $(shell $(ROCM_PATH)/llvm/bin/amdgpu-arch)
+
+	ifeq ($(wildcard /opt/rocm),)
+		ROCM_PATH	?= /usr
+		GPU_TARGETS ?= $(shell $(shell which amdgpu-arch))
+	else
+		ROCM_PATH	?= /opt/rocm
+		GPU_TARGETS ?= $(shell $(ROCM_PATH)/llvm/bin/amdgpu-arch)
+	endif
+	HIPCC                   ?= $(ROCM_PATH)/bin/hipcc
 	LLAMA_CUDA_DMMV_X       ?= 32
 	LLAMA_CUDA_MMV_Y        ?= 1
 	LLAMA_CUDA_KQUANTS_ITER ?= 2