From 6b5a4ab9578acf63d4965907262c37b64444cf14 Mon Sep 17 00:00:00 2001
From: zenix <zenixls2@gmail.com>
Date: Sat, 20 May 2023 22:03:33 +0900
Subject: [PATCH] Fix: blas changes on ci

---
 .github/workflows/build.yml | 2 +-
 CMakeLists.txt              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5938bf93..49b478d99 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -165,7 +165,7 @@ jobs:
           - build: 'clblast'
             defines: '-DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/clblast"'
           - build: 'openblas'
-            defines: '-DLLAMA_OPENBLAS=ON -DBLAS_LIBRARIES="/LIBPATH:$env:RUNNER_TEMP/openblas/lib" -DOPENBLAS_INC="$env:RUNNER_TEMP/openblas/include"'
+            defines: '-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include"'
 
     steps:
       - name: Clone
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0876ab90a..1c9afed6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,16 +158,16 @@ if (LLAMA_BLAS)
     if (BLAS_FOUND)
         message(STATUS "BLAS found, Libraries: ${BLAS_LIBRARIES}")
 
-	add_compile_options(${BLAS_LINKER_FLAGS})
+        add_compile_options(${BLAS_LINKER_FLAGS})
         add_compile_definitions(GGML_USE_OPENBLAS)
         set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} ${BLAS_LIBRARIES})
 
-        message("${BLAS_LIBRARIES}")
+        message("${BLAS_LIBRARIES} ${BLAS_INCLUDE_DIRS}")
         include_directories(${BLAS_INCLUDE_DIRS})
     else()
         message(WARNING "BLAS not found, please refer to "
-	"https://cmake.org/cmake/help/latest/module/FindBLAS.html#blas-lapack-vendors"
-	" to set correct LLAMA_BLAS_VENDOR")
+        "https://cmake.org/cmake/help/latest/module/FindBLAS.html#blas-lapack-vendors"
+        " to set correct LLAMA_BLAS_VENDOR")
     endif()
 endif()