Skip to content

Commit

Permalink
DOC
Browse files Browse the repository at this point in the history
  • Loading branch information
raydouglass committed Mar 23, 2023
1 parent 515e0c4 commit 6b88aa8
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
python-build:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
upload-conda:
needs: [cpp-build, python-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -56,7 +56,7 @@ jobs:
if: github.ref_type == 'branch' && github.event_name == 'push'
needs: python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
with:
build_type: branch
node_type: "gpu-latest-1"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,38 @@ jobs:
- conda-notebook-tests
- docs-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.06
checks:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.06
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
with:
build_type: pull-request
conda-cpp-tests:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.06
with:
build_type: pull-request
conda-python-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
with:
build_type: pull-request
conda-notebook-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
with:
build_type: pull-request
node_type: "gpu-latest-1"
Expand All @@ -61,7 +61,7 @@ jobs:
docs-build:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
with:
build_type: pull-request
node_type: "gpu-latest-1"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ on:
jobs:
conda-cpp-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.06
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cudatoolkit=11.8
- cudf=23.04
- cudf=23.06
- cxx-compiler
- cython>=0.29,<0.30
- doxygen
Expand All @@ -18,8 +18,8 @@ dependencies:
- gmock=1.10.0
- gtest=1.10.0
- ipython
- libcudf=23.04
- librmm=23.04
- libcudf=23.06
- librmm=23.06
- myst-parser
- nbsphinx
- ninja
Expand All @@ -31,7 +31,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python>=3.8,<3.11
- rmm=23.04
- rmm=23.06
- scikit-build>=0.13.1
- setuptools
- sphinx<6
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include(rapids-find)

rapids_cuda_init_architectures(CUSPATIAL)

project(CUSPATIAL VERSION 23.04.00 LANGUAGES C CXX CUDA)
project(CUSPATIAL VERSION 23.06.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.
Expand Down
2 changes: 1 addition & 1 deletion cpp/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "libcuspatial"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 23.04.00
PROJECT_NUMBER = 23.06.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
Expand Down
24 changes: 12 additions & 12 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ dependencies:
- cxx-compiler
- gmock=1.10.0
- gtest=1.10.0
- libcudf=23.04
- librmm=23.04
- libcudf=23.06
- librmm=23.06
- ninja
specific:
- output_types: conda
Expand Down Expand Up @@ -93,7 +93,7 @@ dependencies:
- setuptools
- output_types: conda
packages:
- &cudf_conda cudf=23.04
- &cudf_conda cudf=23.06
specific:
- output_types: conda
matrices:
Expand All @@ -113,22 +113,22 @@ dependencies:
cuda: "11.8"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- cudf-cu11==23.4.*
- cudf-cu11==23.6.*
- matrix:
cuda: "11.5"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- cudf-cu11==23.4.*
- cudf-cu11==23.6.*
- matrix:
cuda: "11.4"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- cudf-cu11==23.4.*
- cudf-cu11==23.6.*
- matrix:
cuda: "11.2"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- cudf-cu11==23.4.*
- cudf-cu11==23.6.*
cudatoolkit:
specific:
- output_types: conda
Expand Down Expand Up @@ -199,30 +199,30 @@ dependencies:
- output_types: conda
packages:
- *cudf_conda
- rmm=23.04
- rmm=23.06
specific:
- output_types: requirements
matrices:
- matrix:
cuda: "11.8"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- rmm-cu11==23.4.*
- rmm-cu11==23.6.*
- matrix:
cuda: "11.5"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- rmm-cu11==23.4.*
- rmm-cu11==23.6.*
- matrix:
cuda: "11.4"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- rmm-cu11==23.4.*
- rmm-cu11==23.6.*
- matrix:
cuda: "11.2"
packages:
- "--extra-index-url=https://pypi.nvidia.com"
- rmm-cu11==23.4.*
- rmm-cu11==23.6.*
test_python:
common:
- output_types: [conda, requirements]
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
version = '23.04'
version = '23.06'
# The full version, including alpha/beta/rc tags.
release = '23.04.00'
release = '23.06.00'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion fetch_rapids.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# =============================================================================
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.04/RAPIDS.cmake
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.06/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake
)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
2 changes: 1 addition & 1 deletion python/cuspatial/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)

set(cuspatial_version 23.04.00)
set(cuspatial_version 23.06.00)

include(../../fetch_rapids.cmake)
include(rapids-cuda)
Expand Down

0 comments on commit 6b88aa8

Please sign in to comment.