baalajimaestro/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Disable Windows+CUDA workaround when compiling for HIPBLAS (#1493)

Browse source 
* Disable Windows+CUDA workaround when compiling for HIPBLAS

* fix spacing

* change condition to check for Windows & CUDA

Co-authored-by: Andrei <abetlen@gmail.com>

---------

Co-authored-by: Andrei <abetlen@gmail.com>
This commit is contained in:
Engininja2 2024-06-03 22:42:34 -06:00 committed by GitHub
parent cd3f1bb387
commit ae5682f500
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -41,6 +41,7 @@ if (LLAMA_BUILD)
RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp RESOURCE DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
) )
# Workaround for Windows + CUDA https://github.com/abetlen/llama-cpp-python/issues/563 # Workaround for Windows + CUDA https://github.com/abetlen/llama-cpp-python/issues/563
if (WIN32 AND (LLAMA_CUDA OR LLAMA_CUBLAS))
install( install(
FILES $<TARGET_RUNTIME_DLLS:llama> FILES $<TARGET_RUNTIME_DLLS:llama>
DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp
@ -49,6 +50,7 @@ if (LLAMA_BUILD)
FILES $<TARGET_RUNTIME_DLLS:llama> FILES $<TARGET_RUNTIME_DLLS:llama>
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp
) )
endif()
if (LLAVA_BUILD) if (LLAVA_BUILD)
if (LLAMA_CUBLAS OR LLAMA_CUDA) if (LLAMA_CUBLAS OR LLAMA_CUDA)