Skip to content

Commit 51e2ee1

Browse files
committed
Wheels: More on GH Actions
Build aarch64/arm64 on native arm runners (GH action feature preview). Build ppc64le on emulated x64 runners on GH action (Travis keeps cancelling our runners even though they need 0 credits; support always needs to unblock us).
1 parent 1f4e30d commit 51e2ee1

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

.github/workflows/build.yml

+25-9
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,53 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
- os: ubuntu-20.04
13+
- os: ubuntu-24.04
1414
arch: "x86_64"
15+
env:
16+
CMAKE_BUILD_PARALLEL_LEVEL: 4
1517

16-
- os: ubuntu-20.04
18+
- os: ubuntu-24.04
1719
arch: "i686"
20+
env:
21+
CMAKE_BUILD_PARALLEL_LEVEL: 4
1822

19-
# builds faster on Travis-CI:
20-
#- os: ubuntu-20.04
21-
# arch: "aarch64"
23+
- os: ubuntu-24.04-arm
24+
arch: "aarch64"
25+
env:
26+
CMAKE_BUILD_PARALLEL_LEVEL: 4
2227

2328
# builds faster on Travis-CI:
24-
#- os: ubuntu-20.04
25-
# arch: "ppc64le"
29+
- os: ubuntu-24.04
30+
arch: "ppc64le"
31+
env:
32+
CMAKE_BUILD_PARALLEL_LEVEL: 4
2633

2734
# builds faster on Travis-CI:
2835
# blocked by https://github.com/GTkorvo/dill/issues/15
29-
#- os: ubuntu-20.04
36+
#- os: ubuntu-24.04
3037
# arch: "s390x"
38+
# env:
39+
# CMAKE_BUILD_PARALLEL_LEVEL: 4
3140

3241
# x86-64 (64bit)
3342
- os: windows-2019
3443
arch: "AMD64"
44+
env:
45+
CMAKE_BUILD_PARALLEL_LEVEL: 4
3546

3647
# x86 (32bit)
3748
- os: windows-2019
3849
arch: "x86"
3950
env:
4051
CMAKE_GENERATOR: "Visual Studio 16 2019"
4152
CMAKE_GENERATOR_PLATFORM: "Win32"
53+
CMAKE_BUILD_PARALLEL_LEVEL: 4
4254

4355
- os: macos-13
4456
arch: "x86_64"
4557
env:
4658
MACOSX_DEPLOYMENT_TARGET: 11.0
59+
CMAKE_BUILD_PARALLEL_LEVEL: 4
4760

4861
# Apple Silicon M1/arm64/aarch64 builds:
4962
# https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
@@ -53,6 +66,7 @@ jobs:
5366
env:
5467
CMAKE_OSX_ARCHITECTURES: "arm64"
5568
MACOSX_DEPLOYMENT_TARGET: 11.0
69+
CMAKE_BUILD_PARALLEL_LEVEL: 3
5670

5771
# Apple universal builds that contain x86-64 and arm64 binary code
5872
# Needs extra treatment of all librarys that are not CMake
@@ -65,6 +79,7 @@ jobs:
6579
# env:
6680
# CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
6781
# MACOSX_DEPLOYMENT_TARGET: 11.0
82+
# CMAKE_BUILD_PARALLEL_LEVEL: 3
6883

6984
steps:
7085
- uses: actions/checkout@v4
@@ -125,10 +140,11 @@ jobs:
125140
# static dependencies of HDF5 and ADIOS1 (see setup.py)
126141
CIBW_ENVIRONMENT: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' ADIOS_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON'
127142
CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc2;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib'
143+
CMAKE_OSX_ARCHITECTURES: "${{ matrix.env.CMAKE_OSX_ARCHITECTURES }}"
128144
# C++17 support in macOS 10.13+ (partial) and 10.14+ (std::visit) and 10.15+ (std::filesystem::path)
129145
# https://cibuildwheel.readthedocs.io/en/stable/cpp_standards/#macos-and-deployment-target-versions
130146
# arm64/aarch64 (M1/M2) requires 11.0+
131-
MACOSX_DEPLOYMENT_TARGET: "${{ matrix.env.MACOSX_DEPLOYMENT_TARGET }}"
147+
CMAKE_BUILD_PARALLEL_LEVEL: "${{ matrix.env.CMAKE_BUILD_PARALLEL_LEVEL }}"
132148
CMAKE_OSX_ARCHITECTURES: "${{ matrix.env.CMAKE_OSX_ARCHITECTURES }}"
133149
# Windows cross-compilation
134150
CMAKE_GENERATOR: "${{ matrix.env.CMAKE_GENERATOR }}"

library_builders.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set CURRENTDIR="%cd%"
22

33
set BUILD_PREFIX="C:/Program Files (x86)"
4-
set CPU_COUNT="2"
4+
set CPU_COUNT="4"
55

66
echo "CFLAGS: %CFLAGS%"
77
echo "CXXFLAGS: %CXXFLAGS%"

library_builders.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [ "$(uname -s)" = "Darwin" ]
1010
then
1111
CPU_COUNT="${CPU_COUNT:-3}"
1212
else
13-
CPU_COUNT="${CPU_COUNT:-2}"
13+
CPU_COUNT="${CPU_COUNT:-4}"
1414
fi
1515

1616
function install_buildessentials {

0 commit comments

Comments
 (0)