Skip to content

Commit dd89007

Browse files
authored
Cibw noarm test (GraphBLAS#8)
* Bump version for testpypi * Update for linux images * Enable linux aarch64, disable osx-arm64 * Bunch of changes from scikit-learn's file * Undo last changes * Try to see what is modifying repo * Modify dirty string * Try ignoring GraphBLAS-{version}/ checkout folder * Just keep swimming * Moar dtypes! * Switch from test to normal PyPI * Only upload to PyPI from the main repo * Remove all mac arm build params
1 parent 884de67 commit dd89007

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

.github/workflows/wheels.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
# Loosely based on scikit-learn's config:
4141
# https://github.com/scikit-learn/scikit-learn/blob/main/.github/workflows/wheels.yml
4242
include:
43-
- os: windows-latest
44-
python-version: "3.8"
45-
platform_id: win_amd64
43+
# - os: windows-latest
44+
# python-version: "3.8"
45+
# platform_id: win_amd64
4646

4747
# Linux 64 bit manylinux2014
48-
- os: ubuntu-latest
49-
python-version: "3.8"
50-
platform_id: manylinux_x86_64
51-
manylinux_image: manylinux2014
48+
# - os: ubuntu-latest
49+
# python-version: "3.8"
50+
# platform_id: manylinux_x86_64
51+
# manylinux_image: manylinux2014
5252

5353
# Use x86 macOS runner to build both x86 and ARM. GitHub does not offer M1/M2 yet (only self-hosted).
5454
- os: macos-latest
@@ -64,16 +64,16 @@ jobs:
6464
with:
6565
python-version: ${{ matrix.python-version }}
6666

67-
- name: Install tools (macOS)
68-
if: contains(matrix.os, 'macos')
69-
# Install coreutils which includes `nproc` used by `make -j` in suitesparse.sh
70-
#
71-
# GitHub actions comes with libomp already installed, but for its native arch only. Must build universal one
72-
# manually so that both x86 and arm builds can be built.
73-
run: |
74-
brew install coreutils
75-
brew install libomp
76-
sh add_arm_to_libomp_dylib.sh
67+
# - name: Install tools (macOS)
68+
# if: contains(matrix.os, 'macos')
69+
# # Install coreutils which includes `nproc` used by `make -j` in suitesparse.sh
70+
# #
71+
# # GitHub actions comes with libomp already installed, but for its native arch only. Must build universal one
72+
# # manually so that both x86 and arm builds can be built.
73+
# run: |
74+
# brew install coreutils
75+
# brew install libomp
76+
# sh add_arm_to_libomp_dylib.sh
7777

7878
- name: Build Wheels
7979
env:
@@ -142,6 +142,7 @@ jobs:
142142
name: Upload to PyPI
143143
needs: [build_wheels, build_sdist]
144144
runs-on: ubuntu-latest
145+
# if: github.repository == 'GraphBLAS/python-suitesparse-graphblas'
145146
# if: github.event_name == 'release' && github.event.action == 'published'
146147

147148
steps:

suitesparse.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ if [ -n "${BREW_LIBOMP}" ]; then
2525
cmake_params+=(-DOpenMP_libomp_LIBRARY="omp")
2626
export LDFLAGS="-L$(brew --prefix libomp)/lib"
2727

28-
# build both x86 and ARM
29-
export CFLAGS="-arch x86_64 -arch arm64"
28+
export CFLAGS="-arch x86_64"
29+
# # build both x86 and ARM
30+
# export CFLAGS="-arch x86_64 -arch arm64"
3031
fi
3132

3233
if [ -n "${CMAKE_GNUtoMS}" ]; then
@@ -48,7 +49,6 @@ cd GraphBLAS-${VERSION}/build
4849
# Disable optimizing some rarely-used types for significantly faster builds and significantly smaller wheel size.
4950
# Also the build with all types enabled sometimes stalls on GitHub Actions. Probably due to exceeded resource limits.
5051
# These can still be used, they'll just have reduced performance (AFAIK similar to UDTs).
51-
# TODO
5252
# echo "#define GxB_NO_BOOL 1" >> ../Source/GB_control.h #
5353
# echo "#define GxB_NO_FP32 1" >> ../Source/GB_control.h #
5454
# echo "#define GxB_NO_FP64 1" >> ../Source/GB_control.h #

suitesparse_graphblas/tests/test_package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ def test_matrix_existence():
77

88

99
def test_version():
10-
assert suitesparse_graphblas.__version__ >= "0.0.1"
10+
assert suitesparse_graphblas.__version__ > "7.4.2.0"

0 commit comments

Comments
 (0)