From 98023d7e1656e1c9ccbed6e53718cf492caed01e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 2 Dec 2024 09:29:38 -0800 Subject: [PATCH] Adapt to rmm logger changes (#4794) This PR adapts to breaking changes in rmm in https://github.com/rapidsai/rmm/pull/1722. Authors: - Vyas Ramasubramani (https://github.com/vyasr) - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) - James Lamb (https://github.com/jameslamb) - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Don Acosta (https://github.com/acostadon) URL: https://github.com/rapidsai/cugraph/pull/4794 --- build.sh | 22 +++++++++++----------- ci/build_docs.sh | 13 ++++++------- cpp/CMakeLists.txt | 1 + docs/cugraph/source/api_docs/index.rst | 3 +-- docs/cugraph/source/conf.py | 3 +-- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/build.sh b/build.sh index 756045461dd..0282948659e 100755 --- a/build.sh +++ b/build.sh @@ -331,17 +331,17 @@ if hasArg docs || hasArg all; then ${CMAKE_VERBOSE_OPTION} fi - for PROJECT in libcugraphops libwholegraph; do - XML_DIR="${REPODIR}/docs/cugraph/${PROJECT}" - rm -rf "${XML_DIR}" - mkdir -p "${XML_DIR}" - export XML_DIR_${PROJECT^^}="$XML_DIR" - - echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}" - curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz" - tar -xzf xml.tar.gz -C "${XML_DIR}" - rm "./xml.tar.gz" - done + # for PROJECT in libwholegraph; do + # XML_DIR="${REPODIR}/docs/cugraph/${PROJECT}" + # rm -rf "${XML_DIR}" + # mkdir -p "${XML_DIR}" + # export XML_DIR_${PROJECT^^}="$XML_DIR" + + # echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}" + # curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz" + # tar -xzf xml.tar.gz -C "${XML_DIR}" + # rm "./xml.tar.gz" + # done cd ${LIBCUGRAPH_BUILD_DIR} cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG} diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 2d7e90da8d0..ad77c9a0e60 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -46,19 +46,18 @@ rapids-mamba-retry install \ "cugraph-service-server=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph-service-client=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "libcugraph_etl=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "pylibcugraphops=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "pylibwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ 'pytorch>=2.3' \ "cuda-version=${CONDA_CUDA_VERSION}" export RAPIDS_DOCS_DIR="$(mktemp -d)" -for PROJECT in libcugraphops libwholegraph; do - rapids-logger "Download ${PROJECT} xml_tar" - TMP_DIR=$(mktemp -d) - export XML_DIR_${PROJECT^^}="$TMP_DIR" - curl "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION_NUMBER}/xml.tar.gz" | tar -xzf - -C "${TMP_DIR}" -done +# for PROJECT in libwholegraph; do +# rapids-logger "Download ${PROJECT} xml_tar" +# TMP_DIR=$(mktemp -d) +# export XML_DIR_${PROJECT^^}="$TMP_DIR" +# curl "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION_NUMBER}/xml.tar.gz" | tar -xzf - -C "${TMP_DIR}" +# done rapids-logger "Build CPP docs" pushd cpp/doxygen diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 65772b4f5dd..b3677597692 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -488,6 +488,7 @@ target_link_libraries(cugraph PRIVATE ${COMPILED_RAFT_LIB} cuco::cuco + rmm::rmm_logger_impl ) ################################################################################ diff --git a/docs/cugraph/source/api_docs/index.rst b/docs/cugraph/source/api_docs/index.rst index c4b90b5794d..ccb7aacfeb5 100644 --- a/docs/cugraph/source/api_docs/index.rst +++ b/docs/cugraph/source/api_docs/index.rst @@ -24,8 +24,7 @@ Graph Neural Networks API Documentation cugraph-dgl/cugraph_dgl.rst cugraph-pyg/cugraph_pyg.rst - cugraph-ops/index.rst - wholegraph/index.rst + .. wholegraph/index.rst Additional Graph Packages API Documentation ---------------------------------- diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index 66bc3137fba..6573349aaec 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -222,8 +222,7 @@ def setup(app): breathe_projects = { 'libcugraph': os.environ['XML_DIR_LIBCUGRAPH'], - 'libcugraphops': os.environ['XML_DIR_LIBCUGRAPHOPS'], - 'libwholegraph': os.environ['XML_DIR_LIBWHOLEGRAPH'] + # 'libwholegraph': os.environ['XML_DIR_LIBWHOLEGRAPH'] } breathe_default_project = "libcugraph"