Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch 22.02 merge 21.12 #1965

Merged
merged 2 commits into from
Nov 22, 2021
Merged

Branch 22.02 merge 21.12 #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f5ccc3
Pin max `dask` & `distributed` to `2021.11.2` (#1958)
galipremsagar Nov 22, 2021
eefb004
Merge branch-21.12 into branch-22.02
rlratzel Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 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.

# cuGraph 21.12.00 (Date TBD)

Please see https://github.com/rapidsai/cugraph/releases/tag/v21.12.00a for the latest changes to this development branch.
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/cugraph_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.0
- cudf=21.12.*
- libcudf=21.12.*
- rmm=21.12.*
- librmm=21.12.*
- cudf=22.02.*
- libcudf=22.02.*
- rmm=22.02.*
- librmm=22.02.*
- dask>=2021.09.1
- distributed>=2021.09.1
- dask-cuda=21.12.*
- dask-cudf=21.12.*
- dask-cuda=22.02.*
- dask-cudf=22.02.*
- nccl>=2.9.9
- ucx-py=0.23.*
- ucx-proc=*=gpu
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/cugraph_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.2
- cudf=21.12.*
- libcudf=21.12.*
- rmm=21.12.*
- librmm=21.12.*
- cudf=22.02.*
- libcudf=22.02.*
- rmm=22.02.*
- librmm=22.02.*
- dask>=2021.09.1
- distributed>=2021.09.1
- dask-cuda=21.12.*
- dask-cudf=21.12.*
- dask-cuda=22.02.*
- dask-cudf=22.02.*
- nccl>=2.9.9
- ucx-py=0.23.*
- ucx-proc=*=gpu
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/cugraph_dev_cuda11.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.4
- cudf=21.12.*
- libcudf=21.12.*
- rmm=21.12.*
- librmm=21.12.*
- cudf=22.02.*
- libcudf=22.02.*
- rmm=22.02.*
- librmm=22.02.*
- dask>=2021.09.1
- distributed>=2021.09.1
- dask-cuda=21.12.*
- dask-cudf=21.12.*
- dask-cuda=22.02.*
- dask-cudf=22.02.*
- nccl>=2.9.9
- ucx-py=0.23.*
- ucx-proc=*=gpu
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies:
- libcudf=21.12.*
- rmm=21.12.*
- librmm=21.12.*
- dask>=2021.09.1
- distributed>=2021.09.1
- dask>=2021.09.1,<=2021.11.2
- distributed>=2021.09.1,<=2021.11.2
- dask-cuda=21.12.*
- dask-cudf=21.12.*
- nccl>=2.9.9
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cugraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ requirements:
- cudf={{ minor_version }}
- dask-cudf {{ minor_version }}
- dask-cuda {{ minor_version }}
- dask>=2021.09.1
- distributed>=2021.09.1
- dask>=2021.09.1,<=2021.11.2
- distributed>=2021.09.1,<=2021.11.2
- ucx-py 0.23
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#=============================================================================

cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-21.12/RAPIDS.cmake
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.02/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)

Expand All @@ -27,7 +27,7 @@ include(rapids-find)

rapids_cuda_init_architectures(CUGRAPH)

project(CUGRAPH VERSION 21.12.00 LANGUAGES C CXX CUDA)
project(CUGRAPH VERSION 22.02.00 LANGUAGES C CXX CUDA)

if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND
CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0)
Expand Down
2 changes: 1 addition & 1 deletion cpp/doxygen/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/21.12
TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/22.02

# 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
Expand Down
4 changes: 2 additions & 2 deletions docs/cugraph/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
# built documents.
#
# The short X.Y version.
version = '21.12'
version = '22.02'
# The full version, including alpha/beta/rc tags.
release = '21.12.00'
release = '22.02.00'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down