Skip to content

Commit

Permalink
DOC
Browse files Browse the repository at this point in the history
  • Loading branch information
raydouglass committed Jul 22, 2022
1 parent 362f91c commit cbc28a2
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 33 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# raft 22.10.00 (Date TBD)

Please see https://github.com/rapidsai/raft/releases/tag/v22.10.00a for the latest changes to this development branch.

# raft 22.08.00 (Date TBD)

Please see https://github.com/rapidsai/raft/releases/tag/v22.08.00a for the latest changes to this development branch.
Expand Down
2 changes: 1 addition & 1 deletion ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export CMAKE_GENERATOR="Ninja"
export CONDA_BLD_DIR="${WORKSPACE}/.conda-bld"

# ucx-py version
export UCX_PY_VERSION='0.27.*'
export UCX_PY_VERSION='0.28.*'

################################################################################
# SETUP - Check environment
Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
unset GIT_DESCRIBE_TAG

# ucx-py version
export UCX_PY_VERSION='0.27.*'
export UCX_PY_VERSION='0.28.*'

################################################################################
# SETUP - Check environment
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/raft_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ dependencies:
- cython>=0.29,<0.30
- cmake>=3.20.1,!=3.23.0
- scikit-build>=0.13.1
- rapids-build-env=22.08.*
- rapids-notebook-env=22.08.*
- rapids-doc-env=22.08.*
- rmm=22.08.*
- dask-cuda=22.08.*
- rapids-build-env=22.10.*
- rapids-notebook-env=22.10.*
- rapids-doc-env=22.10.*
- rmm=22.10.*
- dask-cuda=22.10.*
- ucx>=1.13.0
- ucx-py=0.27.*
- ucx-py=0.28.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
- libfaiss>=1.7.0
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/raft_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ dependencies:
- cython>=0.29,<0.30
- cmake>=3.20.1,!=3.23.0
- scikit-build>=0.13.1
- rapids-build-env=22.08.*
- rapids-notebook-env=22.08.*
- rapids-doc-env=22.08.*
- rmm=22.08.*
- dask-cuda=22.08.*
- rapids-build-env=22.10.*
- rapids-notebook-env=22.10.*
- rapids-doc-env=22.10.*
- rmm=22.10.*
- dask-cuda=22.10.*
- ucx>=1.13.0
- ucx-py=0.27.*
- ucx-py=0.28.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
- libfaiss>=1.7.0
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/raft_dev_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ dependencies:
- cython>=0.29,<0.30
- cmake>=3.20.1,!=3.23.0
- scikit-build>=0.13.1
- rapids-build-env=22.08.*
- rapids-notebook-env=22.08.*
- rapids-doc-env=22.08.*
- rmm=22.08.*
- dask-cuda=22.08.*
- rapids-build-env=22.10.*
- rapids-notebook-env=22.10.*
- rapids-doc-env=22.10.*
- rmm=22.10.*
- dask-cuda=22.10.*
- ucx>=1.13.0
- ucx-py=0.27.*
- ucx-py=0.28.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
- libfaiss>=1.7.0
Expand Down
12 changes: 6 additions & 6 deletions conda/environments/raft_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ dependencies:
- cython>=0.29,<0.30
- cmake>=3.20.1,!=3.23.0
- scikit-build>=0.13.1
- rapids-build-env=22.08.*
- rapids-notebook-env=22.08.*
- rapids-doc-env=22.08.*
- rmm=22.08.*
- dask-cuda=22.08.*
- rapids-build-env=22.10.*
- rapids-notebook-env=22.10.*
- rapids-doc-env=22.10.*
- rmm=22.10.*
- dask-cuda=22.10.*
- ucx>=1.13.0
- ucx-py=0.27.*
- ucx-py=0.28.*
- ucx-proc=*=gpu
- doxygen>=1.8.20
- libfaiss>=1.7.0
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(RAPIDS_VERSION "22.06")
set(RAFT_VERSION "${RAPIDS_VERSION}.00")

cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
file(DOWNLOAD https://github.com/raw/rapidsai/rapids-cmake/branch-22.08/RAPIDS.cmake
file(DOWNLOAD https://github.com/raw/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(rapids-cmake)
Expand All @@ -28,7 +28,7 @@ include(rapids-find)

rapids_cuda_init_architectures(RAFT)

project(RAFT VERSION 22.08.00 LANGUAGES CXX CUDA)
project(RAFT VERSION 22.10.00 LANGUAGES CXX CUDA)

# Needed because GoogleBenchmark changes the state of FindThreads.cmake, causing subsequent runs to
# have different values for the `Threads::Threads` target. Setting this flag ensures
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
# built documents.
#
# The short X.Y version.
version = '22.08'
version = '22.10'
# The full version, including alpha/beta/rc tags.
release = '22.08.00'
release = '22.10.00'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions python/pylibraft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)

set(pylibraft_version 22.08.00)
set(pylibraft_version 22.10.00)

file(DOWNLOAD https://github.com/raw/rapidsai/rapids-cmake/branch-22.08/RAPIDS.cmake
file(DOWNLOAD https://github.com/raw/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)

Expand Down
2 changes: 1 addition & 1 deletion python/raft/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)

set(pyraft_version 22.08.00)
set(pyraft_version 22.10.00)

file(DOWNLOAD https://github.com/raw/rapidsai/rapids-cmake/branch-22.06/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
Expand Down

0 comments on commit cbc28a2

Please sign in to comment.