diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c36231c05..0c32af8b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,7 @@ jobs: make macOS-latest-cmake: - runs-on: macOS-latest + runs-on: macos-latest steps: - name: Clone @@ -152,16 +152,21 @@ jobs: strategy: matrix: include: - - build: 'avx2' - defines: '' - - build: 'avx' - defines: '-DLLAMA_AVX2=OFF' - - build: 'avx512' - defines: '-DLLAMA_AVX512=ON -DBUILD_SHARED_LIBS=ON' - - build: 'opencl' - 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"' + - build: 'avx2' + defines: '' + testing: true + - build: 'avx' + defines: '-DLLAMA_AVX2=OFF' + testing: true + - build: 'avx512' + defines: '-DLLAMA_AVX512=ON -DBUILD_SHARED_LIBS=ON' + testing: true + - build: 'opencl' + defines: '-DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/clblast"' + testing: false + - build: 'openblas' + defines: '-DLLAMA_OPENBLAS=ON -DBLAS_LIBRARIES="/LIBPATH:$env:RUNNER_TEMP/openblas/lib" -DOPENBLAS_INC="$env:RUNNER_TEMP/openblas/include"' + testing: true steps: - name: Clone @@ -187,6 +192,7 @@ jobs: $txt = Get-Content -Path $f -Raw $txt.Replace('C:/dependencies/opencl/', "$($env:RUNNER_TEMP.Replace('\','/'))/opencl/") | Set-Content -Path $f -Encoding UTF8 } + - name: Download OpenBLAS id: get_openblas if: ${{ matrix.build == 'openblas' }} @@ -218,7 +224,7 @@ jobs: - name: Check AVX512F support id: check_avx512f - if: ${{ matrix.build == 'avx512' }} + if: ${{ matrix.testing && matrix.build == 'avx512' }} continue-on-error: true run: | cd build @@ -231,7 +237,7 @@ jobs: - name: Test id: cmake_test - if: ${{ ( matrix.build != 'avx512' || env.HAS_AVX512F == '1' ) && matrix.build != 'opencl' }} # Test AVX-512 only when possible + if: ${{ matrix.testing && (matrix.build != 'avx512' || env.HAS_AVX512F == '1') }} # Test AVX-512 only when possible run: | cd build ctest -C Release --verbose