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

Upgrade ucx to 1.18 #12110

Merged
merged 7 commits into from
Feb 13, 2025
Merged

Upgrade ucx to 1.18 #12110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e56fead
revert ucx upgrade
zpuller Feb 11, 2025
984b274
license header
zpuller Feb 11, 2025
1814dc9
upgrade only ucx to 118
zpuller Feb 12, 2025
07fd348
Merge branch 'branch-25.02' into ucx_118_1
zpuller Feb 12, 2025
d1f549b
Update Dockerfile-blossom.ubuntu
zpuller Feb 12, 2025
207a59e
Update pom.xml
zpuller Feb 12, 2025
d64f6d8
Update pom.xml
zpuller Feb 12, 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
2 changes: 1 addition & 1 deletion docs/additional-functionality/shuffle-docker-examples/Dockerfile.rocky_no_rdma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# - ROCKY_VER: Rocky Linux OS version

ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_VER=1.18.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG ROCKY_VER=8
Expand Down
2 changes: 1 addition & 1 deletion docs/additional-functionality/shuffle-docker-examples/Dockerfile.rocky_rdma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# - ROCKY_VER: Rocky Linux OS version

ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_VER=1.18.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG ROCKY_VER=8
Expand Down
2 changes: 1 addition & 1 deletion docs/additional-functionality/shuffle-docker-examples/Dockerfile.ubuntu_no_rdma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#

ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_VER=1.18.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG UBUNTU_VER=20.04
Expand Down
2 changes: 1 addition & 1 deletion docs/additional-functionality/shuffle-docker-examples/Dockerfile.ubuntu_rdma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

ARG RDMA_CORE_VERSION=32.1
ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_VER=1.18.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG UBUNTU_VER=20.04
Expand Down
4 changes: 2 additions & 2 deletions jenkins/Dockerfile-blossom.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
# Arguments:
# CUDA_VER=[11.X.Y,12.X.Y]
# UBUNTU_VER=[20.04,22.0.4]
# UCX_VER=1.16.0
# UCX_VER=1.18.0
# TARGETPLATFORM=[linux/amd64,linux/arm64]
# ARCH=[amd64,arm64]
# UCX_ARCH=[x86_64,aarch64]
###

ARG CUDA_VER=11.8.0
ARG UBUNTU_VER=20.04
ARG UCX_VER=1.16.0
ARG UCX_VER=1.18.0
ARG TARGETPLATFORM=linux/amd64
# multi-platform build with: docker buildx build --platform linux/arm64,linux/amd64 <ARGS> on either amd64 or arm64 host
# check available official arm-based docker images at https://hub.docker.com/r/nvidia/cuda/tags (OS/ARCH)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@
https://github.com/openjdk/jdk17/blob/4afbcaf55383ec2f5da53282a1547bac3d099e9d/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties#L1993-L1994
-->
<scala.javac.args>-Xlint:all,-serial,-path,-try,-processing|-Werror</scala.javac.args>
<ucx.baseVersion>1.16.0</ucx.baseVersion>
<ucx.baseVersion>1.18.0</ucx.baseVersion>
<roaringbitmap.version>1.0.6</roaringbitmap.version>
<!-- ucx x86 is just the base version (implied), arm is specified under arm64 profile. -->
<ucx.version>${ucx.baseVersion}</ucx.version>
Expand Down
2 changes: 1 addition & 1 deletion scala2.13/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@
https://github.com/openjdk/jdk17/blob/4afbcaf55383ec2f5da53282a1547bac3d099e9d/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties#L1993-L1994
-->
<scala.javac.args>-Xlint:all,-serial,-path,-try,-processing|-Werror</scala.javac.args>
<ucx.baseVersion>1.16.0</ucx.baseVersion>
<ucx.baseVersion>1.18.0</ucx.baseVersion>
<roaringbitmap.version>1.0.6</roaringbitmap.version>
<!-- ucx x86 is just the base version (implied), arm is specified under arm64 profile. -->
<ucx.version>${ucx.baseVersion}</ucx.version>
Expand Down