diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d657617b4..66b66b94f 100644 --- 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 index a193f5cdd..392850e85 100644 --- 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 index b373ffbbe..a9c50a1f0 100644 --- a/conda/recipes/libcucim/meta.yaml +++ b/conda/recipes/libcucim/meta.yaml @@ -74,13 +74,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" %} @@ -92,10 +87,6 @@ requirements: - 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 index 8328bbd71..fd20e7f0e 100644 --- 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 index 62e2ddefe..e25c6f909 100644 --- 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