diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b127843..6ef1c36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,21 @@ name: CI -on: [push, pull_request] +on: + push: + paths-ignore: + - "docs/**" + - "*.md" + - "*.rst" + - ".*" + + pull_request: + paths-ignore: + - "docs/**" + - "*.md" + - "*.rst" + - ".*" + + workflow_dispatch: env: M_BUILD_DIR: _build_meson @@ -17,31 +32,37 @@ jobs: env: FC: gfortran GCC_V: 10 + PYTHON_V: 3.8 steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - uses: actions/setup-python@v1 + - name: Setup Python version ${{ env.PYTHON_V }} + uses: actions/setup-python@v4 with: - python-version: '3.x' + python-version: ${{ env.PYTHON_V }} - name: Install GCC (OSX) if: contains(matrix.os, 'macos') run: | - ln -s /usr/local/bin/gfortran-${GCC_V} /usr/local/bin/gfortran - which gfortran-${GCC_V} - which gfortran + brew install gcc@${{ env.GCC_V }} openblas + ln -s /usr/local/bin/gfortran-${{ env.GCC_V }} /usr/local/bin/gfortran + ln -s /usr/local/bin/gcc-${{ env.GCC_V }} /usr/local/bin/gcc + ln -s /usr/local/bin/g++-${{ env.GCC_V }} /usr/local/bin/g++ + echo "PKG_CONFIG_PATH=/usr/local/opt/openblas/lib/pkgconfig" >> $GITHUB_ENV + which gfortran - name: Install GCC (Linux) if: contains(matrix.os, 'ubuntu') run: | - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \ + sudo update-alternatives + --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \ --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V} - name: Install meson/cmake - run: pip3 install meson==0.56.2 ninja cmake + run: pip3 install meson==0.57.2 ninja cmake - name: Configure meson build run: meson setup ${{ env.M_BUILD_DIR }} diff --git a/README.md b/README.md index f706a34..8f07850 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,9 @@ Currently available benchmark sets are - *MB16-43* - *UPU23* - *X23* + +Furthermore, some test systems beyond of published benchmark sets are collected + - *f-block* For the detailed record names of the benchmarks look up the respective benchmark entry. diff --git a/src/mstore.f90 b/src/mstore.f90 index aded1bc..d1b41eb 100644 --- a/src/mstore.f90 +++ b/src/mstore.f90 @@ -130,13 +130,13 @@ subroutine get_mstore_collections(collections) collections = [ & new_collection("Amino20x4", get_amino20x4_records), & new_collection("But14diol", get_but14diol_records), & + new_collection("f-block", get_f_block_records), & new_collection("Heavy28", get_heavy28_records), & new_collection("ICE10", get_ice10_records), & new_collection("IL16", get_il16_records), & new_collection("MB16-43", get_mb16_43_records), & new_collection("UPU23", get_upu23_records), & - new_collection("X23", get_x23_records), & - new_collection("f-block", get_f_block_records) & + new_collection("X23", get_x23_records) & ] end subroutine get_mstore_collections diff --git a/src/mstore/CMakeLists.txt b/src/mstore/CMakeLists.txt index 262618a..1ffe6db 100644 --- a/src/mstore/CMakeLists.txt +++ b/src/mstore/CMakeLists.txt @@ -21,13 +21,13 @@ list( APPEND srcs "${dir}/amino20x4.f90" "${dir}/but14diol.f90" + "${dir}/f_block.f90" "${dir}/heavy28.f90" "${dir}/ice10.f90" "${dir}/il16.f90" "${dir}/mb16_43.f90" "${dir}/upu23.f90" "${dir}/x23.f90" - "${dir}/f_block.f90" ) set(srcs "${srcs}" PARENT_SCOPE) diff --git a/src/mstore/meson.build b/src/mstore/meson.build index c1c0db2..711ae0e 100644 --- a/src/mstore/meson.build +++ b/src/mstore/meson.build @@ -18,11 +18,11 @@ subdir('data') srcs += files( 'amino20x4.f90', 'but14diol.f90', + 'f_block.f90', 'heavy28.f90', 'ice10.f90', 'il16.f90', 'mb16_43.f90', 'upu23.f90', 'x23.f90', - 'f_block.f90', )