Merge pull request #787 from rapidsai/branch-24.10

Forward-merge branch-24.10 into branch-24.12
rapidsai · Oct 2, 2024 · ad2eeaf · ad2eeaf
2 parents f5adfe6 + 289e340
commit ad2eeaf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 33 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -123,7 +123,7 @@ cd $CUCIM_HOME
 
 Conda can be used to setup an environment which includes all of the necessary dependencies (as shown in `./conda/environments/all_cuda-118_arch-x86_64.yaml`) for building cuCIM.
 
-Otherwise, you may need to install dependencies (such as zlib, xz, yasm) through your OS's package manager (`apt`, `yum`, and so on).
+Otherwise, you may need to install dependencies (such as yasm) through your OS's package manager (`apt`, `yum`, and so on).
 
 
 ### Creating the Conda Development Environment `cucim`

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -16,13 +16,11 @@ dependencies:
 - gcc_linux-64=11.*
 - imagecodecs>=2021.6.8
 - ipython
-- jbig
 - lazy_loader>=0.1
 - libcufile-dev=1.4.0.31
 - libcufile=1.4.0.31
 - libnvjpeg-dev=11.6.0.55
 - libnvjpeg=11.6.0.55
-- libwebp-base
 - matplotlib-base
 - nbsphinx
 - ninja
@@ -47,10 +45,7 @@ dependencies:
 - sphinx<6
 - sysroot_linux-64==2.17
 - tifffile>=2022.7.28
-- xz
 - yasm
-- zlib
-- zstd
 - pip:
   - opencv-python-headless>=4.6
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -17,12 +17,10 @@ dependencies:
 - gcc_linux-64=11.*
 - imagecodecs>=2021.6.8
 - ipython
-- jbig
 - lazy_loader>=0.1
 - libcufile-dev
 - libnvjpeg-dev
 - libnvjpeg-static
-- libwebp-base
 - matplotlib-base
 - nbsphinx
 - ninja
@@ -46,10 +44,7 @@ dependencies:
 - sphinx<6
 - sysroot_linux-64==2.17
 - tifffile>=2022.7.28
-- xz
 - yasm
-- zlib
-- zstd
 - pip:
   - opencv-python-headless>=4.6
 name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml
@@ -17,7 +17,6 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   ignore_run_exports:
-    - libwebp-base
     - openslide
   ignore_run_exports_from:
     {% if cuda_major == "11" %}
@@ -74,13 +73,8 @@ requirements:
     - libnvjpeg-dev
     - libnvjpeg-static
     {% endif %}
-    - jbig
-    - libwebp-base
     - nvtx-c >=3.1.0
     - openslide
-    - xz
-    - zlib
-    - zstd
   run:
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     {% if cuda_major == "11" %}
@@ -91,11 +85,6 @@ requirements:
     - libcufile  # [linux64]
     - libnvjpeg
     {% endif %}
-    - {{ pin_compatible('libwebp-base', max_pin='x.x') }}
-    - jbig
-    - xz
-    - zlib
-    - zstd
   run_constrained:
     - {{ pin_compatible('openslide') }}
 

diff --git a/cpp/plugins/cucim.kit.cuslide/cmake/deps/libtiff.cmake b/cpp/plugins/cucim.kit.cuslide/cmake/deps/libtiff.cmake
@@ -53,6 +53,17 @@ if (NOT TARGET deps::libtiff)
     set(JPEG_LIBRARIES deps::libjpeg-turbo)
     # for jpeglib.h and jconfig.h/jconfigint.h
     set(TIFF_INCLUDES ${deps-libjpeg-turbo_SOURCE_DIR} ${deps-libjpeg-turbo_BINARY_DIR} )
+
+    # Explicitly disable external codecs
+    set(zlib OFF)
+    set(pixarlog OFF)
+    set(lzma OFF)
+    set(old-jpeg OFF)
+    set(jpeg12 OFF)
+    set(zstd OFF)
+    set(jbig OFF)
+    set(webp OFF)
+
     add_subdirectory(${deps-libtiff_SOURCE_DIR} ${deps-libtiff_BINARY_DIR} EXCLUDE_FROM_ALL)
 
     # Disable visibility to not expose unnecessary symbols

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -265,17 +265,6 @@ dependencies:
       - output_types: conda
         packages:
           - cupy>=12.0.0
-          # All dependencies below this point are specific to `cucim.clara` and
-          # are not needed for either `cucim.core` or `cucim.skimage`. I did
-          # not include these under a "pyproject" output so that it is still
-          # possible to run `pip install .` from the python/cucim folder
-          # without having build the C++ library at all. This allows, usage of
-          # usage of `cucim.skimage` on Windows, for example.
-          - jbig
-          - libwebp-base
-          - xz
-          - zlib
-          - zstd
           # Not sure where these go, if anywhere:
           # - openslide
           # - xorg-libxcb