diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 529eaeae696..b94c61cc184 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -5,6 +5,9 @@ set -euo pipefail export RAPIDS_VERSION_NUMBER="$(rapids-generate-version)" +export RAPIDS_VERSION="$(rapids-version)" +export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/check_style.sh b/ci/check_style.sh index 8d882743fcc..b3890607f64 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -16,7 +16,9 @@ rapids-dependency-file-generator \ rapids-mamba-retry env create --force -f "${ENV_YAML_DIR}/env.yaml" -n checks conda activate checks -FORMAT_FILE_URL=https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.04/cmake-format-rapids-cmake.json +RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + +FORMAT_FILE_URL="https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/cmake-format-rapids-cmake.json" export RAPIDS_CMAKE_FORMAT_FILE=/tmp/rapids_cmake_ci/cmake-formats-rapids-cmake.json mkdir -p $(dirname ${RAPIDS_CMAKE_FORMAT_FILE}) wget -O ${RAPIDS_CMAKE_FORMAT_FILE} ${FORMAT_FILE_URL} diff --git a/ci/checks/doxygen.sh b/ci/checks/doxygen.sh index d932fa097e9..faf662aa593 100755 --- a/ci/checks/doxygen.sh +++ b/ci/checks/doxygen.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. ############################### # cuDF doxygen warnings check # ############################### @@ -21,6 +21,10 @@ if [ ! $(version "$DOXYGEN_VERSION") -eq $(version "1.9.1") ] ; then exit 0 fi +# Set variables for doxygen +export RAPIDS_VERSION="$(rapids-version)" +export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + # Run doxygen, ignore missing tag files error TAG_ERROR1="error: Tag file '.*.tag' does not exist or is not a file. Skipping it..." TAG_ERROR2="error: cannot open tag file .*.tag for writing" diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 811e7825363..7cacdfd39c3 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -44,12 +44,6 @@ echo "${NEXT_FULL_TAG}" > VERSION # Wheel testing script sed_runner "s/branch-.*/branch-${NEXT_SHORT_TAG}/g" ci/test_wheel_dask_cudf.sh -# cmake-format rapids-cmake definitions -sed_runner 's/'"branch-.*\/cmake-format-rapids-cmake.json"'/'"branch-${NEXT_SHORT_TAG}\/cmake-format-rapids-cmake.json"'/g' ci/check_style.sh - -# doxyfile update -sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '${NEXT_FULL_TAG}'/g' cpp/doxygen/Doxyfile - DEPENDENCIES=( cudf cudf_kafka @@ -71,9 +65,6 @@ for DEP in "${DEPENDENCIES[@]}"; do done done -# Doxyfile update -sed_runner "s|\(TAGFILES.*librmm/\).*|\1${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile - # README.md update sed_runner "s/version == ${CURRENT_SHORT_TAG}/version == ${NEXT_SHORT_TAG}/g" README.md sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" README.md diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5e8d13aa32d..36fef2201f1 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -1081,7 +1081,8 @@ rapids_export( add_custom_command( OUTPUT CUDF_DOXYGEN WORKING_DIRECTORY ${CUDF_SOURCE_DIR}/doxygen - COMMAND doxygen Doxyfile + COMMAND ${CMAKE_COMMAND} -E env "RAPIDS_VERSION=${RAPIDS_VERSION}" + "RAPIDS_VERSION_MAJOR_MINOR=${RAPIDS_VERSION_MAJOR_MINOR}" doxygen Doxyfile VERBATIM COMMENT "Custom command for building cudf doxygen docs." ) diff --git a/cpp/doxygen/Doxyfile b/cpp/doxygen/Doxyfile index e45f856b870..81d8793d98b 100644 --- a/cpp/doxygen/Doxyfile +++ b/cpp/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = libcudf # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 24.04.00 +PROJECT_NUMBER = $(RAPIDS_VERSION) # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -2226,7 +2226,7 @@ SKIP_FUNCTION_MACROS = YES # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. -TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/24.04 +TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/$(RAPIDS_VERSION_MAJOR_MINOR) # When a file name is specified after GENERATE_TAGFILE, doxygen will create a # tag file that is based on the input files it reads. See section "Linking to