Skip to content

Commit

Permalink
update to wheels that do not need LD_LIBRARY_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
mattip committed May 9, 2024
1 parent fb1d9c1 commit 9f89220
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
bash tools/wheels/cibw_before_build_macos.sh $PWD
GFORTRAN_LIB=$(dirname `gfortran --print-file-name libgfortran.dylib`)
export DYLD_LIBRARY_PATH=$GFORTRAN_LIB:/opt/arm64-builds/lib
export PKG_CONFIG_PATH=/opt/arm64-builds/lib/pkgconfig
export PKG_CONFIG_PATH=$PWD/.openblas
pip install click doit pydevtool rich_click meson cython pythran pybind11 ninja numpy
python dev.py build
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/musllinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,4 @@ jobs:
source test_env/bin/activate
cd $GITHUB_WORKSPACE
export PKG_CONFIG_PATH=$PWD/.openblas
export LD_LIBRARY_PATH=$PWD/.openblas/lib:$LD_LIBRARY_PATH
python dev.py test
2 changes: 1 addition & 1 deletion requirements/openblas.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scipy-openblas32==0.3.27.44.3
scipy-openblas32==0.3.27.63.0
13 changes: 0 additions & 13 deletions tools/wheels/cibw_before_build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,3 @@ PKG_CONFIG_PATH=$PROJECT_DIR/.openblas
rm -rf $PKG_CONFIG_PATH
mkdir -p $PKG_CONFIG_PATH
python -c "import scipy_openblas32; print(scipy_openblas32.get_pkg_config())" > $PKG_CONFIG_PATH/scipy-openblas.pc
# Copy the shared objects to a path under $PKG_CONFIG_PATH, the build
# will point $LD_LIBRARY_PATH there and then auditwheel/delocate-wheel will
# pull these into the wheel. Use python to avoid windows/posix problems
python <<EOF
import os, scipy_openblas32, shutil
srcdir = os.path.join(os.path.dirname(scipy_openblas32.__file__), "lib")
shutil.copytree(srcdir, os.path.join("$PKG_CONFIG_PATH", "lib"))
srcdir = os.path.join(os.path.dirname(scipy_openblas32.__file__), ".dylibs")
if os.path.exists(srcdir): # macosx delocate
shutil.copytree(srcdir, os.path.join("$PKG_CONFIG_PATH", ".dylibs"))
EOF


0 comments on commit 9f89220

Please sign in to comment.