[Adaption]适配ollama0.13.5 for DCU

54134302 · laibao · 33ee7168 · 54134302 · 54134302
Commit 54134302 authored Jan 09, 2026 by laibao
Showing with 5 additions and 5 deletions

ml/backend/ggml/ggml/src/ggml-cuda/vendors/hip.h ml/backend/ggml/ggml/src/ggml-cuda/vendors/hip.h +2 -2

ml/backend/ggml/ggml/src/ggml-hip/CMakeLists.txt ml/backend/ggml/ggml/src/ggml-hip/CMakeLists.txt +3 -3

No files found.
--- a/ml/backend/ggml/ggml/src/ggml-cuda/vendors/hip.h
+++ b/ml/backend/ggml/ggml/src/ggml-cuda/vendors/hip.h
@@ -50,7 +50,7 @@
 #define cudaDeviceCanAccessPeer hipDeviceCanAccessPeer
 #define cudaDeviceDisablePeerAccess hipDeviceDisablePeerAccess
 #define cudaDeviceEnablePeerAccess hipDeviceEnablePeerAccess
-#define cudaDeviceProp hipDeviceProp_t
+#define cudaDeviceProp hipDeviceProp_t_v2
 #define cudaDeviceReset hipDeviceReset
 #define cudaDeviceSynchronize hipDeviceSynchronize
 #define cudaDriverGetVersion hipDriverGetVersion
@@ -67,7 +67,7 @@
 #define cudaFreeHost hipHostFree
 #define cudaGetDevice hipGetDevice
 #define cudaGetDeviceCount hipGetDeviceCount
-#define cudaGetDeviceProperties hipGetDeviceProperties
+#define cudaGetDeviceProperties hipGetDeviceProperties_v2
 #define cudaGetErrorString hipGetErrorString
 #define cudaGetLastError hipGetLastError
 #define cudaHostRegister hipHostRegister

--- a/ml/backend/ggml/ggml/src/ggml-hip/CMakeLists.txt
+++ b/ml/backend/ggml/ggml/src/ggml-hip/CMakeLists.txt
@@ -43,9 +43,9 @@ find_package(hip     REQUIRED)
 find_package(hipblas REQUIRED)
 find_package(rocblas REQUIRED)
-if (${hip_VERSION} VERSION_LESS 6.1)
+# if (${hip_VERSION} VERSION_LESS 6.1)
-    message(FATAL_ERROR "At least ROCM/HIP V6.1 is required")
+#     message(FATAL_ERROR "At least ROCM/HIP V6.1 is required")
-endif()
+# endif()
 message(STATUS "HIP and hipBLAS found")