Skip to content

Commit

Permalink
update github action files, github actions uses macos-latest for arm6…
Browse files Browse the repository at this point in the history
…4, so change to use macos-13 is for x86_64
  • Loading branch information
lu1and10 committed Apr 26, 2024
1 parent aff74f2 commit cc8629f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/C++.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:
jobs:
Linux:
runs-on: ubuntu-latest
container: quay.io/pypa/manylinux2014_x86_64:latest
container: quay.io/pypa/manylinux_2_28_x86_64:latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install fftw
run: |
Expand All @@ -29,7 +29,7 @@ jobs:
make test
MacOS_clang:
runs-on: macos-latest
runs-on: macos-13
env:
MACOSX_DEPLOYMENT_TARGET: 10.15

Expand All @@ -48,7 +48,7 @@ jobs:
make test
MacOS_gcc:
runs-on: macos-latest
runs-on: macos-13
env:
MACOSX_DEPLOYMENT_TARGET: 10.15

Expand All @@ -57,8 +57,8 @@ jobs:

- name: Install gcc and fftw
run: |
brew install gcc@10 fftw
cp make.inc.macosx_gcc-10 make.inc
brew install gcc@12 fftw
cp make.inc.macosx_gcc-12 make.inc
- name: Compile C++ code
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# may change to cpack and action-gh-release later
- name: Upload static and shared lib
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{matrix.os}}-${{matrix.compiler}}-finufft-lib
path: ${{runner.workspace}}/finufft/build/*finufft*
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/python_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:
jobs:
Linux:
runs-on: ubuntu-latest
container: quay.io/pypa/manylinux2014_x86_64:latest
container: quay.io/pypa/manylinux_2_28_x86_64:latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install fftw
run: |
Expand All @@ -31,13 +31,13 @@ jobs:
tools/finufft/build-wheels-linux.sh
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-wheels
path: python/finufft/wheelhouse/finufft*manylinux*.whl

MacOS:
runs-on: macos-latest
runs-on: macos-13
env:
MACOSX_DEPLOYMENT_TARGET: 10.15

Expand All @@ -47,18 +47,18 @@ jobs:
- name: Install gcc and fftw
run: |
brew install gcc fftw
cp make.inc.macosx_gcc-8 make.inc
echo "FC=gfortran-11" >> make.inc
echo "CC=gcc-11" >> make.inc
echo "CXX=g++-11" >> make.inc
cp make.inc.macosx_gcc-12 make.inc
echo "FC=gfortran-13" >> make.inc
echo "CC=gcc-13" >> make.inc
echo "CXX=g++-13" >> make.inc
echo "FFLAGS += -march=x86-64" >> make.inc
echo "CFLAGS += -march=x86-64" >> make.inc
echo "CXXFLAGS += -march=x86-64" >> make.inc
# link statically to libgcc, libgfortran and libquadmath
# otherwise binaries are incompatible with older systems
echo "LIBS += -static-libgfortran -static-libgcc -static-libstdc++" >> make.inc
# hack to make libquadmath link statically
sudo rm /usr/local/opt/gcc@11/lib/gcc/11/libquadmath.*dylib
sudo rm /usr/local/opt/gcc@13/lib/gcc/13/libquadmath.*dylib
# Download and install Python instead of using the setup_python
# as the python interpreters in the Github machines
Expand Down Expand Up @@ -106,8 +106,8 @@ jobs:
run: |
make lib
export FINUFFT_DIR=`pwd`
export CC=gcc-11
export CXX=g++-11
export CC=gcc-13
export CXX=g++-13
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install --upgrade setuptools wheel numpy pip
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip install -U wheel --user
/Library/Frameworks/Python.framework/Versions/3.6/bin/python3 -m pip wheel python/finufft -w wheelhouse
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-wheels
path: fixed_wheel/*.whl
Expand All @@ -186,7 +186,7 @@ jobs:
run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw"

- name: Build and Test Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.8'
architecture: 'x64'
Expand All @@ -195,7 +195,7 @@ jobs:
.\.github\workflows\python_test_win.ps1
- name: Build and Test Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: 'x64'
Expand All @@ -204,7 +204,7 @@ jobs:
.\.github\workflows\python_test_win.ps1
- name: Build and Test Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand All @@ -213,7 +213,7 @@ jobs:
.\.github\workflows\python_test_win.ps1
- name: Build and Test Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
architecture: 'x64'
Expand All @@ -222,7 +222,7 @@ jobs:
.\.github\workflows\python_test_win.ps1
- name: Build and Test Python 3.12
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.12'
architecture: 'x64'
Expand All @@ -231,7 +231,7 @@ jobs:
.\.github\workflows\python_test_win.ps1
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-wheels
path: wheelhouse\*.whl
4 changes: 2 additions & 2 deletions .github/workflows/python_wheel_macos_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
make lib
- name: Build wheels
uses: pypa/cibuildwheel@v2.16.2
uses: pypa/cibuildwheel@v2.17.0
env:
FINUFFT_DIR: ${{ github.workspace }}
CC: Clang
Expand All @@ -44,7 +44,7 @@ jobs:
output-dir: wheelhouse

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-arm64-wheels
path: wheelhouse/*.whl
Expand Down

0 comments on commit cc8629f

Please sign in to comment.