Skip to content
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.

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

Fix fftw on new Mac GHA machines #1288

Merged
merged 1 commit into from
May 1, 2024
Merged
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
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
py: [ 3.7, 3.8, 3.9, "3.10", 3.11, 3.12 ]
CC: [ gcc ]
CXX: [ g++ ]
FFTW_DIR: [ "/usr/local/lib" ]

# Add some other particular combinations to test
include:
Expand All @@ -33,12 +34,14 @@ jobs:
py: "3.10"
CC: cc
CXX: c++
FFTW_DIR: "/opt/homebrew/lib/"

# Check one with clang compiler
- os: ubuntu-latest
py: "3.10"
CC: clang
CXX: clang++
FFTW_DIR: "/usr/local/lib/"

# And a pypy system.
# As of 12/1/2022, this is broken for astropy.
Expand All @@ -48,6 +51,8 @@ jobs:
#py: pypy-3.7
#CC: gcc
#CXX: g++
env:
FFTW_DIR: ${{ matrix.FFTW_DIR }}

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -95,6 +100,7 @@ jobs:
echo ${{ matrix.os }}
sudo -H apt update -y
sudo -H apt install -y libfftw3-dev
ls $FFTW_DIR

# Easier if eigen is installed with apt-get, but on at least one system, check that
# it gets downloaded and installed properly if it isn't installed.
Expand Down Expand Up @@ -127,6 +133,7 @@ jobs:
brew cask install gfortran || true
brew install libav || true
brew link --overwrite libav || true
ls $FFTW_DIR

- name: Download des_data
run: |
Expand Down Expand Up @@ -165,7 +172,10 @@ jobs:
run: pip list

- name: Build GalSim
run: pip install -vvv .
run: |
# The prefix is required for recen MacOS, because of System Integrity Protection.
# It's not necessary on Linux, but is harmless enough.
FFTW_DIR=$FFTW_DIR pip install -vvv .

- name: Check download_cosmos only if it changed. (And only on 1 runner)
if: matrix.py == 3.7 && github.base_ref != ''
Expand Down
Loading