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.

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

Bump versions 22.08 #166

Merged
9 commits merged into from
Sep 7, 2022
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ option(SRF_USE_CONDA "Enables finding dependencies via conda instead of vcpkg. N
option(SRF_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF)
option(SRF_ENABLE_CODECOV "Enable gcov code coverage" OFF)

set(SRF_RAPIDS_VERSION "22.06" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.")
set(SRF_RAPIDS_VERSION "22.08" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.")

set(SRF_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
mark_as_advanced(SRF_CACHE_DIR)
Expand All @@ -58,7 +58,7 @@ endif()
rapids_cuda_init_architectures(srf)

project(srf
VERSION 22.06.00
VERSION 22.08.00
LANGUAGES C CXX
)

Expand Down
3 changes: 2 additions & 1 deletion ci/conda/environments/dev_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ dependencies:
- jinja2=3.0
- lcov=1.15
- libhwloc=2.5
- librmm=22.06
- libprotobuf=3.20
- librmm=22.08
- libtool
- ninja=1.10
- nlohmann_json=3.9
Expand Down
3 changes: 2 additions & 1 deletion ci/conda/environments/dev_env_nogcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ dependencies:
- grpc-cpp=1.45
- gtest=1.10
- libhwloc=2.5
- librmm=22.06
- libprotobuf=3.20
- librmm=22.08
- ninja=1.10
- nlohmann_json=3.9
- pkg-config=0.29
Expand Down
14 changes: 6 additions & 8 deletions ci/conda/recipes/libsrf/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,18 @@ python:

# Setup the dependencies to build with multiple versions of RAPIDS
rapids_version:
- 21.10 # 22.06 is final release with support for RAPIDS 21.10
- 22.04 # Keep around compatibility with current version -1
- 22.06
- 22.08

abseil_cpp:
- 20211102.0
- 20211102.0
- 20210324.2

grpc_cpp:
- 1.46
- 1.45
- 1.45 # 1.45 is needed for cudf>=22.06
- 20210324.2

zip_keys:
- rapids_version
- abseil_cpp
- grpc_cpp

# The following mimic what is available in the pinning feedstock:
# https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
Expand All @@ -60,6 +54,10 @@ gflags:
- 2.2
glog:
- 0.6
grpc_cpp:
- 1.45
libprotobuf:
- 3.20
ucx:
- 1.12

Expand Down
2 changes: 1 addition & 1 deletion cmake/import_rapids_cmake.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Ensure this is only run once
include_guard(GLOBAL)

set(RAPIDS_CMAKE_VERSION "22.06" CACHE STRING "Version of rapids-cmake to use")
set(RAPIDS_CMAKE_VERSION "22.08" CACHE STRING "Version of rapids-cmake to use")

# Download and load the repo according to the rapids-cmake instructions if it does not exist
if(NOT EXISTS ${CMAKE_BINARY_DIR}/RAPIDS_CMAKE.cmake)
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
include(import_rapids_cmake)

project(srf-quickstart
VERSION 22.06.00
VERSION 22.08.00
LANGUAGES C CXX
)

Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart/environment_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
- python=3.8
- scikit-build>=0.12
- spdlog=1.8.5
- srf=22.06
- srf=22.08
- sysroot_linux-64=2.17
- pip:
- cython
Expand Down