Skip to content

Commit

Permalink
revert ucx upgrade (#12105)
Browse files Browse the repository at this point in the history
<!--

Thank you for contributing to RAPIDS Accelerator for Apache Spark!

Here are some guidelines to help the review process go smoothly.

1. Please write a description in this text box of the changes that are
being
   made.

2. Please ensure that you have written units tests for the changes
made/features
   added.

3. If you are closing an issue please use one of the automatic closing
words as
noted here:
https://help.github.com/articles/closing-issues-using-keywords/

4. If your pull request is not ready for review but you want to make use
of the
continuous integration testing facilities please label it with `[WIP]`.

5. If your pull request is ready to be reviewed without requiring
additional
   work on top of it, then remove the `[WIP]` label (if present).

6. Once all work has been done and review has taken place please do not
add
features or make changes out of the scope of those requested by the
reviewer
(doing this just add delays as already reviewed code ends up having to
be
re-reviewed/it is hard to tell what is new etc!). Further, please avoid
rebasing your branch during the review process, as this causes the
context
of any comments made by reviewers to be lost. If conflicts occur during
review then they should be resolved by merging into the branch used for
   making the pull request.

Many thanks in advance for your cooperation!

-->
Reverts #12058

The above PR was found to break `ucx_perftest` with `-m cuda` in the
ubuntu rdma container in a CI test. This is caused specifically by the
CUDA version upgrade in the PR.

---------

Signed-off-by: Zach Puller <[email protected]>
  • Loading branch information
zpuller authored Feb 12, 2025
1 parent fb13fb8 commit 9db0338
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
# Sample Dockerfile to install UCX in a Rocky Linux 8 image.
#
# The parameters are:
# - CUDA_VER: 12.8.0 by default
# - CUDA_VER: 11.8.0 by default
# - UCX_VER, UCX_CUDA_VER, and UCX_ARCH:
# Used to pick a package matching a specific UCX version and
# CUDA runtime from the UCX github repo.
# See: https://github.com/openucx/ucx/releases/
# - ROCKY_VER: Rocky Linux OS version

ARG CUDA_VER=12.8.0
ARG UCX_VER=1.18.0
ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG ROCKY_VER=8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
# Sample Dockerfile to install UCX in a Rocky Linux 8 image with RDMA support.
#
# The parameters are:
# - CUDA_VER: 12.8.0 by default
# - CUDA_VER: 11.8.0 by default
# - UCX_VER, UCX_CUDA_VER, and UCX_ARCH:
# Used to pick a package matching a specific UCX version and
# CUDA runtime from the UCX github repo.
# See: https://github.com/openucx/ucx/releases/
# - ROCKY_VER: Rocky Linux OS version

ARG CUDA_VER=12.8.0
ARG UCX_VER=1.18.0
ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG ROCKY_VER=8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
# Sample Dockerfile to install UCX in a Ubuntu 20.04 image
#
# The parameters are:
# - CUDA_VER: 12.8.0 by default
# - CUDA_VER: 11.8.0 by default
# - UCX_VER, UCX_CUDA_VER, and UCX_ARCH:
# Used to pick a package matching a specific UCX version and
# CUDA runtime from the UCX github repo.
# See: https://github.com/openucx/ucx/releases/
# - UBUNTU_VER: 20.04 by default
#

ARG CUDA_VER=12.8.0
ARG UCX_VER=1.18.0
ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.0
ARG UCX_CUDA_VER=11
ARG UCX_ARCH=x86_64
ARG UBUNTU_VER=20.04
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# The parameters are:
# - RDMA_CORE_VERSION: Set to 32.1 to match the rdma-core line in the latest
# released MLNX_OFED 5.x driver
# - CUDA_VER: 12.8.0 by default
# - CUDA_VER: 11.8.0 by default
# - UCX_VER, UCX_CUDA_VER, and UCX_ARCH:
# Used to pick a package matching a specific UCX version and
# CUDA runtime from the UCX github repo.
Expand All @@ -34,8 +34,8 @@


ARG RDMA_CORE_VERSION=32.1
ARG CUDA_VER=12.8.0
ARG UCX_VER=1.18.0
ARG CUDA_VER=11.8.0
ARG UCX_VER=1.16.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
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.18.0
# UCX_VER=1.16.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.18.0
ARG UCX_VER=1.16.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
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.18.0</ucx.baseVersion>
<ucx.baseVersion>1.16.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
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.18.0</ucx.baseVersion>
<ucx.baseVersion>1.16.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

0 comments on commit 9db0338

Please sign in to comment.