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.

Sign up for GitHub

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

Forward-merge branch-0.42 into branch-0.43 #356

Open
wants to merge 3 commits into
base: branch-0.43
Choose a base branch
from
+45 −41
Open

Forward-merge branch-0.42 into branch-0.43 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b685d4e
Fix minimum `numba` version pinning typo (#354)
galipremsagar Jan 24, 2025
3542f03
Remove `std::mutex()` from list-initialization (#355)
pentschev Jan 27, 2025
9a2d2fc
Build and test with CUDA 12.8.0 (#357)
bdice Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
conda-cpp-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -38,7 +38,7 @@ jobs:
if: github.ref_type == 'branch'
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.8.0
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand All @@ -51,15 +51,15 @@ jobs:
upload-conda:
needs: [conda-cpp-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build-libucxx:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -71,7 +71,7 @@ jobs:
wheel-publish-libucxx:
needs: wheel-build-libucxx
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -82,7 +82,7 @@ jobs:
wheel-build-ucxx:
needs: wheel-build-libucxx
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -92,7 +92,7 @@ jobs:
wheel-publish-ucxx:
needs: wheel-build-ucxx
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -102,7 +102,7 @@ jobs:
package-type: python
wheel-build-distributed-ucxx:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -112,7 +112,7 @@ jobs:
wheel-publish-distributed-ucxx:
needs: [wheel-build-ucxx, wheel-build-distributed-ucxx]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.8.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- wheel-build-distributed-ucxx
- wheel-tests-distributed-ucxx
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda-12.8.0
if: always()
with:
needs: ${{ toJSON(needs) }}
Expand All @@ -44,7 +44,7 @@ jobs:
repo: ucxx
changed-files:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@cuda-12.8.0
with:
files_yaml: |
test_cpp:
Expand All @@ -60,19 +60,19 @@ jobs:
- '!docs/**'
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-12.8.0
with:
enable_check_generated_files: false
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.8.0
with:
build_type: pull-request
docs-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.8.0
with:
build_type: pull-request
node_type: "gpu-v100-latest-1"
Expand All @@ -82,23 +82,23 @@ jobs:
conda-cpp-tests:
needs: [conda-cpp-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.8.0
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
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, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.8.0
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
conda-python-distributed-tests:
needs: [conda-cpp-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.8.0
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
Expand All @@ -107,7 +107,7 @@ jobs:
wheel-build-libucxx:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: pull-request
script: ci/build_wheel_libucxx.sh
Expand All @@ -116,14 +116,14 @@ jobs:
wheel-build-ucxx:
needs: wheel-build-libucxx
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: pull-request
script: ci/build_wheel_ucxx.sh
wheel-tests-ucxx:
needs: [wheel-build-ucxx, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.8.0
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
Expand All @@ -132,14 +132,14 @@ jobs:
wheel-build-distributed-ucxx:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.8.0
with:
build_type: pull-request
script: ci/build_wheel_distributed_ucxx.sh
wheel-tests-distributed-ucxx:
needs: [wheel-build-ucxx, wheel-build-distributed-ucxx, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.8.0
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
conda-cpp-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.8.0
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand All @@ -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-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.8.0
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand All @@ -34,7 +34,7 @@ jobs:
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
conda-python-distributed-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.8.0
with:
build_type: nightly
script: "ci/test_python_distributed.sh"
Expand All @@ -44,7 +44,7 @@ jobs:
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
wheel-tests-ucxx:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.8.0
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand All @@ -54,7 +54,7 @@ jobs:
script: ci/test_wheel_ucxx.sh
wheel-tests-distributed-ucxx:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.8.0
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-breaking-change-alert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.02
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@cuda-12.8.0
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $ conda env create -n ucxx -f conda/environments/all_cuda-118_arch-x86_64.yaml
Or for CUDA 12.x:

```
$ conda env create -n ucxx -f conda/environments/all_cuda-125_arch-x86_64.yaml
$ conda env create -n ucxx -f conda/environments/all_cuda-128_arch-x86_64.yaml
```

And then activate the newly created environment:
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- librmm==25.2.*,>=0.0.0a0
- libtool
- ninja
- numba>=0.59.1.1,<0.61.0a0
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- pip
- pkg-config
Expand Down
6 changes: 3 additions & 3 deletions ...nvironments/all_cuda-125_arch-x86_64.yaml → ...nvironments/all_cuda-128_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- cloudpickle
- cmake>=3.26.4,!=3.30.0
- cuda-cudart-dev
- cuda-version=12.5
- cuda-version=12.8
- cudf==25.2.*,>=0.0.0a0
- cupy>=12.0.0
- cxx-compiler
Expand All @@ -25,7 +25,7 @@ dependencies:
- librmm==25.2.*,>=0.0.0a0
- libtool
- ninja
- numba>=0.59.1.1,<0.61.0a0
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- pip
- pkg-config
Expand All @@ -42,4 +42,4 @@ dependencies:
- setuptools>=64.0.0
- spdlog>=1.14.1,<1.15
- ucx>=1.15.0,<1.19
name: all_cuda-125_arch-x86_64
name: all_cuda-128_arch-x86_64
2 changes: 1 addition & 1 deletion conda/recipes/ucxx/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ outputs:
- pynvml >=12.0.0,<13.0.0a0
run_constrained:
- cupy >=9.5.0
- numba >=0.59.1.0,<0.61.0a0
- numba >=0.59.1,<0.61.0a0
test:
commands:
- test -f $PREFIX/lib/libucxx_python.so
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/ucxx/endpoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ class Endpoint : public Component {
bool _endpointErrorHandling{true}; ///< Whether the endpoint enables error handling
std::unique_ptr<InflightRequests> _inflightRequests{
std::make_unique<InflightRequests>()}; ///< The inflight requests
std::mutex _mutex{std::mutex()}; ///< Mutex used during close to prevent race conditions between
///< application thread and `ucxx::Endpoint::setCloseCallback()`
///< that may run asynchronously on another thread.
std::mutex _mutex{}; ///< Mutex used during close to prevent race conditions between
///< application thread and `ucxx::Endpoint::setCloseCallback()`
///< that may run asynchronously on another thread.
ucs_status_t _status{UCS_INPROGRESS}; ///< Endpoint status
std::atomic<bool> _closing{false}; ///< Prevent calling close multiple concurrent times.
EndpointCloseCallbackUserFunction _closeCallback{nullptr}; ///< Close callback to call
Expand Down
8 changes: 6 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: conda
matrix:
cuda: ["11.8", "12.5"]
cuda: ["11.8", "12.8"]
arch: [x86_64]
includes:
- build_cpp
Expand Down Expand Up @@ -225,6 +225,10 @@ dependencies:
cuda: "12.5"
packages:
- cuda-version=12.5
- matrix:
cuda: "12.8"
packages:
- cuda-version=12.8
cuda:
specific:
- output_types: conda
Expand Down Expand Up @@ -288,7 +292,7 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- &numba numba>=0.59.1.1,<0.61.0a0
- &numba numba>=0.59.1,<0.61.0a0
- rapids-dask-dependency==25.2.*,>=0.0.0a0
test_cpp:
common:
Expand Down
2 changes: 1 addition & 1 deletion python/distributed-ucxx/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ authors = [
license = { text = "BSD-3-Clause" }
requires-python = ">=3.10"
dependencies = [
"numba>=0.59.1.1,<0.61.0a0",
"numba>=0.59.1,<0.61.0a0",
"rapids-dask-dependency==25.2.*,>=0.0.0a0",
"ucxx==0.42.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
2 changes: 1 addition & 1 deletion python/ucxx/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test = [
"cloudpickle",
"cudf==25.2.*,>=0.0.0a0",
"cupy-cuda11x>=12.0.0",
"numba>=0.59.1.1,<0.61.0a0",
"numba>=0.59.1,<0.61.0a0",
"pytest-asyncio",
"pytest-rerunfailures",
"pytest==7.*",
Expand Down