diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2023-12-13 05:04:45 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-12-20 07:01:28 +0300 |
| commit | f9c6864ad15ff7c57752a79fb5cf01a6d974d973 (patch) | |
| tree | 451725ee97ce022bb44a1db2dd37fd7e673d222b | |
| parent | a7251be9d079bf267985ce6dcd9ca4160021788a (diff) | |
Enable DRED and OSCE for gitlab/github CI
| -rw-r--r-- | .github/workflows/autotools.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/dred.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 91d332bf..bb66d5b0 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -29,6 +29,12 @@ jobs: compiler: gcc, buildconfig: --enable-assertions --enable-custom-modes } + - { + name: "Linux/GCC/EnableDNN", + os: ubuntu-latest, + compiler: gcc, + buildconfig: --enable-assertions --enable-custom-modes --enable-dred --enable-osce + } steps: - uses: actions/checkout@v3 # No AutoMake on Mac so let's install it @@ -42,4 +48,4 @@ jobs: - name: Build run: make -j 2 - name: Test - run: make check -j 2
\ No newline at end of file + run: make check -j 2 diff --git a/.github/workflows/dred.yml b/.github/workflows/dred.yml index 52ac2571..ac703dd1 100644 --- a/.github/workflows/dred.yml +++ b/.github/workflows/dred.yml @@ -74,7 +74,7 @@ jobs: run: mkdir build - name: Configure working-directory: ./build - run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON + run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON -DOPUS_OSCE=ON - name: Build working-directory: ./build run: cmake --build . -j 2 --config ${{ matrix.config.config }} --target package diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0117c46e..92f578bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,9 +64,9 @@ autoconf: - !reference [.snippets, git_prep] script: - ./autogen.sh - - CFLAGS="-mavx -mfma -mavx2 -O2 -ffast-math" ./configure --enable-float-approx + - CFLAGS="-mavx -mfma -mavx2 -O2 -ffast-math" ./configure --enable-float-approx --enable-dred --enable-osce - make -j16 - - DISTCHECK_CONFIGURE_FLAGS="--enable-float-approx CFLAGS='-mavx -mfma -mavx2 -O2'" make distcheck -j16 + - DISTCHECK_CONFIGURE_FLAGS="--enable-float-approx --enable-dred --enable-osce CFLAGS='-mavx -mfma -mavx2 -O2'" make distcheck -j16 cache: paths: - "src/*.o" @@ -87,7 +87,7 @@ cmake: script: - ./autogen.sh - mkdir build - - cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON -DOPUS_X86_PRESUME_AVX2=ON + - cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON -DOPUS_OSCE=ON -DOPUS_X86_PRESUME_AVX2=ON - cmake --build build - cd build && ctest --output-on-failure -j 16 @@ -101,7 +101,7 @@ cmake: script: - ./autogen.sh - mkdir builddir - - meson setup -Dtests=enabled -Ddocs=enabled -Dbuildtype=release builddir + - meson setup -Denable-deep-plc=true -Denable-osce=true -Denable-dred=true -Dtests=enabled -Ddocs=enabled -Dbuildtype=release builddir - meson compile -C builddir - meson test -C builddir #- meson dist --no-tests -C builddir |