Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ jobs:
config_opts: --enable-i4 --without-blas --enable-cxx --disable-f77
f77: gfortran
cc: gcc
- os: macos-13
experimental: true
mpi_impl: mpich
armci_network: mpi-pr
f77: ifort
cc: icc
config_opts: LIBS=-lifcore
oneapi: /Users/runner/apps/oneapi
- os: ubuntu-22.04
experimental: true
mpi_impl: mpich
Expand All @@ -83,14 +75,14 @@ jobs:
config_opts: "--disable-f77 --enable-cxx"
f77: gfortran-10
cc: gcc-10
- os: macos-13
- os: macos-15
experimental: true
mpi_impl: mpich
armci_network: mpi-ts
config_opts: "--disable-static --enable-shared"
f77: gfortran-13
cc: clang
- os: macos-13
- os: macos-15
experimental: true
use_cmake: "Y"
mpi_impl: mpich
Expand Down Expand Up @@ -181,6 +173,15 @@ jobs:
macos*)
brew update
brew install coreutils automake || true
if [[ "$F77" =~ gfortran-[0-9][0-9] ]] || [[ "$CC" =~ gcc-[0-9][0-9] ]]; then
if [[ "$CC" =~ gcc-[0-9][0-9] ]]; then
version=$(echo "$CC" | cut -d - -f 2 )
fi
if [[ "$F77" =~ gfortran-[0-9][0-9] ]]; then
version=$(echo "$F77" | cut -d - -f 2 )
fi
brew reinstall gcc@${version}
fi
;;
esac
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then ./travis/install-intel.sh; source ${{ matrix.oneapi }}/setvars.sh --force; fi
Expand Down
3 changes: 3 additions & 0 deletions travis/install-intel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ case "$os" in
my_id=`id -u`
sudo chown -R $my_id /opt/intel
sudo chgrp -R $my_gr /opt/intel
if [[ "$MPI_IMPL" == "mpich" ]]; then
brew install hwloc
fi
;;
Linux)
export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
Expand Down
17 changes: 12 additions & 5 deletions travis/install-mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ if [[ -z "${F77}" ]]; then
F77="${FC}"
fi

if [ "$F77" == "gfortran" ] && [ "$os" == "Darwin" ]; then
if [[ ! -x "$(command -v gfortran)" ]]; then
echo gfortran undefined
echo symbolic link gfortran-12
ln -sf /usr/local/bin/gfortran-12 /usr/local/bin/gfortran
if [ "$os" == "Darwin" ]; then
if [[ ! -x "$(command -v ${FC})" ]]; then
if [[ "${FC}" == *"-"* ]]; then
gccver=$(echo ${FC} | cut -d - -f 2)
brew install gcc@"${gccver}"
elif [[ "${FC}" == "gfortran" ]]; then
brew reinstall gcc
else
echo "cannot install ${FC}"
exit 10
fi
${FC} --version
fi
fi

Expand Down