Skip to content

Commit 4e7727f

Browse files
committed
add '-DBLAS_SYMBOL_PREFIX' to the wheel pkg-config cflags
1 parent 65fd7a3 commit 4e7727f

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/posix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
- name: Set extra env
7070
run: |
7171
# if [ "macos-11" == "${{ matrix.os }}" ]; then
72+
# Use xcrun --sdk macosx --show-sdk-path instead of hardcoding the path
7273
# echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
7374
# echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
7475
# else

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
# of a pyproject.toml project
110110
sed -e "s/openblas64/openblas32/" -i pyproject.toml
111111
sed -e "s/openblas_get_config64_/openblas_get_config/" -i local/scipy_openblas32/__init__.py
112-
sed -e "s/cflags_suffix64 =.*/cflags_suffix64 = ''/" -i local/scipy_openblas32/__init__.py
112+
sed -e "s/cflags =.*/cflags = '-DBLAS_SYMBOL_PREFIX=scipy_'/" -i local/scipy_openblas32/__init__.py
113113
sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__init__.py
114114
sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__main__.py
115115
fi

local/scipy_openblas64/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def get_pkg_config():
6363
else:
6464
extralib = "-lm -lpthread -lgfortran -lquadmath -L${libdir} -l{get_library()}"
6565
libs_flags = ""
66-
cflags_suffix64 = "-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
66+
cflags = "-DBLAS_SYMBOL_PREFIX=scipy_ -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64"
6767
return dedent(f"""\
6868
libdir={get_lib_dir()}
6969
includedir={get_include_dir()}
@@ -76,7 +76,7 @@ def get_pkg_config():
7676
URL: https://github.com/xianyi/OpenBLAS
7777
Libs: {libs_flags}
7878
Libs.private: ${{extralib}}
79-
Cflags: -I${{includedir}} {cflags_suffix64}
79+
Cflags: -I${{includedir}} {cflags}
8080
""")
8181

8282

tools/build_wheel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [ "${INTERFACE64}" != "1" ]; then
4141
rm *.bak
4242
mv local/scipy_openblas64 local/scipy_openblas32
4343
sed -e "s/openblas_get_config64_/openblas_get_config/" -i.bak local/scipy_openblas32/__init__.py
44-
sed -e "s/cflags_suffix64 =.*/cflags_suffix64 = ''/" -i.bak local/scipy_openblas32/__init__.py
44+
sed -e "s/cflags =.*/cflags = '-DBLAS_SYMBOL_PREFIX=scipy_'/" -i.bak local/scipy_openblas32/__init__.py
4545
sed -e "s/openblas64/openblas32/" -i.bak local/scipy_openblas32/__main__.py
4646
sed -e "s/openblas64/openblas32/" -i.bak local/scipy_openblas32/__init__.py
4747
rm local/scipy_openblas32/*.bak

0 commit comments

Comments
 (0)