Skip to content

Commit

Permalink
Merge branch 'branch-24.02' into cleanup-old-ci-and-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham authored Dec 14, 2023
2 parents 4f3271d + b47c623 commit 5ff49cf
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
- numpy>=1.21.3
- numpydoc
- nvcc_linux-64=11.8
- openslide-python>=1.1.2
- openslide-python>=1.3.0
- pip
- pooch>=1.6.0
- pre-commit
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies:
- ninja
- numpy>=1.21.3
- numpydoc
- openslide-python>=1.1.2
- openslide-python>=1.3.0
- pip
- pooch>=1.6.0
- pre-commit
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/cucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,11 @@ requirements:
- cupy >=12.0.0
- lazy_loader >=0.1
- libcucim ={{ version }}
# - openslide # skipping here but benchmark binary would need openslide library
- python
- scikit-image >=0.19.0,<0.22.0a0
- scipy
run_constrained:
- openslide-python >=1.3.0

tests:
requirements:
Expand Down
6 changes: 4 additions & 2 deletions conda/recipes/libcucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ build:
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" %}
- {{ compiler('cuda11') }}
Expand Down Expand Up @@ -70,7 +71,7 @@ requirements:
- jbig
- libwebp-base
- nvtx-c >=3.1.0
- openslide <4
- openslide
- xz
- zlib
- zstd
Expand All @@ -82,10 +83,11 @@ requirements:
{% endif %}
- {{ pin_compatible('libwebp-base', max_pin='x.x') }}
- jbig
# - openslide # skipping here but benchmark binary would need openslide library
- xz
- zlib
- zstd
run_constrained:
- {{ pin_compatible('openslide') }}

about:
home: https://developer.nvidia.com/multidimensional-image-processing
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,15 @@ dependencies:
packages:
- imagecodecs>=2021.6.8
- matplotlib-base
- openslide-python>=1.1.2
- openslide-python>=1.3.0
- pip
- pip:
- opencv-python-headless>=4.6
- output_types: [requirements, pyproject]
packages:
# skip packages on arm64 that don't provide a wheel
- imagecodecs>=2021.6.8; platform_machine=='x86_64'
- openslide-python>=1.1.2; platform_machine=='x86_64'
- openslide-python>=1.3.0; platform_machine=='x86_64'
- matplotlib
- opencv-python-headless>=4.6
- click
2 changes: 1 addition & 1 deletion python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test = [
"imagecodecs>=2021.6.8; platform_machine=='x86_64'",
"matplotlib",
"opencv-python-headless>=4.6",
"openslide-python>=1.1.2; platform_machine=='x86_64'",
"openslide-python>=1.3.0; platform_machine=='x86_64'",
"pooch>=1.6.0",
"psutil>=5.8.0",
"pytest-cov>=2.12.1",
Expand Down
2 changes: 1 addition & 1 deletion python/cucim/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GPUtil>=1.4.0
imagecodecs>=2021.6.8
openslide-python>=1.1.2
openslide-python>=1.3.0
opencv-python-headless>=4.6
psutil>=5.8.0
pytest>=6.2.4
Expand Down

0 comments on commit 5ff49cf

Please sign in to comment.