Skip to content

Commit

Permalink
Github Actions Windows builds with tests (#472)
Browse files Browse the repository at this point in the history
* Set CMake CMP0074 policy

* Attempt to use pre-compiled OpenBLAS on Windows CI

* Fix an issue and add some debugging

* Improve FindCBLAS for OpenBLAS on Windows
  • Loading branch information
CNugteren authored May 21, 2023
1 parent 63eb127 commit 0366842
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,19 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1

- name: Install OpenBLAS
run: vcpkg.exe --triplet=${{ matrix.config.arch }}-windows install openblas
run: |
mkdir openblas
cd openblas
C:\msys64\usr\bin\wget.exe https://github.com/xianyi/OpenBLAS/releases/download/v0.3.23/OpenBLAS-0.3.23-x64.zip
7z x OpenBLAS-0.3.23-x64.zip
pwd
ls
- name: Install OpenCL
run: vcpkg.exe --triplet=${{ matrix.config.arch }}-windows install opencl

- name: Run CMake
run: cmake -S . -B build -DTESTS=ON -DCLIENTS=ON -DSAMPLES=ON -DOPENCL_ROOT=C:/vcpkg/packages/opencl_x64-windows -DCBLAS_ROOT=C:/vcpkg/packages/openblas_x64-windows
run: cmake -S . -B build -DTESTS=ON -DCLIENTS=ON -DSAMPLES=ON -DOPENCL_ROOT=C:\vcpkg\packages\opencl_x64-windows -DCBLAS_ROOT=${{ github.workspace }}\openblas

- name: Compile the code
run: cmake --build build
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ set(clblast_VERSION_PATCH 3)
set(clblast_VERSION "${clblast_VERSION_MAJOR}.${clblast_VERSION_MINOR}.${clblast_VERSION_PATCH}")
set(clblast_SOVERSION ${clblast_VERSION_MAJOR})

# Policies
cmake_policy(SET CMP0074 NEW) # to make -DCBLAS_ROOT= work with newer CMake versions as well

# Options and their default values
option(BUILD_SHARED_LIBS "Build a shared (ON) or static library (OFF)" ON)
option(SAMPLES "Enable compilation of the examples" OFF)
Expand Down
6 changes: 3 additions & 3 deletions cmake/Modules/FindCBLAS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ mark_as_advanced(CBLAS_INCLUDE_DIRS)

# Finds the library
find_library(CBLAS_LIBRARIES
NAMES cblas blas blis openblas accelerate
NAMES cblas blas blis openblas libopenblas accelerate
HINTS ${CBLAS_HINTS}
PATH_SUFFIXES
lib lib64 lib/x86_64 lib/x64 lib/x86 lib/Win32 lib/import lib64/import
openblas/lib blis/lib lib/atlas-base
lib lib64 bin lib/x86_64 lib/x64 lib/x86 lib/Win32 lib/import lib64/import
openblas/bin openblas/lib blis/lib lib/atlas-base
PATHS ${CBLAS_PATHS}
DOC "Netlib BLAS library"
)
Expand Down

0 comments on commit 0366842

Please sign in to comment.