diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index ec220e49d..66e4600f5 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -21,6 +21,29 @@ conda config --set path_conflict warn sccache --zero-stats -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry build conda/recipes/libcucim + +# TODO: Remove when CUDA 12.1 is dropped. +# In most cases, the CTK has cuFile. +# However the CTK only added cuFile for ARM in 12.2. +# So for ARM users on CTK 12.0 & 12.1, relax the cuFile requirement. +# On x86_64 or CTK 13 or ARM with CTK 12.2+, always require cuFile. +cat > extra_variants.yaml <> extra_variants.yaml <=3.1.0 - openslide run: + {% if aarch64 and cuda_major == "12" %} + # Relax `libcufile` dependency for old CUDA 12 ARM installs + - {{ pin_compatible('cuda-version', lower_bound='12.0', upper_bound='12.2') }} # [not has_cufile] + - {{ pin_compatible('cuda-version', lower_bound='12.2', upper_bound='13.0') }} # [has_cufile] + - libcufile # [has_cufile] + {% else %} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - - cuda-cudart - libcufile + {% endif %} + - cuda-cudart - libnvjpeg run_constrained: - {{ pin_compatible('openslide') }} diff --git a/gds/CMakeLists.txt b/gds/CMakeLists.txt index d8248130a..b7e0eebc1 100644 --- a/gds/CMakeLists.txt +++ b/gds/CMakeLists.txt @@ -25,7 +25,7 @@ if (NOT APPLE) endif () # Find CUDA Toolkit for cudart and cufile. -find_package(CUDAToolkit REQUIRED) +find_package(CUDAToolkit REQUIRED COMPONENTS cuFile) ################################################################################ # Add library: cufile_stub diff --git a/gds/include/cufile_stub.h b/gds/include/cufile_stub.h index cb90e60a0..8c6e34caa 100644 --- a/gds/include/cufile_stub.h +++ b/gds/include/cufile_stub.h @@ -16,12 +16,7 @@ #ifndef CUCIM_CUFILE_STUB_H #define CUCIM_CUFILE_STUB_H -// Try to include the real cufile.h, fall back to minimal types if not available -#if __has_include() - #include -#else - #include "cufile_stub_types.h" -#endif +#include #include "cucim/dynlib/helper.h"