From 6180248d58675cad3ccf1c4e8d1d9b9236d8b1d6 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Fri, 10 May 2024 10:27:15 +0900 Subject: [PATCH 1/5] update CI script (macOS-latest, macOS-13) --- .github/workflows/main.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fcedccb4..bde336cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,11 +8,11 @@ jobs: strategy: matrix: - os: ["ubuntu-22.04", "macos-11", "ubuntu-20.04"] + os: ["ubuntu-22.04", "ubuntu-20.04", "macos-latest", "macos-13"] fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: apt if: ${{ runner.os == 'Linux' }} @@ -25,9 +25,13 @@ jobs: run: | brew install openmpi scalapack libomp + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + - name: pip run: | - python -m pip install numpy python3 -m pip install numpy - name: make workspace @@ -40,7 +44,7 @@ jobs: if [ ${{ runner.os }} = "macOS" ] ; then # CONFIG=apple requires gfortran but macOS runner has not, but gfortran-11, 12, ... ln -s `which gfortran-11` gfortran - env PATH=`pwd`:$PATH HOMEBREW_PREFIX=/usr/local cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE + env PATH=`pwd`:$PATH HOMEBREW_PREFIX=/opt/homebrew cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE else cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE fi From ec0160f87723cd97a4811ca837e012e332cd7474 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Fri, 10 May 2024 10:41:10 +0900 Subject: [PATCH 2/5] update --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bde336cc..05b7cf29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - os: ["ubuntu-22.04", "ubuntu-20.04", "macos-latest", "macos-13"] + os: ["ubuntu-22.04", "ubuntu-20.04", "macos-latest"] fail-fast: false steps: @@ -44,10 +44,12 @@ jobs: if [ ${{ runner.os }} = "macOS" ] ; then # CONFIG=apple requires gfortran but macOS runner has not, but gfortran-11, 12, ... ln -s `which gfortran-11` gfortran - env PATH=`pwd`:$PATH HOMEBREW_PREFIX=/opt/homebrew cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE + env PATH=`pwd`:$PATH cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE else cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE fi + env: + HOMEBREW_PREFIX: /opt/homebrew - name: build working-directory: ${{runner.workspace}}/build From a95604911c85942c39db140261acf55aa219d287 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Fri, 10 May 2024 10:49:47 +0900 Subject: [PATCH 3/5] OMP_NUM_THREADS=1 --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05b7cf29..809ea2c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,3 +60,5 @@ jobs: working-directory: ${{runner.workspace}}/build shell: bash run: ctest -V + env: + OMP_NUM_THREADS: 1 From 9eca9ce09c9aeda770b0e8e4c63aa5d813e6a4d5 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Fri, 10 May 2024 10:54:56 +0900 Subject: [PATCH 4/5] set OMP=1 only for macos test --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 809ea2c8..5c32244e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,13 @@ jobs: strategy: matrix: os: ["ubuntu-22.04", "ubuntu-20.04", "macos-latest"] + ompsize: [1, 4] + exclude: + - os: "macos-latest" + ompsize: 4 fail-fast: false + env: + OMP_NUM_THREADS: ${{ matrix.ompsize }} steps: - uses: actions/checkout@v4 @@ -60,5 +66,3 @@ jobs: working-directory: ${{runner.workspace}}/build shell: bash run: ctest -V - env: - OMP_NUM_THREADS: 1 From 041022a0bdf2da0a942fa96c7c862453f7c43afc Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Fri, 10 May 2024 11:11:09 +0900 Subject: [PATCH 5/5] add scheduled CI --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c32244e..b49b05fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,9 @@ name: CI -on: [push] +on: + push: + schedule: + - cron: '0 0 1,15 * *' # JST 9:00 on 1st and 15th every month jobs: ctest: @@ -12,7 +15,7 @@ jobs: ompsize: [1, 4] exclude: - os: "macos-latest" - ompsize: 4 + ompsize: 4 # OMP on macOS is too slow fail-fast: false env: OMP_NUM_THREADS: ${{ matrix.ompsize }}