diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd5412ec..5f4c3186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: debug: 0 noalligather: 0 mpich: 0 - threadoff: 0 + numthread: 1 elsi: 0 - name: ubuntu-debug os: ubuntu-latest @@ -27,7 +27,7 @@ jobs: debug: 1 noalligather: 0 mpich: 0 - threadoff: 0 + numthread: 1 elsi: 0 - name: ubuntu-nogather os: ubuntu-latest @@ -37,7 +37,7 @@ jobs: debug: 0 noalligather: 1 mpich: 0 - threadoff: 0 + numthread: 1 elsi: 0 - name: ubuntu-mpich os: ubuntu-latest @@ -47,7 +47,7 @@ jobs: debug: 0 noalligather: 0 mpich: 1 - threadoff: 0 + numthread: 3 elsi: 0 - name: mac-thread-cap os: macos-latest @@ -57,7 +57,7 @@ jobs: debug: 0 noalligather: 0 mpich: 0 - threadoff: 1 + numthread: 3 elsi: 0 - name: mac os: macos-latest @@ -68,7 +68,7 @@ jobs: noalligather: 0 mpich: 0 lint: 1 - threadoff: 0 + numthread: 3 elsi: 1 runs-on: ${{ matrix.os }} steps: @@ -92,7 +92,7 @@ jobs: env: MAKETEST: ${{ matrix.maketest }} TESTOS: ${{ matrix.testos }} - THREADOFF: ${{ matrix.threadoff }} + OMP_NUM_THREADS: ${{ matrix.num_thread }} - name: check examples run: | bash -l UnitTests/check_examples.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index c8db3eb7..eab501df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ ## Basic Setup cmake_minimum_required (VERSION 3.9) -project(NTPoly VERSION 2.7.0 DESCRIPTION +project(NTPoly VERSION 3.1.0 DESCRIPTION "A parallel library for computing the functions of sparse matrices") enable_language(Fortran) diff --git a/UnitTests/run_ci_test.sh b/UnitTests/run_ci_test.sh index c3942794..6714d643 100644 --- a/UnitTests/run_ci_test.sh +++ b/UnitTests/run_ci_test.sh @@ -4,13 +4,7 @@ if [[ "$TESTOS" == "LINUX" ]]; then conda activate ntpoly-conda fi -if [[ "$THREADOFF" == "1" ]]; then - export OMP_NUM_THREADS=1 - echo "Setting threads to 1" -else - export OMP_NUM_THREADS=2 - echo "Setting threads to 2" -fi +echo "Setting threads to $OMP_NUM_THREADS" cd Build export CTEST_OUTPUT_ON_FAILURE=1