Skip to content

Commit 7a68d9c

Browse files
authored
Switches to mac-15 github images since mac-13 have been deprecated (#1929)
Switches to mac-15 github images since mac-13 have been deprecated
1 parent 7f23e02 commit 7a68d9c

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ jobs:
137137
include:
138138
- os: ubuntu-22.04
139139
arch: aarch64
140-
- os: macos-13
140+
- os: macos-15
141141
arch: arm64
142-
- os: macos-13
142+
- os: macos-15-intel
143143
arch: x86_64
144144

145145
steps:
@@ -159,7 +159,7 @@ jobs:
159159
env:
160160
CIBW_ENVIRONMENT_PASS_LINUX: CIBW_ARCHS
161161
CIBW_ENVIRONMENT_WINDOWS: CTRANSLATE2_ROOT='${{ github.workspace }}\install'
162-
CIBW_ENVIRONMENT_MACOS: "CTRANSLATE2_ROOT='/usr/local' MACOSX_DEPLOYMENT_TARGET=10.13"
162+
CIBW_ENVIRONMENT_MACOS: "CTRANSLATE2_ROOT='/usr/local' MACOSX_DEPLOYMENT_TARGET=11.00"
163163
CIBW_BEFORE_ALL_LINUX: python/tools/prepare_build_environment_linux.sh
164164
CIBW_BEFORE_ALL_MACOS: python/tools/prepare_build_environment_macos.sh
165165
CIBW_BEFORE_ALL_WINDOWS: bash python/tools/prepare_build_environment_windows.sh

python/tools/prepare_build_environment_macos.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
set -e
33
set -x
44

5-
pip install "cmake==3.18.4"
65
brew install libomp
76

87
# Get the actual libomp path
@@ -14,9 +13,9 @@ export CPPFLAGS="-I${LIBOMP_PREFIX}/include"
1413
export CMAKE_PREFIX_PATH="${LIBOMP_PREFIX}"
1514

1615
# Critical: Set OpenMP flags explicitly for CMake
17-
export OpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_PREFIX}/include"
16+
export OpenMP_C_FLAGS="-Xpreprocessor;-fopenmp;-I${LIBOMP_PREFIX}/include"
1817
export OpenMP_C_LIB_NAMES="omp"
19-
export OpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_PREFIX}/include"
18+
export OpenMP_CXX_FLAGS="-Xpreprocessor;-fopenmp;-I${LIBOMP_PREFIX}/include"
2019
export OpenMP_CXX_LIB_NAMES="omp"
2120
export OpenMP_omp_LIBRARY="${LIBOMP_PREFIX}/lib/libomp.dylib"
2221

@@ -54,7 +53,7 @@ else
5453
-DOpenMP_omp_LIBRARY="${OpenMP_omp_LIBRARY}" \
5554
-DCMAKE_C_FLAGS="${CPPFLAGS}" \
5655
-DCMAKE_CXX_FLAGS="${CPPFLAGS}" .
57-
make -j$(sysctl -n hw.physicalcpu_max) install
56+
sudo make -j$(sysctl -n hw.physicalcpu_max) install
5857
cd ..
5958
rm -r oneDNN-*
6059

@@ -71,7 +70,7 @@ cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
7170
-DOpenMP_omp_LIBRARY="${OpenMP_omp_LIBRARY}" \
7271
$CMAKE_EXTRA_OPTIONS ..
7372

74-
VERBOSE=1 make -j$(sysctl -n hw.physicalcpu_max) install
73+
sudo VERBOSE=1 make -j$(sysctl -n hw.physicalcpu_max) install
7574
cd ..
7675
rm -r build-release
7776

0 commit comments

Comments
 (0)