Skip to content

Commit

Permalink
Adapt to rmm logger changes (#4794)
Browse files Browse the repository at this point in the history
This PR adapts to breaking changes in rmm in rapidsai/rmm#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: #4794
  • Loading branch information
vyasr authored Dec 2, 2024
1 parent e57fc5c commit 98023d7
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 22 deletions.
22 changes: 11 additions & 11 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
13 changes: 6 additions & 7 deletions ci/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ target_link_libraries(cugraph
PRIVATE
${COMPILED_RAFT_LIB}
cuco::cuco
rmm::rmm_logger_impl
)

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions docs/cugraph/source/api_docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------------------
Expand Down
3 changes: 1 addition & 2 deletions docs/cugraph/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 98023d7

Please sign in to comment.