Merge rapidsai/branch-0.37 into jameslamb/test-cuda-12.2

ci/checks/doxygen.sh

@@ -13,11 +13,11 @@ fi
 # Utility to return version as number for comparison
 function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
-# doxygen supported version 1.10.0
+# doxygen supported version 1.9.1
 DOXYGEN_VERSION=`doxygen --version`
-if [ ! $(version "$DOXYGEN_VERSION") -eq $(version "1.10.0") ] ; then
+if [ ! $(version "$DOXYGEN_VERSION") -eq $(version "1.9.1") ] ; then
   echo -e "warning: Unsupported doxygen version $DOXYGEN_VERSION"
-  echo -e "Expecting doxygen version 1.10.0"
+  echo -e "Expecting doxygen version 1.9.1"
   exit 0
 fi
 

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -20,7 +20,7 @@ dependencies:
 - cython>=3.0.0
 - dask-cuda==24.4.*
 - dask-cudf==24.4.*
-- doxygen=1.10.0
+- doxygen=1.9.1
 - fmt>=10.1.1,<11
 - gmock>=1.13.0
 - gtest>=1.13.0

conda/environments/all_cuda-120_arch-x86_64.yaml

@@ -20,7 +20,7 @@ dependencies:
 - cython>=3.0.0
 - dask-cuda==24.4.*
 - dask-cudf==24.4.*
-- doxygen=1.10.0
+- doxygen=1.9.1
 - fmt>=10.1.1,<11
 - gmock>=1.13.0
 - gtest>=1.13.0

cpp/CMakeLists.txt

@@ -71,15 +71,20 @@ rapids_cmake_support_conda_env(conda_env MODIFY_PREFIX_PATH)
 
 # ##################################################################################################
 # * compiler options ------------------------------------------------------------------------------
-find_package(
-  ucx REQUIRED
-)
 # Due to https://github.com/openucx/ucx/issues/9614, we cannot export the ucx
 # dependency because users would then have no control over whether ucx is found
-# multiple times, causing potential configure errors. Therefore, we do not
-# export the ucx dependency. Consumers of ucxx must find ucx themselves. Once
-# the above issue is resolved (see https://github.com/openucx/ucx/pull/9622) we
-# can remove the above find_package in favor of the commented out lines below.
+# multiple times, causing potential configure errors. Therefore, we use a raw
+# find_package call instead of rapids_find_package and skip exporting the ucx
+# dependency. Consumers of ucxx must find ucx themselves. Once the above issue
+# is resolved (see https://github.com/openucx/ucx/pull/9622) we can remove the
+# above find_package in favor of the commented out lines below. For the same
+# reason, we must also gate this find_package call behind a check for the
+# target already existing so that consumers can use tools like CPM.cmake to
+# either find or build ucxx from source if it cannot be found (i.e. both cases
+# must allow prior finding of ucx).
+if(NOT TARGET ucx::ucp)
+  find_package(ucx REQUIRED)
+endif()
 #rapids_find_package(
 #  ucx REQUIRED
 #  BUILD_EXPORT_SET ucxx-exports

cpp/python/include/ucxx/python/worker.h

@@ -66,13 +66,20 @@ class Worker : public ::ucxx::Worker {
    * auto worker = ucxx::createWorker(context, false, false);
    * @endcode
    *
+   * @cond Doxygen_Suppress
+   *
+   * Note: this parameter list is suppressed due to a warning in doxygen 1.9.1.
+   * It appears to conflict with the ucxx::createWorker docstring.
+   *
    * @param[in] context the context from which to create the worker.
    * @param[in] enableDelayedSubmission if `true`, each `ucxx::Request` will not be
    *                                    submitted immediately, but instead delayed to
    *                                    the progress thread. Requires use of the
    *                                    progress thread.
    * @param[in] enableFuture if `true`, notifies the Python future associated with each
    *                         `ucxx::Request`.
+   * @endcond
+   *
    * @returns The `shared_ptr<ucxx::python::Worker>` object
    */
   friend std::shared_ptr<::ucxx::Worker> createWorker(std::shared_ptr<Context> context,

dependencies.yaml

@@ -192,7 +192,7 @@ dependencies:
           # UCXX Build
           - pkg-config
           # Docs Build
-          - &doxygen doxygen=1.10.0 # pre-commit hook needs a specific version.
+          - &doxygen doxygen=1.9.1 # pre-commit hook needs a specific version.
   docs:
     common:
       - output_types: [conda]