Skip to content

Commit

Permalink
run macos ci on arm runner
Browse files Browse the repository at this point in the history
  • Loading branch information
mloubout committed May 25, 2024
1 parent 5e9054b commit 3521405
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
name: ${{ matrix.example }}

env:
DEVITO_ARCH: gcc-9
DEVITO_ARCH: gcc-12
DEVITO_LANGUAGE: "openmp"
DEVITO_LOGGING: "ERROR"
OMP_NUM_THREADS: 1
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/ci-judi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
name: JUDI base on Julia ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
DEVITO_ARCH: gcc-12
DEVITO_LANGUAGE: "openmp"
OMP_NUM_THREADS: 4
GROUP: "JUDI"
Expand Down Expand Up @@ -55,6 +54,16 @@ jobs:
with:
python-version: 3.9

- name: setup devito config
run:
if [ "${{matrix.os}}" = "macos-latest" ]; then
echo "DEVITO_ARCH=clang" >> $GITHUB_ENV
echo "DEVITO_PLATFORM=m1" >> $GITHUB_ENV
else
echo "DEVITO_ARCH=gcc-12" >> $GITHUB_ENV
echo "DEVITO_PLATFORM=cpu64" >> $GITHUB_ENV
fi

- name: Set julia python
run: |
PYTHON=$(which python3) julia -e 'using Pkg;Pkg.add("PyCall");Pkg.build("PyCall")'
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/ci-op.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ jobs:
name: ${{ matrix.op }} on Julia ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
DEVITO_ARCH: gcc-12
DEVITO_LANGUAGE: "openmp"
DEVITO_PLATFORM: "cpu64"
DEVITO_LOGGING: "INFO"
OMP_NUM_THREADS: ${{ matrix.omp }}
GROUP: ${{ matrix.op }}
Expand Down Expand Up @@ -85,6 +83,16 @@ jobs:
with:
python-version: 3.9

- name: setup devito config
run:
if [ "${{matrix.os}}" = "macos-latest" ]; then
echo "DEVITO_ARCH=clang" >> $GITHUB_ENV
echo "DEVITO_PLATFORM=m1" >> $GITHUB_ENV
else
echo "DEVITO_ARCH=gcc-12" >> $GITHUB_ENV
echo "DEVITO_PLATFORM=cpu64" >> $GITHUB_ENV
fi

- name: Set julia python
run: |
PYTHON=$(which python3) julia -e 'using Pkg;Pkg.add("PyCall");Pkg.build("PyCall")'
Expand Down

0 comments on commit 3521405

Please sign in to comment.