From 9a44920a832ba12235c5db82f9234f2cf0e38f4f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 Nov 2024 11:47:47 -0600 Subject: [PATCH 1/2] fix library-loading issues in editable installs --- .github/workflows/pr.yaml | 2 ++ python/libcudf/libcudf/load.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 694b11dbe1d..e48c0a577da 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -266,6 +266,8 @@ jobs: build_command: | sccache -z; build-all -DBUILD_BENCHMARKS=ON --verbose; + python -c "import cudf; print(cudf.__version__)"; + python -c "import pylibcudf; print(cudf.__version__)"; sccache -s; unit-tests-cudf-pandas: needs: [wheel-build-cudf, changed-files] diff --git a/python/libcudf/libcudf/load.py b/python/libcudf/libcudf/load.py index a91fbb7aecf..c3ff5534e87 100644 --- a/python/libcudf/libcudf/load.py +++ b/python/libcudf/libcudf/load.py @@ -76,9 +76,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. - libcudf_lib = _load_wheel_installation(soname) - if libcudf_lib is None: - libcudf_lib = _load_system_installation(soname) + try: + libcudf_lib = _load_wheel_installation(soname) + if libcudf_lib is None: + libcudf_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 From 5493fc091598eba4cd1a1d09f50e927a5cc7de6a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 Nov 2024 12:17:53 -0600 Subject: [PATCH 2/2] devcontainer builds are done on CPU nodes, skip smoke tests --- .github/workflows/pr.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e48c0a577da..694b11dbe1d 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -266,8 +266,6 @@ jobs: build_command: | sccache -z; build-all -DBUILD_BENCHMARKS=ON --verbose; - python -c "import cudf; print(cudf.__version__)"; - python -c "import pylibcudf; print(cudf.__version__)"; sccache -s; unit-tests-cudf-pandas: needs: [wheel-build-cudf, changed-files]