Skip to content

Commit

Permalink
remove unused patch
Browse files Browse the repository at this point in the history
  • Loading branch information
grlee77 committed Oct 27, 2023
1 parent 5f87e2a commit 6153d1b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 81 deletions.
13 changes: 3 additions & 10 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ else
echo "apt package manager was found"
apt update
apt install yasm libopenslide-dev -y
# dpkg -L libopenslide-dev

# git apply ci/omit-cuslide-benchmarks-and-tests.patch
fi

# First build the C++ lib using CMake via the run script
Expand All @@ -49,22 +46,18 @@ fi
# Build the C++ cuslide and cumed plugins
./run build_local cuslide ${CMAKE_BUILD_TYPE}
cp -P -r cpp/plugins/cucim.kit.cuslide/install/lib/* ./install/lib/
# omit copying potentially non-existent binaries due to patch above.
# they don't go in the wheel anyways
# cp -P -r cpp/plugins/cucim.kit.cuslide/install/bin/* ./install/bin/
# omit copying binaries as they don't go in the wheel

./run build_local cumed ${CMAKE_BUILD_TYPE}
cp -P -r cpp/plugins/cucim.kit.cumed/install/lib/* ./install/lib/
# cp -P -r cpp/plugins/cucim.kit.cumed/install/bin/* ./install/bin/

# problems: boost-header-only takes a long time to download
# omit copying binaries as they don't go in the wheel

# Compile the Python bindings
./run build_local cucim ${CMAKE_BUILD_TYPE}

# Copy the resulting cucim pybind11 shared library into the Python package src folder
cp -P python/install/lib/* python/cucim/src/cucim/clara/
# also need these files in the clara wheel
# also need these plugin / libcucim shared libraries in the clara wheel
cp -P install/lib/*.so python/cucim/src/cucim/clara/

cd "${package_dir}"
Expand Down
62 changes: 0 additions & 62 deletions ci/omit-cuslide-benchmarks-and-tests.patch

This file was deleted.

10 changes: 1 addition & 9 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ dependencies:
- tifffile>=2022.7.28
- output_types: [conda]
packages:
# TODO: fix dependencies and move imagecodecs & openslide-python back up to the common
# TODO: move imagecodecs & openslide-python back up to the common
# section above. (doesn't seem that imagecodecs has an arm64 wheel)
- imagecodecs>=2021.6.8
- openslide-python>=1.1.2
Expand All @@ -273,11 +273,3 @@ dependencies:
# listed as optional. They are needed in order to run the full test
# suite, including the `cucim.clara` package.
- click
# - jbig
# - libwebp-base
# - xz
# - zlib
# - zstd
# Not sure where these go, if anywhere:
# - openslide
# - xorg-libxcb

0 comments on commit 6153d1b

Please sign in to comment.