From 084609c0e8aa009569c5bd492d850fed04d3b0d6 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Thu, 13 Jan 2022 10:38:10 -0500 Subject: [PATCH] DOC --- CHANGELOG.md | 4 ++++ ci/benchmark/build.sh | 2 +- ci/cpu/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/cugraph_dev_cuda11.0.yml | 14 +++++++------- conda/environments/cugraph_dev_cuda11.2.yml | 14 +++++++------- conda/environments/cugraph_dev_cuda11.4.yml | 14 +++++++------- conda/environments/cugraph_dev_cuda11.5.yml | 14 +++++++------- cpp/CMakeLists.txt | 4 ++-- cpp/doxygen/Doxyfile | 2 +- cpp/libcugraph_etl/CMakeLists.txt | 4 ++-- docs/cugraph/source/conf.py | 4 ++-- 12 files changed, 42 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 452ec682d3f..ef9d95e5fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# cuGraph 22.04.00 (Date TBD) + +Please see https://github.com/rapidsai/cugraph/releases/tag/v22.04.00a for the latest changes to this development branch. + # cuGraph 22.02.00 (Date TBD) Please see https://github.com/rapidsai/cugraph/releases/tag/v22.02.00a for the latest changes to this development branch. diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index aaa378ea231..aa734bb47c9 100644 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -48,7 +48,7 @@ export DATASETS_DIR=${WORKSPACE}/datasets export BENCHMARKS_DIR=${WORKSPACE}/benchmarks # ucx-py version -export UCX_PY_VERSION='0.24.*' +export UCX_PY_VERSION='0.25.*' ########################################## # Environment Setup # diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 7361b506e81..4ee915b9e7e 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -34,7 +34,7 @@ export CMAKE_GENERATOR="Ninja" export CONDA_BLD_DIR="${WORKSPACE}/.conda-bld" # ucx-py version -export UCX_PY_VERSION='0.24.*' +export UCX_PY_VERSION='0.25.*' ################################################################################ # SETUP - Check environment diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index b59ba0b3968..bfee4bb52fd 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -40,7 +40,7 @@ export GIT_DESCRIBE_TAG=`git describe --tags` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` # ucx-py version -export UCX_PY_VERSION='0.24.*' +export UCX_PY_VERSION='0.25.*' ################################################################################ # SETUP - Check environment diff --git a/conda/environments/cugraph_dev_cuda11.0.yml b/conda/environments/cugraph_dev_cuda11.0.yml index ef9694d1928..4e6ac1fa1d9 100644 --- a/conda/environments/cugraph_dev_cuda11.0.yml +++ b/conda/environments/cugraph_dev_cuda11.0.yml @@ -6,16 +6,16 @@ channels: - conda-forge dependencies: - cudatoolkit=11.0 -- cudf=22.02.* -- libcudf=22.02.* -- rmm=22.02.* -- librmm=22.02.* +- cudf=22.04.* +- libcudf=22.04.* +- rmm=22.04.* +- librmm=22.04.* - dask>=2021.09.1 - distributed>=2021.09.1 -- dask-cuda=22.02.* -- dask-cudf=22.02.* +- dask-cuda=22.04.* +- dask-cudf=22.04.* - nccl>=2.9.9 -- ucx-py=0.24.* +- ucx-py=0.25.* - ucx-proc=*=gpu - scipy - networkx>=2.5.1 diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml index d2147dae48b..da89b6d04b5 100644 --- a/conda/environments/cugraph_dev_cuda11.2.yml +++ b/conda/environments/cugraph_dev_cuda11.2.yml @@ -6,16 +6,16 @@ channels: - conda-forge dependencies: - cudatoolkit=11.2 -- cudf=22.02.* -- libcudf=22.02.* -- rmm=22.02.* -- librmm=22.02.* +- cudf=22.04.* +- libcudf=22.04.* +- rmm=22.04.* +- librmm=22.04.* - dask>=2021.09.1 - distributed>=2021.09.1 -- dask-cuda=22.02.* -- dask-cudf=22.02.* +- dask-cuda=22.04.* +- dask-cudf=22.04.* - nccl>=2.9.9 -- ucx-py=0.24.* +- ucx-py=0.25.* - ucx-proc=*=gpu - scipy - networkx>=2.5.1 diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml index 30c238be174..6434256f082 100644 --- a/conda/environments/cugraph_dev_cuda11.4.yml +++ b/conda/environments/cugraph_dev_cuda11.4.yml @@ -6,16 +6,16 @@ channels: - conda-forge dependencies: - cudatoolkit=11.4 -- cudf=22.02.* -- libcudf=22.02.* -- rmm=22.02.* -- librmm=22.02.* +- cudf=22.04.* +- libcudf=22.04.* +- rmm=22.04.* +- librmm=22.04.* - dask>=2021.09.1 - distributed>=2021.09.1 -- dask-cuda=22.02.* -- dask-cudf=22.02.* +- dask-cuda=22.04.* +- dask-cudf=22.04.* - nccl>=2.9.9 -- ucx-py=0.24.* +- ucx-py=0.25.* - ucx-proc=*=gpu - scipy - networkx>=2.5.1 diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml index dfa626ab8fd..6efb668fd25 100644 --- a/conda/environments/cugraph_dev_cuda11.5.yml +++ b/conda/environments/cugraph_dev_cuda11.5.yml @@ -6,16 +6,16 @@ channels: - conda-forge dependencies: - cudatoolkit=11.5 -- cudf=22.02.* -- libcudf=22.02.* -- rmm=22.02.* -- librmm=22.02.* +- cudf=22.04.* +- libcudf=22.04.* +- rmm=22.04.* +- librmm=22.04.* - dask>=2021.09.1 - distributed>=2021.09.1 -- dask-cuda=22.02.* -- dask-cudf=22.02.* +- dask-cuda=22.04.* +- dask-cudf=22.04.* - nccl>=2.9.9 -- ucx-py=0.24.* +- ucx-py=0.25.* - ucx-proc=*=gpu - scipy - networkx>=2.5.1 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index d3a5223b668..72ab327a027 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) -file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.02/RAPIDS.cmake +file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.04/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) @@ -27,7 +27,7 @@ include(rapids-find) rapids_cuda_init_architectures(CUGRAPH) -project(CUGRAPH VERSION 22.02.00 LANGUAGES C CXX CUDA) +project(CUGRAPH VERSION 22.04.00 LANGUAGES C CXX CUDA) if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) diff --git a/cpp/doxygen/Doxyfile b/cpp/doxygen/Doxyfile index 6cb3b6cd19b..246af901fc9 100644 --- a/cpp/doxygen/Doxyfile +++ b/cpp/doxygen/Doxyfile @@ -2075,7 +2075,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/22.02 +TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/22.04 # 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 diff --git a/cpp/libcugraph_etl/CMakeLists.txt b/cpp/libcugraph_etl/CMakeLists.txt index 1950032a8b9..79a0e7f7c02 100644 --- a/cpp/libcugraph_etl/CMakeLists.txt +++ b/cpp/libcugraph_etl/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) -file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.02/RAPIDS.cmake +file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.04/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) @@ -27,7 +27,7 @@ include(rapids-find) rapids_cuda_init_architectures(CUGRAPH_ETL) -project(CUGRAPH_ETL VERSION 22.02.00 LANGUAGES C CXX CUDA) +project(CUGRAPH_ETL VERSION 22.04.00 LANGUAGES C CXX CUDA) if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index f0c0dc441fc..c763f268f12 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -81,9 +81,9 @@ # built documents. # # The short X.Y version. -version = '22.02' +version = '22.04' # The full version, including alpha/beta/rc tags. -release = '22.02.00' +release = '22.04.00' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.