From 54e592f5f8bb53dffeb206e8c975582d4c1975be Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 26 Oct 2023 22:29:07 -0400 Subject: [PATCH] omit build of cucim_benchmarks and cucim_tests on arm64 --- ci/build_wheel.sh | 5 +-- ci/omit-benchmarks-and-tests-from-build.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 ci/omit-benchmarks-and-tests-from-build.patch diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index dc67dc400..40f070027 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -46,10 +46,7 @@ else apt install yasm libopenslide-dev -y dpkg -L libopenslide-dev - # temporarily add a sleep here to slow down the aarch64 workers to allow - # x86_64 cases to try to run instead of being cancelled if the aarch64 - # case failed - sleep 10m + git apply ci/omit-benchmarks-and-tests-from-build.patch fi # First build the C++ lib using CMake via the run script diff --git a/ci/omit-benchmarks-and-tests-from-build.patch b/ci/omit-benchmarks-and-tests-from-build.patch new file mode 100644 index 000000000..40f750bba --- /dev/null +++ b/ci/omit-benchmarks-and-tests-from-build.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ab2e17..2a42462 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ set(CUCIM_PACKAGE_NAME cucim) # cucim + ################################################################################ + add_subdirectory(cpp) + add_subdirectory(gds) +-add_subdirectory(benchmarks) ++# add_subdirectory(benchmarks) + add_subdirectory(examples/cpp) + + ################################################################################ +@@ -155,7 +155,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/examples/cpp/CMakeLists.txt.examples.re + set(INSTALL_TARGETS + ${CUCIM_PACKAGE_NAME} + fmt-header-only +- cucim_benchmarks ++ # cucim_benchmarks + ) + + install(TARGETS ${INSTALL_TARGETS} +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 67409a6..d2230b3 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -214,7 +214,7 @@ add_library(${CUCIM_PACKAGE_NAME}::${CUCIM_PACKAGE_NAME}-header-only ALIAS ${CUC + ################################################################################ + # Add tests + ################################################################################ +-add_subdirectory(tests) ++# add_subdirectory(tests) + + ################################################################################# + ## Add bindings