From 9a1322997089f6964fba8c777b7bbf60a784fc43 Mon Sep 17 00:00:00 2001 From: "Davis E. King" Date: Sat, 25 Mar 2023 22:52:41 -0400 Subject: [PATCH] Exercise more of the ways dlib can be configured in the github actions tests (#2751) --- .github/workflows/build_cpp.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_cpp.yml b/.github/workflows/build_cpp.yml index 4b2b35914..32b3fbcd2 100644 --- a/.github/workflows/build_cpp.yml +++ b/.github/workflows/build_cpp.yml @@ -8,9 +8,6 @@ on: branches: - master -env: - config: Release - defaults: run: shell: bash @@ -54,7 +51,7 @@ jobs: cd build make -j2 - ubuntu-latest-gcc-11: + ubuntu-latest-gcc-11-blas: runs-on: 'ubuntu-latest' steps: - uses: actions/checkout@v2 @@ -62,6 +59,7 @@ jobs: run: | sudo apt update sudo apt install libwebp-dev libavformat-dev libavcodec-dev libavdevice-dev libavfilter-dev libswresample-dev libswscale-dev libavutil-dev + sudo apt install libopenblas-dev liblapack-dev - name: Install gcc 11 run: | sudo apt install gcc-11 g++-11 @@ -75,6 +73,14 @@ jobs: - name: Build examples, etc run: cmake --build build --config Release --parallel 2 + # Test the BLAS bindings + - name: Configure BLAS binding tests + run: cmake ${{ github.workspace }}/dlib/test/blas_bindings -B build_blas_bindings + - name: Build blas binding tests + run: cmake --build build_blas_bindings --config Debug --parallel 4 + - name: Test BLAS bindings + run: build_blas_bindings/dtest --runall -q + ubuntu-18_04-gcc-7: runs-on: 'ubuntu-18.04' steps: @@ -95,7 +101,13 @@ jobs: - name: Build examples, etc run: cmake --build build --config Release --parallel 2 - ubuntu-latest-clang-default: + # Test cmake scrips can build standalone dlib as a shared library + - name: Configure dlib as shared library + run: cmake ${{ github.workspace }}/dlib -B build_dlib_shared -DBUILD_SHARED_LIBS=1 + - name: Build dlib as shared library + run: cmake --build build_dlib_shared --parallel 4 + + ubuntu-latest-clang-default-avx: runs-on: 'ubuntu-latest' steps: - uses: actions/checkout@v2 @@ -107,7 +119,7 @@ jobs: run: | export CC=/usr/bin/clang export CXX=/usr/bin/clang++ - cmake ${{ github.workspace }}/dlib/test -B build + cmake ${{ github.workspace }}/dlib/test -B build -DUSE_AVX_INSTRUCTIONS=1 - name: Build just tests run: cmake --build build --config Release --target dtest --parallel 4 - name: Test