diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2023-05-18 16:58:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 16:58:31 +0200 |
| commit | db3bd0a32ef16d5bf9f047887242a9f94310425b (patch) | |
| tree | f06674f61aa3efc8586328be84b21a753d79c723 | |
| parent | e73f0b51310186c513846ce08c5d70b90d5e7583 (diff) | |
Add Windows builds to Github Actions and fix Windows compilation issue (#470)
* Add Windows builds to Github Actions CI
* Fix failing Windows builds
| -rw-r--r-- | .github/workflows/build_and_test.yml | 30 | ||||
| -rw-r--r-- | test/correctness/testblas.hpp | 9 |
2 files changed, 29 insertions, 10 deletions
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 59487fd8..2d74ed24 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -7,7 +7,7 @@ on: jobs: - build_and_test: + build_and_test_linux_and_macos: strategy: matrix: config: [ @@ -57,3 +57,31 @@ jobs: - name: Run the unittests run: ctest --test-dir build if: ${{ matrix.config.os == 'macos-latest' }} + + build_windows: + + strategy: + matrix: + config: [ + {os: windows-2019, arch: x64}, + ] + + runs-on: ${{ matrix.config.os }} + + steps: + - uses: actions/checkout@v3 + + - name: Set up MSVC + uses: ilammy/msvc-dev-cmd@v1 + + - name: Install OpenBLAS + run: vcpkg.exe --triplet=${{ matrix.config.arch }}-windows install openblas + + - 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 + + - name: Compile the code + run: cmake --build build diff --git a/test/correctness/testblas.hpp b/test/correctness/testblas.hpp index bfefadc5..b2dc6e7a 100644 --- a/test/correctness/testblas.hpp +++ b/test/correctness/testblas.hpp @@ -157,15 +157,6 @@ template <typename T, typename U> const std::vector<Triangle> TestBlas<T,U>::kTr template <typename T, typename U> const std::vector<Side> TestBlas<T,U>::kSides = {Side::kLeft, Side::kRight}; template <typename T, typename U> const std::vector<Diagonal> TestBlas<T,U>::kDiagonals = {Diagonal::kUnit, Diagonal::kNonUnit}; -// The transpose configurations to test with: template parameter dependent, see .cpp file for implementation -template <> const std::vector<Transpose> TestBlas<half,half>::kTransposes; -template <> const std::vector<Transpose> TestBlas<float,float>::kTransposes; -template <> const std::vector<Transpose> TestBlas<double,double>::kTransposes; -template <> const std::vector<Transpose> TestBlas<float2,float2>::kTransposes; -template <> const std::vector<Transpose> TestBlas<double2,double2>::kTransposes; -template <> const std::vector<Transpose> TestBlas<float2,float>::kTransposes; -template <> const std::vector<Transpose> TestBlas<double2,double>::kTransposes; - // ================================================================================================= // Bogus reference function, in case a comparison library is not available |