Merge pull request #987 from rapidsai/release/25.12

Forward-merge release/25.12 into main

Author: GPUtester

conda/environments/all_cuda-129_arch-aarch64.yaml

@@ -17,12 +17,15 @@ dependencies:
 - imagecodecs>=2021.6.8
 - ipython
 - lazy-loader>=0.4
+- libnvimgcodec-dev>=0.6.0,<0.7.0
+- libnvimgcodec>=0.6.0,<0.7.0
 - libnvjpeg-dev
 - matplotlib-base>=3.7
 - nbsphinx
 - ninja
 - numpy>=1.23.4,<3.0a0
 - numpydoc>=1.7
+- nvimgcodec>=0.6.0,<0.7.0
 - openslide-python>=1.3.0
 - pip
 - pooch>=1.6.0

conda/environments/all_cuda-129_arch-x86_64.yaml

@@ -18,12 +18,15 @@ dependencies:
 - ipython
 - lazy-loader>=0.4
 - libcufile-dev
+- libnvimgcodec-dev>=0.6.0,<0.7.0
+- libnvimgcodec>=0.6.0,<0.7.0
 - libnvjpeg-dev
 - matplotlib-base>=3.7
 - nbsphinx
 - ninja
 - numpy>=1.23.4,<3.0a0
 - numpydoc>=1.7
+- nvimgcodec>=0.6.0,<0.7.0
 - openslide-python>=1.3.0
 - pip
 - pooch>=1.6.0

conda/environments/all_cuda-130_arch-aarch64.yaml

@@ -17,12 +17,15 @@ dependencies:
 - imagecodecs>=2021.6.8
 - ipython
 - lazy-loader>=0.4
+- libnvimgcodec-dev>=0.6.0,<0.7.0
+- libnvimgcodec>=0.6.0,<0.7.0
 - libnvjpeg-dev
 - matplotlib-base>=3.7
 - nbsphinx
 - ninja
 - numpy>=1.23.4,<3.0a0
 - numpydoc>=1.7
+- nvimgcodec>=0.6.0,<0.7.0
 - openslide-python>=1.3.0
 - pip
 - pooch>=1.6.0

conda/environments/all_cuda-130_arch-x86_64.yaml

@@ -18,12 +18,15 @@ dependencies:
 - ipython
 - lazy-loader>=0.4
 - libcufile-dev
+- libnvimgcodec-dev>=0.6.0,<0.7.0
+- libnvimgcodec>=0.6.0,<0.7.0
 - libnvjpeg-dev
 - matplotlib-base>=3.7
 - nbsphinx
 - ninja
 - numpy>=1.23.4,<3.0a0
 - numpydoc>=1.7
+- nvimgcodec>=0.6.0,<0.7.0
 - openslide-python>=1.3.0
 - pip
 - pooch>=1.6.0

conda/recipes/libcucim/conda_build_config.yaml

@@ -15,3 +15,6 @@ c_stdlib_version:
 
 cmake_version:
   - ">=3.30.4"
+
+nvimgcodec_version:
+  - "0.6.0"

conda/recipes/libcucim/meta.yaml

@@ -58,6 +58,7 @@ requirements:
     - cuda-cudart-dev
     - libcufile-dev
     - libnvjpeg-dev
+    - libnvimgcodec-dev {{ nvimgcodec_version }}  # nvImageCodec development headers and libraries
     - nvtx-c >=3.1.0
     - openslide
   run:
@@ -69,8 +70,10 @@ requirements:
     - libcufile
     - cuda-cudart
     - libnvjpeg
+    - libnvimgcodec0 {{ nvimgcodec_version }}  # nvImageCodec runtime library
   run_constrained:
     - {{ pin_compatible('openslide') }}
+    - libnvimgcodec-dev {{ nvimgcodec_version }}  # Optional: for development/debugging
 
 about:
   home: https://developer.nvidia.com/multidimensional-image-processing

cpp/plugins/cucim.kit.cuslide/cmake/deps/libjpeg-turbo.cmake

@@ -31,7 +31,22 @@ if (NOT TARGET deps::libjpeg-turbo)
     # full path to the compiler, or to the compiler name if it is in the PATH.
     # yasm is available through `sudo apt-get install yasm` on Debian Linux.
     # See _deps/deps-libjpeg-turbo-src/simd/CMakeLists.txt:25.
-    set(CMAKE_ASM_NASM_COMPILER yasm)
+
+    # Try to find yasm in conda environment first, then system paths
+    if(DEFINED ENV{CONDA_PREFIX})
+        find_program(YASM_EXECUTABLE NAMES yasm PATHS $ENV{CONDA_PREFIX}/bin NO_DEFAULT_PATH)
+    endif()
+    if(NOT YASM_EXECUTABLE)
+        find_program(YASM_EXECUTABLE NAMES yasm)
+    endif()
+
+    if(YASM_EXECUTABLE)
+        set(CMAKE_ASM_NASM_COMPILER ${YASM_EXECUTABLE})
+        message(STATUS "Found yasm: ${YASM_EXECUTABLE}")
+    else()
+        set(CMAKE_ASM_NASM_COMPILER yasm)
+        message(WARNING "yasm not found, using 'yasm' and hoping it's in PATH")
+    endif()
     set(REQUIRE_SIMD 1) # CMP0077
 
     message(STATUS "Fetching libjpeg-turbo sources")

cpp/plugins/cucim.kit.cuslide/cmake/modules/SuperBuildUtils.cmake

@@ -8,7 +8,17 @@ include(FetchContent)
 set(CMAKE_SUPERBUILD_DEPS_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
 
 if(NOT COMMAND superbuild_depend)
+    # superbuild_depend: Include a dependency cmake file
+    # Searches in SUPERBUILD_ADDITIONAL_DEPS_DIRS first (if set), then the default deps dir
     function(superbuild_depend module_name)
+        # Check additional deps directories first (for plugin-specific deps)
+        foreach(deps_dir IN LISTS SUPERBUILD_ADDITIONAL_DEPS_DIRS)
+            if(EXISTS "${deps_dir}/${module_name}.cmake")
+                include("${deps_dir}/${module_name}.cmake")
+                return()
+            endif()
+        endforeach()
+        # Fall back to default deps directory
         include("${CMAKE_SUPERBUILD_DEPS_ROOT_DIR}/deps/${module_name}.cmake")
     endfunction()
 endif()