Skip to content

Commit aa35314

Browse files
committed
Try installing to {package}
1 parent 0aee66c commit aa35314

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/wheels.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ jobs:
8484
cibw_skip: "pp* *musl*"
8585

8686
# macOS x86
87+
# Note: keep as old as possible as due to libomp this will be the oldest supported macOS version.
8788
- os: macos-12
8889
cibw_archs: "x86_64"
8990

9091
# macOS Apple Silicon
91-
- os: macos-latest
92+
# Note: keep as old as possible as due to libomp this will be the oldest supported macOS version.
93+
- os: macos-14
9294
cibw_archs: "arm64"
9395

9496
steps:
@@ -162,9 +164,9 @@ jobs:
162164

163165
# macOS libomp requires special configs. BREW_LIBOMP=1 asks suitesparse.sh to include them.
164166
# SUITESPARSE_MACOS_ARCH asks to build a particular architecture. Either x86 or arm64.
165-
CIBW_ENVIRONMENT_MACOS: GRAPHBLAS_PREFIX="/usr/local/graphblas" BREW_LIBOMP="1" SUITESPARSE_MACOS_ARCH=${{ matrix.cibw_archs }}
167+
CIBW_ENVIRONMENT_MACOS: GRAPHBLAS_PREFIX="{package}/graphblas" BREW_LIBOMP="1" SUITESPARSE_MACOS_ARCH=${{ matrix.cibw_archs }}
166168

167-
CIBW_ENVIRONMENT_LINUX: GRAPHBLAS_PREFIX="/usr/local/graphblas"
169+
CIBW_ENVIRONMENT_LINUX: GRAPHBLAS_PREFIX="{package}/graphblas"
168170

169171
# Uncomment to only build CPython wheels
170172
# CIBW_BUILD: "cp*"

build_graphblas_cffi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ def tree(dir_path: Path, prefix: str=''):
5757
library_dirs = [os.path.join(graphblas_root, "lib"), os.path.join(graphblas_root, "lib64")]
5858
if is_win:
5959
include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
60-
# include_dirs.append(os.path.join(sys.prefix, "Library", "include", "suitesparse"))
60+
include_dirs.append(os.path.join(sys.prefix, "Library", "include", "suitesparse"))
6161
library_dirs.append(os.path.join(sys.prefix, "Library", "lib"))
6262

63-
# include_dirs.append(os.path.join(graphblas_root, "include"))
63+
include_dirs.append(os.path.join(graphblas_root, "include"))
6464
include_dirs.append(os.path.join(graphblas_root, "include", "suitesparse"))
6565
library_dirs.append(os.path.join(graphblas_root, "lib"))
6666
library_dirs.append(os.path.join(graphblas_root, "bin"))

0 commit comments

Comments
 (0)