Skip to content

added mac runner to CI #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shimwell wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

added mac runner to CI #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec52d0e
added mac runner
shimwell Apr 16, 2024
267eb55
added os everywhere
shimwell Apr 16, 2024
62dc6d0
apt-get only for ubuntu
shimwell Apr 16, 2024
b8e13de
corrected opperator
shimwell Apr 16, 2024
2cb5bc3
Merge pull request #52 from shimwell/develop
shimwell Apr 20, 2024
22fb9d1
optional aps
shimwell Apr 20, 2024
c56106c
Merge branch 'adding_mac_runner_to_ci' of github.com:shimwell/openmc …
shimwell Apr 20, 2024
fd448df
added brew install steps
shimwell Apr 20, 2024
e5d491f
update brew
shimwell Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 71 additions & 39 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ env:

jobs:
main:
runs-on: ubuntu-22.04
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-22.04"]
python-version: ["3.10"]
mpi: [n, y]
omp: [n, y]
Expand All @@ -35,46 +36,60 @@ jobs:
vectfit: [n]

include:
- python-version: "3.8"
# - python-version: "3.8"
# os: "ubuntu-22.04"
# omp: n
# mpi: n
# - python-version: "3.9"
# os: "ubuntu-22.04"
# omp: n
# mpi: n
# - python-version: "3.11"
# os: "ubuntu-22.04"
# omp: n
# mpi: n
# - python-version: "3.12"
# os: "ubuntu-22.04"
# omp: n
# mpi: n
# - dagmc: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# mpi: y
# omp: y
# - ncrystal: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# mpi: n
# omp: n
# - libmesh: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# mpi: y
# omp: y
# - libmesh: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# mpi: n
# omp: y
# - event: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# omp: y
# mpi: n
# - vectfit: y
# os: "ubuntu-22.04"
# python-version: "3.10"
# omp: n
# mpi: y
- python-version: "3.10"
os: "macos-latest"
omp: n
mpi: n
- python-version: "3.9"
omp: n
mpi: n
- python-version: "3.11"
omp: n
mpi: n
- python-version: "3.12"
omp: n
mpi: n
- dagmc: y
python-version: "3.10"
mpi: y
omp: y
- ncrystal: y
python-version: "3.10"
mpi: n
omp: n
- libmesh: y
python-version: "3.10"
mpi: y
omp: y
- libmesh: y
python-version: "3.10"
mpi: n
omp: y
- event: y
python-version: "3.10"
omp: y
mpi: n
- vectfit: y
python-version: "3.10"
omp: n
mpi: y
name: "Python ${{ matrix.python-version }} (omp=${{ matrix.omp }},
mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }}, ncrystal=${{ matrix.ncrystal }},
libmesh=${{ matrix.libmesh }}, event=${{ matrix.event }}
vectfit=${{ matrix.vectfit }})"
name: "Python ${{ matrix.os }} ${{ matrix.python-version }},
(omp=${{ matrix.omp }} mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }},
ncrystal=${{ matrix.ncrystal }}, libmesh=${{ matrix.libmesh }},
event=${{ matrix.event }}, vectfit=${{ matrix.vectfit }})"

env:
MPI: ${{ matrix.mpi }}
Expand Down Expand Up @@ -108,6 +123,7 @@ jobs:

- name: Apt dependencies
shell: bash
if: ${{ matrix.os == 'ubuntu-22.04' }}
run: |
sudo apt -y update
sudo apt install -y libpng-dev \
Expand All @@ -121,6 +137,22 @@ jobs:
sudo update-alternatives --set mpirun /usr/bin/mpirun.mpich
sudo update-alternatives --set mpi-x86_64-linux-gnu /usr/include/x86_64-linux-gnu/mpich

- name: Optional apt dependencies
shell: bash
if: ${{ matrix.os == 'ubuntu-22.04' && matrix.vectfit == 'y' }}
run: sudo apt-get install -y libblas-dev liblapack-dev

- name: brew dependencies
shell: bash
if: ${{ matrix.os == 'macos-latest' }}
run: |
# fortran compiler needed for NJOY
brew update
brew install gcc
brew install llvm cmake xtensor hdf5 python libomp libpng
which clang++
export CXX=/opt/homebrew/opt/llvm/bin/clang++

- name: install
shell: bash
run: |
Expand Down
2 changes: 0 additions & 2 deletions tools/ci/gha-install-vectfit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ XTENSOR_PYTHON_REPO='https://github.com/xtensor-stack/xtensor-python'
XTENSOR_BLAS_BRANCH='0.17.1'
XTENSOR_BLAS_REPO='https://github.com/xtensor-stack/xtensor-blas'

sudo apt-get install -y libblas-dev liblapack-dev

cd $HOME
git clone -b $PYBIND_BRANCH $PYBIND_REPO
cd pybind11 && mkdir build && cd build && cmake .. && sudo make install
Expand Down