fix path for libopenslide on Ubuntu+aarch64

rapidsai · Oct 27, 2023 · 5158db2 · 5158db2
1 parent d60e099
commit 5158db2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -38,9 +38,9 @@ else
     echo "apt package manager was found"
     apt update
     apt install yasm libopenslide-dev -y
-    dpkg -L libopenslide-dev
+    # dpkg -L libopenslide-dev
 
-    git apply ci/omit-cuslide-benchmarks-and-tests.patch
+    # git apply ci/omit-cuslide-benchmarks-and-tests.patch
 fi
 
 # First build the C++ lib using CMake via the run script

diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh
@@ -13,8 +13,7 @@ python -m pip install $(echo ./dist/cucim*.whl)[test]
 if [ "$(arch)" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]; then
     python ./ci/wheel_smoke_test.py
 else
-    # python -m pytest ./python/cucim
-    # omit clara subset until dependency installs are fixed
-    python -m pytest ./python/cucim/src/cucim/core/
-    python -m pytest ./python/cucim/src/cucim/skimage/
+    # Note: imagecodecs is currently not installed on aarch64, so a handful of
+    #       test cases will be skipped in that case
+    python -m pytest ./python/cucim
 fi
diff --git a/cpp/cmake/deps/openslide.cmake b/cpp/cmake/deps/openslide.cmake
@@ -22,7 +22,9 @@ if (NOT TARGET deps::openslide)
         set(OPENSLIDE_LIB_PATH "$ENV{CONDA_PREFIX}/lib/libopenslide.so")
     elseif (EXISTS /usr/lib/x86_64-linux-gnu/libopenslide.so)
         set(OPENSLIDE_LIB_PATH /usr/lib/x86_64-linux-gnu/libopenslide.so)
-    else () # CentOS 6
+    elseif (EXISTS /usr/lib/aarch64-linux-gnu/libopenslide.so)
+        set(OPENSLIDE_LIB_PATH /usr/lib/aarch64-linux-gnu/libopenslide.so)
+    else () # CentOS (x86_64)
         set(OPENSLIDE_LIB_PATH /usr/lib64/libopenslide.so)
     endif ()
 

diff --git a/cpp/plugins/cucim.kit.cuslide/cmake/deps/openslide.cmake b/cpp/plugins/cucim.kit.cuslide/cmake/deps/openslide.cmake
@@ -22,7 +22,9 @@ if (NOT TARGET deps::openslide)
         set(OPENSLIDE_LIB_PATH "$ENV{CONDA_PREFIX}/lib/libopenslide.so")
     elseif (EXISTS /usr/lib/x86_64-linux-gnu/libopenslide.so)
         set(OPENSLIDE_LIB_PATH /usr/lib/x86_64-linux-gnu/libopenslide.so)
-    else () # CentOS 6
+    elseif (EXISTS /usr/lib/aarch64-linux-gnu/libopenslide.so)
+        set(OPENSLIDE_LIB_PATH /usr/lib/aarch64-linux-gnu/libopenslide.so)
+    else () # CentOS (x86_64)
         set(OPENSLIDE_LIB_PATH /usr/lib64/libopenslide.so)
     endif ()