Skip to content

Commit 63c8b47

Browse files
committed
Fix: blas changes on ci
1 parent 46f01a2 commit 63c8b47

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
- build: 'clblast'
166166
defines: '-DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/clblast"'
167167
- build: 'openblas'
168-
defines: '-DLLAMA_OPENBLAS=ON -DBLAS_LIBRARIES="/LIBPATH:$env:RUNNER_TEMP/openblas/lib" -DOPENBLAS_INC="$env:RUNNER_TEMP/openblas/include"'
168+
defines: '-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DBLAS_LIBRARIES="/LIBPATH:$env:RUNNER_TEMP/openblas/lib" -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include"'
169169

170170
steps:
171171
- name: Clone

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,16 @@ if (LLAMA_BLAS)
158158
if (BLAS_FOUND)
159159
message(STATUS "BLAS found, Libraries: ${BLAS_LIBRARIES}")
160160

161-
add_compile_options(${BLAS_LINKER_FLAGS})
161+
add_compile_options(${BLAS_LINKER_FLAGS})
162162
add_compile_definitions(GGML_USE_OPENBLAS)
163163
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} ${BLAS_LIBRARIES})
164164

165-
message("${BLAS_LIBRARIES}")
165+
message("${BLAS_LIBRARIES} ${BLAS_INCLUDE_DIRS}")
166166
include_directories(${BLAS_INCLUDE_DIRS})
167167
else()
168168
message(WARNING "BLAS not found, please refer to "
169-
"https://cmake.org/cmake/help/latest/module/FindBLAS.html#blas-lapack-vendors"
170-
" to set correct LLAMA_BLAS_VENDOR")
169+
"https://cmake.org/cmake/help/latest/module/FindBLAS.html#blas-lapack-vendors"
170+
" to set correct LLAMA_BLAS_VENDOR")
171171
endif()
172172
endif()
173173

0 commit comments

Comments
 (0)