diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 5a4bf3e0dbc..2b55a9db8af 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -41,19 +41,25 @@ popd rapids-logger "Build Python docs" pushd docs/cudf make dirhtml -make text -mkdir -p "${RAPIDS_DOCS_DIR}/cudf/"{html,txt} +mkdir -p "${RAPIDS_DOCS_DIR}/cudf/html" mv build/dirhtml/* "${RAPIDS_DOCS_DIR}/cudf/html" -mv build/text/* "${RAPIDS_DOCS_DIR}/cudf/txt" +if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then + make text + mkdir -p "${RAPIDS_DOCS_DIR}/cudf/txt" + mv build/text/* "${RAPIDS_DOCS_DIR}/cudf/txt" +fi popd rapids-logger "Build dask-cuDF Sphinx docs" pushd docs/dask_cudf make dirhtml -make text -mkdir -p "${RAPIDS_DOCS_DIR}/dask-cudf/"{html,txt} +mkdir -p "${RAPIDS_DOCS_DIR}/dask-cudf/html" mv build/dirhtml/* "${RAPIDS_DOCS_DIR}/dask-cudf/html" -mv build/text/* "${RAPIDS_DOCS_DIR}/dask-cudf/txt" +if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then + make text + mkdir -p "${RAPIDS_DOCS_DIR}/dask-cudf/txt" + mv build/text/* "${RAPIDS_DOCS_DIR}/dask-cudf/txt" +fi popd rapids-upload-docs diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e784945d7ce..18575ba861b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -93,6 +93,7 @@ dependencies: - sphinx-autobuild - sphinx-copybutton - sphinx-markdown-tables +- sphinx-remove-toctrees - sphinxcontrib-websupport - streamz - sysroot_linux-64==2.17 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 93b46da5803..abbbb7c2758 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -91,6 +91,7 @@ dependencies: - sphinx-autobuild - sphinx-copybutton - sphinx-markdown-tables +- sphinx-remove-toctrees - sphinxcontrib-websupport - streamz - sysroot_linux-64==2.17 diff --git a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp index 90a8c2ccc2f..d1841ff42a1 100644 --- a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp +++ b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp @@ -64,13 +64,6 @@ class stream_checking_resource_adaptor final : public rmm::mr::device_memory_res */ Upstream* get_upstream() const noexcept { return upstream_; } - /** - * @brief Checks whether the upstream resource supports streams. - * - * @return Whether or not the upstream resource supports streams - */ - bool supports_streams() const noexcept override { return upstream_->supports_streams(); } - private: /** * @brief Allocates memory of size at least `bytes` using the upstream diff --git a/dependencies.yaml b/dependencies.yaml index b4e7464c8e1..96bcf66f99b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -471,6 +471,7 @@ dependencies: - sphinx-autobuild - sphinx-copybutton - sphinx-markdown-tables + - sphinx-remove-toctrees - sphinxcontrib-websupport notebooks: common: diff --git a/docs/cudf/source/conf.py b/docs/cudf/source/conf.py index e76bdb802e4..035ee586822 100644 --- a/docs/cudf/source/conf.py +++ b/docs/cudf/source/conf.py @@ -16,10 +16,12 @@ # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. # +import filecmp import glob import os import re import sys +import tempfile import xml.etree.ElementTree as ET from docutils.nodes import Text @@ -62,6 +64,7 @@ class PseudoLexer(RegexLexer): "sphinx.ext.autodoc", "sphinx.ext.autosummary", "sphinx_copybutton", + "sphinx_remove_toctrees", "numpydoc", "IPython.sphinxext.ipython_console_highlighting", "IPython.sphinxext.ipython_directive", @@ -69,6 +72,8 @@ class PseudoLexer(RegexLexer): "myst_nb", ] +remove_from_toctrees = ["user_guide/api_docs/api/*"] + # Preprocess doxygen xml for compatibility with latest Breathe def clean_definitions(root): @@ -126,7 +131,13 @@ def clean_all_xml_files(path): for fn in glob.glob(os.path.join(path, "*.xml")): tree = ET.parse(fn) clean_definitions(tree.getroot()) - tree.write(fn) + with tempfile.NamedTemporaryFile() as tmp_fn: + tree.write(tmp_fn.name) + # Only write files that have actually changed. + if not filecmp.cmp(tmp_fn.name, fn): + tree.write(fn) + + # Breathe Configuration diff --git a/java/src/main/native/src/RmmJni.cpp b/java/src/main/native/src/RmmJni.cpp index b92d9e4e891..81b8241bab0 100644 --- a/java/src/main/native/src/RmmJni.cpp +++ b/java/src/main/native/src/RmmJni.cpp @@ -96,8 +96,6 @@ class tracking_resource_adaptor final : public base_tracking_resource_adaptor { return scoped_max_total_allocated; } - bool supports_streams() const noexcept override { return resource->supports_streams(); } - private: Upstream *const resource; std::size_t const size_align; @@ -207,8 +205,6 @@ class java_event_handler_memory_resource : public device_memory_resource { device_memory_resource *get_wrapped_resource() { return resource; } - bool supports_streams() const noexcept override { return resource->supports_streams(); } - private: device_memory_resource *const resource; base_tracking_resource_adaptor *const tracker;