Skip to content

Commit a43bcfd

Browse files
committed
Revert to sys install
1 parent c794d39 commit a43bcfd

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.github/workflows/wheels.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
CIBW_BUILD_VERBOSITY: 3
154154

155155
# Build SuiteSparse
156-
CIBW_BEFORE_ALL: GRAPHBLAS_PREFIX="{package}" bash suitesparse.sh ${{ env.GB_VERSION_REF }}
156+
CIBW_BEFORE_ALL: bash suitesparse.sh ${{ env.GB_VERSION_REF }}
157157

158158
CIBW_BEFORE_BUILD_LINUX: ${{ matrix.cibw_before_build_linux }}
159159

@@ -168,12 +168,12 @@ jobs:
168168

169169
# CIBW_ENVIRONMENT_LINUX: GRAPHBLAS_PREFIX="graphblas"
170170

171-
#### TEST:
172-
CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
173-
pwd &&
174-
ls -lh &&
175-
find . -type d &&
176-
delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
171+
#### TEST: GRAPHBLAS_PREFIX="{package}"
172+
# CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
173+
# pwd &&
174+
# ls -lh &&
175+
# find . -type d &&
176+
# delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
177177

178178
# Uncomment to only build CPython wheels
179179
# CIBW_BUILD: "cp*"

build_graphblas_cffi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ def tree(dir_path: Path, prefix: str=''):
4444
if not graphblas_root:
4545
graphblas_root = os.environ.get("GRAPHBLAS_PREFIX", None)
4646

47+
# if not graphblas_root:
48+
# graphblas_root = Path(__file__).parent
49+
#
4750
# if "{package}" in graphblas_root:
4851
# graphblas_root = graphblas_root.replace("{package}", str(Path(__file__).parent))
4952

50-
if not graphblas_root:
51-
graphblas_root = Path(__file__).parent
52-
5353
if not graphblas_root:
5454
# Windows wheels.yml configures suitesparse.sh to install GraphBLAS to "C:\\GraphBLAS".
55-
graphblas_root = "C:\\GraphBLAS" if is_win else sys.prefix
55+
graphblas_root = "C:\\GraphBLAS" if is_win else "/usr/local"
5656

5757
include_dirs = [os.path.join(graphblas_root, "include")]
5858
#### TEST

suitesparse.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ fi
124124

125125
cmake .. -DCMAKE_BUILD_TYPE=Release -G 'Unix Makefiles' "${cmake_params[@]}"
126126
make -j$NPROC
127-
cmake --install . --prefix ${GRAPHBLAS_PREFIX}
127+
sudo make install
128+
#cmake --install . --prefix ${GRAPHBLAS_PREFIX}
128129

129130
if [ -n "${CMAKE_GNUtoMS}" ]; then
130131
if [ -z "${GRAPHBLAS_PREFIX}" ]; then

0 commit comments

Comments
 (0)