From 6dd86f8cac602e35175c6667a25447a7bb2b2a02 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Thu, 9 Nov 2023 16:28:10 -0500 Subject: [PATCH] v0.36 Updates [skip ci] --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 4 ++-- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 10 +++++----- conda/recipes/ucxx/meta.yaml | 4 ++-- cpp/CMakeLists.txt | 2 +- dependencies.yaml | 10 +++++----- fetch_rapids.cmake | 2 +- python/CMakeLists.txt | 2 +- python/distributed-ucxx/distributed_ucxx/__init__.py | 2 +- python/distributed-ucxx/pyproject.toml | 2 +- python/pyproject.toml | 6 +++--- python/ucxx/__init__.py | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 811b079f..788ad370 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: conda-cpp-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [conda-cpp-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4c4dec56..494415db 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,29 +17,29 @@ jobs: - conda-cpp-tests - conda-python-tests secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 with: build_type: pull-request container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000" conda-python-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 with: build_type: pull-request container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 920863ad..23d17854 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-cpp-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02 with: build_type: nightly branch: ${{ inputs.branch }} @@ -25,7 +25,7 @@ jobs: container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000" conda-python-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index b3ac9d4f..e570bf9c 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -14,18 +14,18 @@ dependencies: - cmake>=3.26.4 - cuda-version=11.8 - cudatoolkit -- cudf==23.12.* +- cudf==24.2.* - cupy - cxx-compiler - cython>=3.0.0 - dask -- dask-cuda==23.12.* -- dask-cudf==23.12.* +- dask-cuda==24.2.* +- dask-cudf==24.2.* - distributed - fmt>=9.1.0,<10 - gmock>=1.13.0 - gtest>=1.13.0 -- librmm==23.12.* +- librmm==24.2.* - libtool - ninja - numba>=0.57.1 @@ -38,7 +38,7 @@ dependencies: - pytest-asyncio - pytest-rerunfailures - python>=3.9,<3.11 -- rmm==23.12.* +- rmm==24.2.* - scikit-build>=0.13.1 - setuptools - spdlog>=1.11.0,<1.12 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 42dbb4f5..c9b23b75 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -14,18 +14,18 @@ dependencies: - cmake>=3.26.4 - cuda-cudart-dev - cuda-version=12.0 -- cudf==23.12.* +- cudf==24.2.* - cupy - cxx-compiler - cython>=3.0.0 - dask -- dask-cuda==23.12.* -- dask-cudf==23.12.* +- dask-cuda==24.2.* +- dask-cudf==24.2.* - distributed - fmt>=9.1.0,<10 - gmock>=1.13.0 - gtest>=1.13.0 -- librmm==23.12.* +- librmm==24.2.* - libtool - ninja - numba>=0.57.1 @@ -38,7 +38,7 @@ dependencies: - pytest-asyncio - pytest-rerunfailures - python>=3.9,<3.11 -- rmm==23.12.* +- rmm==24.2.* - scikit-build>=0.13.1 - setuptools - spdlog>=1.11.0,<1.12 diff --git a/conda/recipes/ucxx/meta.yaml b/conda/recipes/ucxx/meta.yaml index 82030e3c..dcf2be8b 100644 --- a/conda/recipes/ucxx/meta.yaml +++ b/conda/recipes/ucxx/meta.yaml @@ -51,7 +51,7 @@ requirements: - cuda-version ={{ cuda_version }} - ucx - python - - librmm =23.12 + - librmm =24.02 - gtest outputs: @@ -215,7 +215,7 @@ outputs: - numpy 1.21 - {{ pin_subpackage('libucxx', exact=True) }} - ucx - - rmm =23.12 + - rmm =24.02 {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 4c4fc566..3591d698 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -11,7 +11,7 @@ include(rapids-cpm) include(rapids-export) include(rapids-find) -set(libucxx_version 0.35.00) +set(libucxx_version 0.36.00) project( UCXX diff --git a/dependencies.yaml b/dependencies.yaml index ba444b8c..32c59f6c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -70,7 +70,7 @@ dependencies: - fmt>=9.1.0,<10 - &gmock gmock>=1.13.0 - >est gtest>=1.13.0 - - librmm==23.12.* + - librmm==24.2.* - ninja - spdlog>=1.11.0,<1.12 build_python: @@ -80,7 +80,7 @@ dependencies: - *cmake_ver - cython>=3.0.0 - ninja - - rmm==23.12.* + - rmm==24.2.* - scikit-build>=0.13.1 - setuptools - tomli @@ -126,8 +126,8 @@ dependencies: # These packages are useful for development but not otherwise required to build/run # RAPIDS - pip - - dask-cuda==23.12.* - - dask-cudf==23.12.* + - dask-cuda==24.2.* + - dask-cudf==24.2.* # UCX Build - libtool - automake @@ -170,7 +170,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cloudpickle - - cudf==23.12.* + - cudf==24.2.* - cupy - dask - distributed diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 7d8d63f0..62a33c30 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -12,7 +12,7 @@ # the License. # ============================================================================= if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake) - file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake + file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake ) endif() diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 9fac630d..9d5a6e96 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) -set(ucxx_version 0.35.00) +set(ucxx_version 0.36.00) include(../fetch_rapids.cmake) diff --git a/python/distributed-ucxx/distributed_ucxx/__init__.py b/python/distributed-ucxx/distributed_ucxx/__init__.py index eca49ffd..01ad2df7 100644 --- a/python/distributed-ucxx/distributed_ucxx/__init__.py +++ b/python/distributed-ucxx/distributed_ucxx/__init__.py @@ -2,4 +2,4 @@ from . import distributed_patches # noqa: F401 -__version__ = "0.35.00" +__version__ = "0.36.00" diff --git a/python/distributed-ucxx/pyproject.toml b/python/distributed-ucxx/pyproject.toml index 93fefdd7..cc3f581e 100644 --- a/python/distributed-ucxx/pyproject.toml +++ b/python/distributed-ucxx/pyproject.toml @@ -7,7 +7,7 @@ requires = [ [project] name = "distributed-ucxx" -version = "0.35.00" +version = "0.36.00" description = "UCX communication module for Dask Distributed" readme = { file = "README.md", content-type = "text/markdown" } authors = [ diff --git a/python/pyproject.toml b/python/pyproject.toml index e57a5b6f..a9f91f1f 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -7,7 +7,7 @@ requires = [ "cmake>=3.26.4", "cython>=3.0.0", "ninja", - "rmm==23.12.*", + "rmm==24.2.*", "scikit-build>=0.13.1", "setuptools", "tomli", @@ -16,7 +16,7 @@ requires = [ [project] name = "ucxx" -version = "0.35.00" +version = "0.36.00" description = "Python Bindings for the Unified Communication X library (UCX)" readme = { file = "README.md", content-type = "text/markdown" } authors = [ @@ -43,7 +43,7 @@ classifiers = [ [project.optional-dependencies] test = [ "cloudpickle", - "cudf==23.12.*", + "cudf==24.2.*", "cupy", "dask", "distributed", diff --git a/python/ucxx/__init__.py b/python/ucxx/__init__.py index ac1a49eb..acda9988 100644 --- a/python/ucxx/__init__.py +++ b/python/ucxx/__init__.py @@ -85,7 +85,7 @@ def _is_mig_device(handle): os.environ["UCX_MAX_RNDV_RAILS"] = "1" -__version__ = "0.35.00" +__version__ = "0.36.00" __ucx_version__ = "%d.%d.%d" % get_ucx_version() if get_ucx_version() < (1, 11, 1):