From 1a8f9955d6130a01517b7231316cbbc364fba075 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Fri, 22 Sep 2023 10:18:32 -0400 Subject: [PATCH 1/3] v0.35 Updates [skip ci] --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 4 ++-- conda/environments/ucxx-cuda118_arch-x86_64.yaml | 10 +++++----- conda/recipes/ucxx/meta.yaml | 4 ++-- cpp/CMakeLists.txt | 2 +- dependencies.yaml | 6 +++--- fetch_rapids.cmake | 2 +- python/CMakeLists.txt | 2 +- python/pyproject.toml | 2 +- python/ucxx/__init__.py | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9835c8c2..5f6f4635 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-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -38,7 +38,7 @@ jobs: upload-conda: needs: [conda-cpp-build] secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 33e9ea6a..1a57b44f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,30 +17,30 @@ jobs: - conda-cpp-tests - conda-python-tests secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.12 checks: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.12 with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 with: build_type: pull-request matrix_filter: map(select(.ARCH != "arm64")) conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 with: build_type: pull-request matrix_filter: map(select(.ARCH != "arm64")) conda-python-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 with: build_type: pull-request matrix_filter: map(select(.ARCH != "arm64")) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index faa84e88..c547e2f7 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-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 with: build_type: nightly branch: ${{ inputs.branch }} @@ -25,7 +25,7 @@ jobs: matrix_filter: map(select(.ARCH != "arm64")) conda-python-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.10 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/conda/environments/ucxx-cuda118_arch-x86_64.yaml b/conda/environments/ucxx-cuda118_arch-x86_64.yaml index 3d7b8087..634dd133 100644 --- a/conda/environments/ucxx-cuda118_arch-x86_64.yaml +++ b/conda/environments/ucxx-cuda118_arch-x86_64.yaml @@ -8,11 +8,11 @@ dependencies: - cudatoolkit=11.8 - pip # RAPIDS - - cudf==23.10.* - - dask-cuda==23.10.* - - dask-cudf==23.10.* - - librmm==23.10.* - - rmm==23.10.* + - cudf==23.12.* + - dask-cuda==23.12.* + - dask-cudf==23.12.* + - librmm==23.12.* + - rmm==23.12.* - ucx # UCX Build - libtool diff --git a/conda/recipes/ucxx/meta.yaml b/conda/recipes/ucxx/meta.yaml index ff9c5059..32033e96 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.10 + - librmm =23.12 - gtest outputs: @@ -210,7 +210,7 @@ outputs: - numpy 1.21 - {{ pin_subpackage('libucxx', exact=True) }} - ucx - - rmm =23.10 + - rmm =23.12 {% if cuda_major != "11" %} - cuda-cudart-dev {% endif %} diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 06799e71..993783bc 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.34.00) +set(libucxx_version 0.35.00) project( UCXX diff --git a/dependencies.yaml b/dependencies.yaml index bcb418d4..516c389a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -38,14 +38,14 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - &cmake_ver cmake>=3.23.1,!=3.25.0 - - rmm==23.10.* + - rmm==23.12.* - output_types: conda packages: - cython>=3.0.0 - fmt>=9.1.0,<10 - &gmock gmock>=1.13.0 - >est gtest>=1.13.0 - - librmm==23.10.* + - librmm==23.12.* - &numpy numpy>=1.21 - spdlog>=1.11.0,<1.12 checks: @@ -114,7 +114,7 @@ dependencies: common: - output_types: [conda, requirements] packages: - - cudf==23.10.* + - cudf==23.12.* - cupy - dask>=2023.1.1 - distributed>=2023.1.1 diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 15394e4e..7d8d63f0 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.10/RAPIDS.cmake + file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/UCXX_RAPIDS.cmake ) endif() diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index a2470b54..51470cda 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) -set(ucxx_version 0.34.00) +set(ucxx_version 0.35.00) include(../fetch_rapids.cmake) diff --git a/python/pyproject.toml b/python/pyproject.toml index 802a5f2a..171731fe 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -15,7 +15,7 @@ requires = [ [project] name = "ucxx" -version = "0.34.00" +version = "0.35.00" description = "Python Bindings for the Unified Communication X library (UCX)" readme = { file = "README.md", content-type = "text/markdown" } authors = [ diff --git a/python/ucxx/__init__.py b/python/ucxx/__init__.py index 71ae74af..ac1a49eb 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.34.00" +__version__ = "0.35.00" __ucx_version__ = "%d.%d.%d" % get_ucx_version() if get_ucx_version() < (1, 11, 1): From 4d95860d5b0dfa7b9c1d7f09a17b53ce8e64781c Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Tue, 26 Sep 2023 17:58:13 +0200 Subject: [PATCH 2/3] Enable ARM builds (#84) Authors: - Peter Andreas Entschev (https://github.com/pentschev) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/ucxx/pull/84 --- .github/workflows/build.yaml | 1 - .github/workflows/pr.yaml | 3 --- .github/workflows/test.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5f6f4635..d959dd3e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,7 +34,6 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - matrix_filter: map(select(.ARCH != "arm64")) upload-conda: needs: [conda-cpp-build] secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1a57b44f..197bbe8e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -29,18 +29,15 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 with: build_type: pull-request - matrix_filter: map(select(.ARCH != "arm64")) conda-cpp-tests: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 with: build_type: pull-request - matrix_filter: map(select(.ARCH != "arm64")) conda-python-tests: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 with: build_type: pull-request - matrix_filter: map(select(.ARCH != "arm64")) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c547e2f7..774e7717 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,6 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - matrix_filter: map(select(.ARCH != "arm64")) conda-python-tests: secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 @@ -31,4 +30,3 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - matrix_filter: map(select(.ARCH != "arm64")) From 97ee0fd0fb554bb3bdfd5397c9c4a53a4448f900 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 29 Sep 2023 14:38:54 -0500 Subject: [PATCH 3/3] ucxx: Build CUDA 12.0 ARM conda packages. (#83) This PR builds conda packages using CUDA 12 on ARM. Closes #82. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/ucxx/pull/83 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pr.yaml | 10 +++++----- .github/workflows/test.yaml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d959dd3e..e7618e71 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-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120-arm 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-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120-arm with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 197bbe8e..02f669b7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,27 +17,27 @@ jobs: - conda-cpp-tests - conda-python-tests secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120-arm checks: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120-arm with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-120-arm 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.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120-arm with: build_type: pull-request conda-python-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120-arm with: build_type: pull-request diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 774e7717..7637eeec 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-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-120-arm with: build_type: nightly branch: ${{ inputs.branch }} @@ -24,7 +24,7 @@ jobs: sha: ${{ inputs.sha }} conda-python-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120-arm with: build_type: nightly branch: ${{ inputs.branch }}