mirror of
https://github.com/leejet/stable-diffusion.cpp.git
synced 2026-11-12 11:56:36 +00:00
fix: initialize HIP linking in the parent CMake scope
This commit is contained in:
1 parent
cfdabe3793
commit
1769066450
3 files changed
+15
-8
No files matched your search
@@ -365,6 +365,9 @@ if (SD_CUDA)
|
|||||||
endif()
|
endif()
|
||||||
set(SD_BACKEND_REGISTRATIONS)
|
set(SD_BACKEND_REGISTRATIONS)
|
||||||
if (NOT SD_USE_UPSTREAM_GGML AND (SD_CUDA OR SD_HIPBLAS OR SD_MUSA))
|
if (NOT SD_USE_UPSTREAM_GGML AND (SD_CUDA OR SD_HIPBLAS OR SD_MUSA))
|
||||||
|
if(SD_HIPBLAS)
|
||||||
|
include(cmake/hip.cmake)
|
||||||
|
endif()
|
||||||
add_subdirectory(src/core/cuda)
|
add_subdirectory(src/core/cuda)
|
||||||
foreach(VENDOR CUDA HIP MUSA)
|
foreach(VENDOR CUDA HIP MUSA)
|
||||||
if(SD_${VENDOR} OR (VENDOR STREQUAL "HIP" AND SD_HIPBLAS))
|
if(SD_${VENDOR} OR (VENDOR STREQUAL "HIP" AND SD_HIPBLAS))
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
if(NOT WIN32 AND NOT CMAKE_CXX_COMPILER MATCHES "hipcc")
|
||||||
|
if(NOT CMAKE_HIP_ARCHITECTURES)
|
||||||
|
if(GPU_TARGETS)
|
||||||
|
set(CMAKE_HIP_ARCHITECTURES ${GPU_TARGETS})
|
||||||
|
elseif(AMDGPU_TARGETS)
|
||||||
|
set(CMAKE_HIP_ARCHITECTURES ${AMDGPU_TARGETS})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
# HIP objects are linked by the parent target, so initialize its link rules here.
|
||||||
|
enable_language(HIP)
|
||||||
|
set_property(TARGET ${SD_LIB} PROPERTY HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}")
|
||||||
|
endif()
|
||||||
@@ -44,14 +44,6 @@ if(SD_HIPBLAS)
|
|||||||
sd_cuda_sources(hip CXX)
|
sd_cuda_sources(hip CXX)
|
||||||
target_link_libraries(${SD_CUDA_TARGET} PRIVATE hip::device)
|
target_link_libraries(${SD_CUDA_TARGET} PRIVATE hip::device)
|
||||||
else()
|
else()
|
||||||
if(NOT CMAKE_HIP_ARCHITECTURES)
|
|
||||||
if(GPU_TARGETS)
|
|
||||||
set(CMAKE_HIP_ARCHITECTURES ${GPU_TARGETS})
|
|
||||||
elseif(AMDGPU_TARGETS)
|
|
||||||
set(CMAKE_HIP_ARCHITECTURES ${AMDGPU_TARGETS})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
enable_language(HIP)
|
|
||||||
sd_cuda_sources(hip HIP)
|
sd_cuda_sources(hip HIP)
|
||||||
set_target_properties(${SD_CUDA_TARGET} PROPERTIES HIP_STANDARD 17 HIP_STANDARD_REQUIRED ON)
|
set_target_properties(${SD_CUDA_TARGET} PROPERTIES HIP_STANDARD 17 HIP_STANDARD_REQUIRED ON)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in new issue
Block a user