Skip to content

Commit

Permalink
revert ucx upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: Zach Puller <[email protected]>
  • Loading branch information
zpuller committed Feb 11, 2025
1 parent 5d8ab9d commit e56fead
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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
6 changes: 3 additions & 3 deletions jenkins/Dockerfile-blossom.ubuntu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020-2025, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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 e56fead

Please sign in to comment.