Skip to content

Switches to mac-15 github images since mac-13 have been deprecated #1929

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.

Sign up for GitHub

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

Merged
jordimas merged 8 commits into from
Nov 7, 2025
Merged

Switches to mac-15 github images since mac-13 have been deprecated #1929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73a5135
mac 15
jordimas Nov 6, 2025
442700e
Fix 1
jordimas Nov 6, 2025
004def0
Fix 1
jordimas Nov 6, 2025
990b84f
sudo
jordimas Nov 6, 2025
d9ee9b6
Fix ;
jordimas Nov 6, 2025
be2ca38
Update prepare_build_environment_macos.sh
jordimas Nov 6, 2025
b56a924
Update ci.yml
jordimas Nov 6, 2025
acb58a3
Update ci.yml
jordimas Nov 6, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ jobs:
include:
- os: ubuntu-22.04
arch: aarch64
- os: macos-13
- os: macos-15
arch: arm64
- os: macos-13
- os: macos-15-intel
arch: x86_64

steps:
Expand All @@ -159,7 +159,7 @@ jobs:
env:
CIBW_ENVIRONMENT_PASS_LINUX: CIBW_ARCHS
CIBW_ENVIRONMENT_WINDOWS: CTRANSLATE2_ROOT='${{ github.workspace }}\install'
CIBW_ENVIRONMENT_MACOS: "CTRANSLATE2_ROOT='/usr/local' MACOSX_DEPLOYMENT_TARGET=10.13"
CIBW_ENVIRONMENT_MACOS: "CTRANSLATE2_ROOT='/usr/local' MACOSX_DEPLOYMENT_TARGET=11.00"
CIBW_BEFORE_ALL_LINUX: python/tools/prepare_build_environment_linux.sh
CIBW_BEFORE_ALL_MACOS: python/tools/prepare_build_environment_macos.sh
CIBW_BEFORE_ALL_WINDOWS: bash python/tools/prepare_build_environment_windows.sh
Expand Down
9 changes: 4 additions & 5 deletions python/tools/prepare_build_environment_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -e
set -x

pip install "cmake==3.18.4"
brew install libomp

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

# Critical: Set OpenMP flags explicitly for CMake
export OpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_PREFIX}/include"
export OpenMP_C_FLAGS="-Xpreprocessor;-fopenmp;-I${LIBOMP_PREFIX}/include"
export OpenMP_C_LIB_NAMES="omp"
export OpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_PREFIX}/include"
export OpenMP_CXX_FLAGS="-Xpreprocessor;-fopenmp;-I${LIBOMP_PREFIX}/include"
export OpenMP_CXX_LIB_NAMES="omp"
export OpenMP_omp_LIBRARY="${LIBOMP_PREFIX}/lib/libomp.dylib"

Expand Down Expand Up @@ -54,7 +53,7 @@ else
-DOpenMP_omp_LIBRARY="${OpenMP_omp_LIBRARY}" \
-DCMAKE_C_FLAGS="${CPPFLAGS}" \
-DCMAKE_CXX_FLAGS="${CPPFLAGS}" .
make -j$(sysctl -n hw.physicalcpu_max) install
sudo make -j$(sysctl -n hw.physicalcpu_max) install
cd ..
rm -r oneDNN-*

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

VERBOSE=1 make -j$(sysctl -n hw.physicalcpu_max) install
sudo VERBOSE=1 make -j$(sysctl -n hw.physicalcpu_max) install
cd ..
rm -r build-release

Expand Down
Loading