From a89b3d2633a674758160c46f9a322e97a04e2610 Mon Sep 17 00:00:00 2001 From: Rafa00127 <150351653+Rafa00127@users.noreply.github.com> Date: Thu, 4 Jun 2026 14:04:53 +0800 Subject: [PATCH 1/3] Add HIP support --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6d8a51..db94675 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) option(S2_VULKAN "Build with Vulkan backend" OFF) option(S2_CUDA "Build with CUDA backend" OFF) +option(S2_HIP "Build with HIP backend" OFF) option(S2_METAL "Build with Metal backend" OFF) option(S2_BUILD_SHARED_LIBRARIES "Build S2 shared and static library targets" OFF) option(S2_AUTO_APPLY_LOCAL_PATCHES "Automatically apply local patches from patches/*.patch during build" ON) @@ -65,12 +66,16 @@ if(S2_METAL) set(GGML_METAL ON CACHE BOOL "" FORCE) else() set(GGML_METAL OFF CACHE BOOL "" FORCE) +if(S2_HIP) + set(GGML_HIP ON CACHE BOOL "" FORCE) +else() + set(GGML_HIP OFF CACHE BOOL "" FORCE) endif() add_subdirectory(ggml) if(TARGET s2_apply_local_patches) - foreach(_target ggml ggml-base ggml-cpu ggml-cuda ggml-vulkan ggml-metal) + foreach(_target ggml ggml-base ggml-cpu ggml-cuda ggml-hip ggml-vulkan ggml-metal) if(TARGET ${_target}) add_dependencies(${_target} s2_apply_local_patches) endif() @@ -110,6 +115,9 @@ endif() if(S2_METAL) target_compile_definitions(${target_name} PRIVATE GGML_USE_METAL) endif() +if(S2_HIP OR GGML_HIP) + target_compile_definitions(${target_name} PRIVATE GGML_USE_CUDA) +endif() if(UNIX AND NOT APPLE) target_link_libraries(${target_name} PRIVATE pthread m) From efb06cfe07b442551bbe35a2be8e3a7c2f537f60 Mon Sep 17 00:00:00 2001 From: Rafa00127 <150351653+Rafa00127@users.noreply.github.com> Date: Thu, 4 Jun 2026 14:16:14 +0800 Subject: [PATCH 2/3] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index db94675..c845b68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ if(S2_METAL) set(GGML_METAL ON CACHE BOOL "" FORCE) else() set(GGML_METAL OFF CACHE BOOL "" FORCE) +endif() if(S2_HIP) set(GGML_HIP ON CACHE BOOL "" FORCE) else() From e193bcb63a2c74498200e7505bc18d855018b227 Mon Sep 17 00:00:00 2001 From: Rafa00127 <150351653+Rafa00127@users.noreply.github.com> Date: Thu, 4 Jun 2026 14:17:54 +0800 Subject: [PATCH 3/3] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c845b68..5fca736 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ endif() if(S2_METAL) target_compile_definitions(${target_name} PRIVATE GGML_USE_METAL) endif() -if(S2_HIP OR GGML_HIP) +if(S2_HIP) target_compile_definitions(${target_name} PRIVATE GGML_USE_CUDA) endif()