Skip to content

Commit 94cf415

Browse files
committed
reduce manylinux builds, fix wheel building/testing
1 parent 0570403 commit 94cf415

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

.github/workflows/posix.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,27 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-latest, macos-11]
22-
platform: [x64]
2322
PLAT: [i686, x86_64]
2423
INTERFACE64: ['0', '1']
25-
MB_ML_VER: ['', 2010, 2014]
24+
MB_ML_VER: [2014]
2625
include:
2726
- os: macos-11
2827
PLAT: arm64
2928
INTERFACE64: '1'
30-
platform: [x64]
3129
- os: macos-11
3230
PLAT: arm64
3331
INTERFACE64: '0'
34-
platform: [x64]
3532
- os: ubuntu-latest
3633
PLAT: x86_64
3734
INTERFACE64: '1'
3835
MB_ML_LIBC: musllinux
3936
MB_ML_VER: _1_1
40-
platform: x64
4137
- os: ubuntu-latest
4238
PLAT: x86_64
4339
INTERFACE64: '0'
4440
MB_ML_LIBC: musllinux
4541
MB_ML_VER: _1_1
46-
platform: [x64]
4742
exclude:
48-
- os: macos-11
49-
PLAT: i686
50-
- os: macos-11
51-
MB_ML_VER: 2010
5243
- os: macos-11
5344
MB_ML_VER: 2014
5445
- PLAT: i686
@@ -78,7 +69,6 @@ jobs:
7869
- name: Set extra env
7970
run: |
8071
if [ "macos-11" == "${{ matrix.os }}" ]; then
81-
ls /Library/Developer/CommandLineTools/SDKs
8272
echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV;
8373
echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
8474
echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
@@ -118,25 +108,17 @@ jobs:
118108
build_lib "$PLAT" "$INTERFACE64" "0"
119109
fi
120110
121-
- name: Build wheel
111+
- name: Build and test wheel
122112
run: |
123-
124113
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
114+
brew install patchelf
125115
source travis-ci/build_wheel.sh
126116
else
127-
docker run --rm -v $(pwd):/openblas quay.io/pypa/manylinux2014_${PLAT} /bin/bash -xe /openblas/travis-ci/build_wheel.sh
117+
libc=${MB_ML_LIBC:-manylinux}
118+
docker_image=quay.io/pypa/${libc}${MB_ML_VER}_${PLAT}
119+
docker run --rm -v $(pwd):/openblas docker_image /bin/bash -xe /openblas/travis-ci/build_wheel.sh
128120
fi
129121
130-
- name: Setup different python to test wheel
131-
uses: actions/setup-python@v4
132-
with:
133-
python-version: "3.11"
134-
135-
- name: Test wheel
136-
run: |
137-
python -m pip install --no-index --find-links dist openblas
138-
python -m openblas
139-
140122
- uses: actions/upload-artifact@v3
141123
with:
142124
path: libs/openblas*.tar.gz

travis-ci/build_wheel.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ patchelf --set-soname libopenblas_python.so local/openblas/lib/libopenblas_pytho
1818
python3.7 -m pip install wheel auditwheel
1919
python3.7 -m pip wheel -w /tmp/wheelhouse -vv .
2020
auditwheel repair -w dist/ /tmp/wheelhouse/openblas-*.whl
21+
22+
# Test that the wheel works with a different python
23+
python3.11 -m pip install --no-index --find-links dist openblas
24+
python3.11 -m openblas

0 commit comments

Comments
 (0)