Просмотр исходного кода

Improve hipBLAS support in CMake (#7696)

* Improve hipBLAS support in CMake

This improves the detection of the correct CMAKE_PREFIX_PATH when using different distributions or a self-built ROCm SDK.

* Set ROCM_PATH correctly
Daniele 1 год назад
Родитель
Сommit
987d743d6b
1 измененных файлов с 8 добавлено и 3 удалено
  1. 8 3
      CMakeLists.txt

+ 8 - 3
CMakeLists.txt

@@ -557,12 +557,17 @@ if (LLAMA_VULKAN)
 endif()
 endif()
 
 
 if (LLAMA_HIPBLAS)
 if (LLAMA_HIPBLAS)
-    if ($ENV{ROCM_PATH})
-        set(ROCM_PATH $ENV{ROCM_PATH})
+    if (NOT EXISTS $ENV{ROCM_PATH})
+        if (NOT EXISTS /opt/rocm)
+            set(ROCM_PATH /usr)
+        else()
+            set(ROCM_PATH /opt/rocm)
+        endif()
     else()
     else()
-        set(ROCM_PATH /opt/rocm)
+        set(ROCM_PATH $ENV{ROCM_PATH})
     endif()
     endif()
     list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
     list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+    list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}/lib64/cmake")
 
 
     # CMake on Windows doesn't support the HIP language yet
     # CMake on Windows doesn't support the HIP language yet
     if(WIN32)
     if(WIN32)