Skip to content

Commit

Permalink
Do not depends on unused libraries for libtiff
Browse files Browse the repository at this point in the history
Signed-off-by: Gigon Bae <gbae@nvidia.com>
  • Loading branch information
gigony committed Sep 26, 2024
1 parent 6e3fd31 commit 58f183a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
5 changes: 0 additions & 5 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
11 changes: 11 additions & 0 deletions cpp/plugins/cucim.kit.cuslide/cmake/deps/libtiff.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 58f183a

Please sign in to comment.