From 079af458b55ea83d72293ddf5c2060c0b77d935f Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Thu, 16 Sep 2021 16:47:59 -0400 Subject: [PATCH] DOC v21.12 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 de00213a6f6..b46ac22d767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# cuDF 21.12.00 (Date TBD) + +Please see https://github.com/rapidsai/cudf/releases/tag/v21.12.00a for the latest changes to this development branch. + # 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. diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index bbe1ae70499..9d531c76dc8 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.10.* + - rmm=21.12.* - 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 ed4c3ee2efc..9ad6985e291 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.10.* + - rmm=21.12.* - 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 079db9d144b..fe81119c342 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -28,7 +28,7 @@ include(rapids-find) rapids_cuda_init_architectures(CUDF) -project(CUDF VERSION 21.10.00 LANGUAGES C CXX CUDA) +project(CUDF VERSION 21.12.00 LANGUAGES C CXX CUDA) # 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 72524996a69..1141f20e3b1 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.10.00 +PROJECT_NUMBER = 21.12.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.10 +TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/21.12 # 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 aef477c91e1..4175b34ff40 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.10) +set(CUDF_TAG branch-21.12) 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 020f5c76c10..9f060c93215 100644 --- a/cpp/libcudf_kafka/CMakeLists.txt +++ b/cpp/libcudf_kafka/CMakeLists.txt @@ -25,7 +25,7 @@ include(rapids-cuda) include(rapids-export) include(rapids-find) -project(CUDA_KAFKA VERSION 21.10.00 LANGUAGES CXX) +project(CUDA_KAFKA VERSION 21.12.00 LANGUAGES CXX) # Set a default build type if none was specified rapids_cmake_build_type(Release) diff --git a/docs/cudf/source/conf.py b/docs/cudf/source/conf.py index c5f1233d022..4a7d115ae3b 100644 --- a/docs/cudf/source/conf.py +++ b/docs/cudf/source/conf.py @@ -80,9 +80,9 @@ # built documents. # # The short X.Y version. -version = '21.10' +version = '21.12' # The full version, including alpha/beta/rc tags. -release = '21.10.00' +release = '21.12.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 fc74ee2a3a9..3aa9f14bac4 100755 --- a/java/src/main/native/CMakeLists.txt +++ b/java/src/main/native/CMakeLists.txt @@ -29,7 +29,7 @@ if(DEFINED GPU_ARCHS) endif() rapids_cuda_init_architectures(CUDF_JNI) -project(CUDF_JNI VERSION 21.10.00 LANGUAGES C CXX CUDA) +project(CUDF_JNI VERSION 21.12.00 LANGUAGES C CXX CUDA) ################################################################################################### # - build options ---------------------------------------------------------------------------------