Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix library-loading issues in editable installs #553

Merged
merged 1 commit into from
Nov 15, 2024
Merged

fix library-loading issues in editable installs #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
build_command: |
sccache -z;
build-all --verbose;
python -c "import kvikio; print(kvikio.__version__)";
sccache -s;
wheel-cpp-build:
secrets: inherit
Expand Down
12 changes: 9 additions & 3 deletions python/libkvikio/libkvikio/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,15 @@ def load_library():
# Prefer the libraries bundled in this package. If they aren't found
# (which might be the case in builds where the library was prebuilt
# before packaging the wheel), look for a system installation.
libkvikio_lib = _load_wheel_installation(soname)
if libkvikio_lib is None:
libkvikio_lib = _load_system_installation(soname)
try:
libkvikio_lib = _load_wheel_installation(soname)
if libkvikio_lib is None:
libkvikio_lib = _load_system_installation(soname)
except OSError:
# If none of the searches above succeed, just silently return None
# and rely on other mechanisms (like RPATHs on other DSOs) to
# help the loader find the library.
pass

# The caller almost never needs to do anything with this library, but no
# harm in offering the option since this object at least provides a handle
Expand Down
Loading