From 2e49b711f63b4ba9394c1d46f367510fc82d8946 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 21 Nov 2023 10:46:47 +0100 Subject: [PATCH] GHA: use clang for amici-heavy tests (#1198) Should be faster. Also use all cores for building amici models. Saves 2-3 minutes for the petab test suite. --- .github/workflows/ci.yml | 10 ++++++++++ .github/workflows/install_deps.sh | 2 +- tox.ini | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62f53ea0c..ed2a18a15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,10 @@ on: # run Monday and Thursday at 03:42 UTC - cron: '42 3 * * MON,THU' +env: + # use all available cores for compiling amici models + AMICI_PARALLEL_COMPILE: "" + # jobs jobs: base: @@ -40,6 +44,9 @@ jobs: - name: Run tests timeout-minutes: 25 run: tox -e base + env: + CC: clang + CXX: clang++ - name: Coverage uses: codecov/codecov-action@v3 @@ -133,6 +140,9 @@ jobs: - name: Run tests timeout-minutes: 35 run: tox -e petab + env: + CC: clang + CXX: clang++ - name: Coverage uses: codecov/codecov-action@v3 diff --git a/.github/workflows/install_deps.sh b/.github/workflows/install_deps.sh index 9d27fc5d7..475ad5a5e 100755 --- a/.github/workflows/install_deps.sh +++ b/.github/workflows/install_deps.sh @@ -32,7 +32,7 @@ for par in "$@"; do brew install swig hdf5 libomp else sudo apt-get install \ - swig libatlas-base-dev libhdf5-serial-dev + clang libatlas-base-dev libhdf5-serial-dev libomp-dev swig fi ;; diff --git a/tox.ini b/tox.ini index 9a76e7f5d..1f10143ef 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,7 @@ envlist = # Base-environment [testenv] -passenv = AMICI_PARALLEL_COMPILE +passenv = AMICI_PARALLEL_COMPILE,CC,CXX # Sub-environments # inherit settings defined in the base