Skip to content

use macos-13 instead of macos-11 #165

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

Merged
merged 6 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
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
38 changes: 21 additions & 17 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-11]
os: [ubuntu-latest, macos-13]
PLAT: [i686, x86_64]
INTERFACE64: ['0', '1']
MB_ML_VER: ['2014']
MB_ML_LIBC: ['manylinux']
include:
- os: macos-11
- os: macos-13
PLAT: arm64
INTERFACE64: '1'
- os: macos-11
- os: macos-13
PLAT: arm64
INTERFACE64: '0'
- os: ubuntu-latest
Expand All @@ -42,7 +42,7 @@ jobs:
MB_ML_VER: _1_1
exclude:
- PLAT: i686
os: macos-11
os: macos-13
- PLAT: i686
INTERFACE64: '1'
env:
Expand All @@ -69,13 +69,13 @@ jobs:
python-version: 3.9
- name: Set extra env
run: |
# if [ "macos-11" == "${{ matrix.os }}" ]; then
# Use xcrun --sdk macosx --show-sdk-path instead of hardcoding the path
# echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
# echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
# else
# fi
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;

- uses: maxim-lobanov/[email protected]
if: ${{ matrix.os == 'macos-13' }}
with:
xcode-version: '14.3'

- name: Print some Environment variable
run: |
echo "PLAT: ${PLAT}"
Expand All @@ -87,11 +87,6 @@ jobs:
- name: Build OpenBLAS
run: |
set -xeo pipefail
if [[ "$PLAT" == "arm64" ]]; then
sudo xcode-select -switch /Applications/Xcode_12.5.1.app
export SDKROOT=/Applications/Xcode_12.5.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
clang --version
fi
source tools/build_steps.sh
echo "------ BEFORE BUILD ---------"
before_build
Expand All @@ -107,14 +102,20 @@ jobs:
build_lib "$PLAT" "$INTERFACE64" "0"
fi

# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
# with:
# limit-access-to-actor: true

- name: Build and test wheel
run: |
if [[ "$NIGHTLY" = "true" ]]; then
# Set the pyproject.toml version: convert v0.3.24-30-g138ed79f to 0.3.34.30
version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
fi
if [ "macos-11" == "${{ matrix.os }}" ]; then
if [ "macos-13" == "${{ matrix.os }}" ]; then
source tools/build_wheel.sh
else
libc=${MB_ML_LIBC:-manylinux}
Expand All @@ -136,9 +137,12 @@ jobs:
name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}
path: libs/openblas*.tar.gz

- uses: conda-incubator/[email protected].1
- uses: conda-incubator/[email protected].4
with:
channels: conda-forge
channel-priority: true
activate-environment: upload
miniforge-version: latest

- name: Upload
# see https://github.com/marketplace/actions/setup-miniconda for why
Expand Down
6 changes: 4 additions & 2 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function build_lib {
# OSX or manylinux build
#
# Input arg
# plat - one of i686, x86_64
# plat - one of i686, x86_64, arm64
# interface64 - 1 if build with INTERFACE64 and SYMBOLSUFFIX
# nightly - 1 if building for nightlies
#
Expand Down Expand Up @@ -103,7 +103,7 @@ function patch_source {
function do_build_lib {
# Build openblas lib
# Input arg
# plat - one of i686, x86_64
# plat - one of i686, x86_64, arm64
# suffix (optional) - suffix for output archive name
# Suffix added with hyphen prefix
# interface64 (optional) - whether to build ILP64 openblas
Expand All @@ -125,6 +125,8 @@ function do_build_lib {
Darwin-x86_64)
local bitness=64
local target_flags="TARGET=CORE2"
# Pick up the gfortran runtime libraries
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
;;
*-i686)
local bitness=32
Expand Down
2 changes: 1 addition & 1 deletion tools/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if [ "${INTERFACE64}" != "1" ]; then
fi

rm -rf dist/*
$PYTHON -m pip wheel -w dist -vv .
$PYTHON -m pip wheel -w dist -v .

if [ $(uname) == "Darwin" ]; then
$PYTHON -m pip install delocate
Expand Down
Loading