From b0b4ac594987fb6447b43b981590e732e0346267 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Thu, 15 Jul 2021 17:02:36 -0400 Subject: [PATCH] DOC v21.10 Updates --- CHANGELOG.md | 4 ++++ conda/environments/cudf_dev_cuda11.0.yml | 2 +- conda/environments/cudf_dev_cuda11.2.yml | 2 +- cpp/CMakeLists.txt | 2 +- cpp/doxygen/Doxyfile | 4 ++-- cpp/examples/basic/CMakeLists.txt | 2 +- cpp/libcudf_kafka/CMakeLists.txt | 2 +- docs/cudf/source/conf.py | 4 ++-- java/src/main/native/CMakeLists.txt | 2 +- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caf9c53ae58..cc92cde15a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# cuDF 21.10.00 (Date TBD) + +Please see https://github.com/rapidsai/cudf/releases/tag/v21.10.00a for the latest changes to this development branch. + # cuDF 21.08.00 (Date TBD) Please see https://github.com/rapidsai/cudf/releases/tag/v21.08.00a for the latest changes to this development branch. diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index a7871bae2c5..ee7e32d4579 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -10,7 +10,7 @@ dependencies: - clang=11.0.0 - clang-tools=11.0.0 - cupy>7.1.0,<10.0.0a0 - - rmm=21.08.* + - rmm=21.10.* - cmake>=3.20.1 - cmake_setuptools>=0.1.3 - python>=3.7,<3.9 diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 3919ed67903..163225bd07e 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -10,7 +10,7 @@ dependencies: - clang=11.0.0 - clang-tools=11.0.0 - cupy>7.1.0,<10.0.0a0 - - rmm=21.08.* + - rmm=21.10.* - cmake>=3.20.1 - cmake_setuptools>=0.1.3 - python>=3.7,<3.9 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index ab7d8389c88..73cba599e1f 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -28,7 +28,7 @@ elseif(CMAKE_CUDA_ARCHITECTURES STREQUAL "") set(CUDF_BUILD_FOR_DETECTED_ARCHS TRUE) endif() -project(CUDF VERSION 21.08.00 LANGUAGES C CXX) +project(CUDF VERSION 21.10.00 LANGUAGES C CXX) # Needed because GoogleBenchmark changes the state of FindThreads.cmake, # causing subsequent runs to have different values for the `Threads::Threads` target. diff --git a/cpp/doxygen/Doxyfile b/cpp/doxygen/Doxyfile index 2b6b16bd947..72524996a69 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 = 21.08.00 +PROJECT_NUMBER = 21.10.00 # 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 @@ -2167,7 +2167,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/21.08 +TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/21.10 # 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/examples/basic/CMakeLists.txt b/cpp/examples/basic/CMakeLists.txt index 17a26d865de..aef477c91e1 100644 --- a/cpp/examples/basic/CMakeLists.txt +++ b/cpp/examples/basic/CMakeLists.txt @@ -6,7 +6,7 @@ set(CPM_DOWNLOAD_VERSION v0.32.2) file(DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/download/${CPM_DOWNLOAD_VERSION}/get_cpm.cmake ${CMAKE_BINARY_DIR}/cmake/get_cpm.cmake) include(${CMAKE_BINARY_DIR}/cmake/get_cpm.cmake) -set(CUDF_TAG branch-21.08) +set(CUDF_TAG branch-21.10) CPMFindPackage(NAME cudf GIT_REPOSITORY https://github.com/rapidsai/cudf GIT_TAG ${CUDF_TAG} diff --git a/cpp/libcudf_kafka/CMakeLists.txt b/cpp/libcudf_kafka/CMakeLists.txt index 3f9343de1c6..7c112d838d8 100644 --- a/cpp/libcudf_kafka/CMakeLists.txt +++ b/cpp/libcudf_kafka/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= cmake_minimum_required(VERSION 3.18 FATAL_ERROR) -project(CUDA_KAFKA VERSION 21.08.00 LANGUAGES CXX) +project(CUDA_KAFKA VERSION 21.10.00 LANGUAGES CXX) ################################################################################################### # - Build options diff --git a/docs/cudf/source/conf.py b/docs/cudf/source/conf.py index c949a491d3b..810106615f9 100644 --- a/docs/cudf/source/conf.py +++ b/docs/cudf/source/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "21.08" +version = '21.10' # The full version, including alpha/beta/rc tags. -release = "21.08.00" +release = '21.10.00' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt index e779a74290d..1b0b747f92b 100755 --- a/java/src/main/native/CMakeLists.txt +++ b/java/src/main/native/CMakeLists.txt @@ -32,7 +32,7 @@ elseif(CMAKE_CUDA_ARCHITECTURES STREQUAL "") set(CUDF_JNI_BUILD_FOR_DETECTED_ARCHS TRUE) endif() -project(CUDF_JNI VERSION 21.08.00 LANGUAGES C CXX) +project(CUDF_JNI VERSION 21.10.00 LANGUAGES C CXX) ################################################################################################### # - build options ---------------------------------------------------------------------------------