From 5dc6e95974b565c14ccb22b39f14de0cd257ba95 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 Nov 2024 13:20:05 -0600 Subject: [PATCH 1/2] prefer system installs of UCX libraries when using RAPIDS wheels --- features/src/rapids-build-utils/devcontainer-feature.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 703793c6..4df2e151 100644 --- a/features/src/rapids-build-utils/devcontainer-feature.json +++ b/features/src/rapids-build-utils/devcontainer-feature.json @@ -1,10 +1,11 @@ { "name": "NVIDIA RAPIDS devcontainer build utilities", "id": "rapids-build-utils", - "version": "24.12.3", + "version": "24.12.4", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { - "BASH_ENV": "/etc/bash.bash_env" + "BASH_ENV": "/etc/bash.bash_env", + "RAPIDS_LIBUCX_PREFER_SYSTEM_LIBRARY": "true" }, "postStartCommand": [ "/bin/bash", From c75c34e1b337e95628f78cf04980cfd6092a5cfb Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 22 Nov 2024 19:05:38 +0000 Subject: [PATCH 2/2] Move environment variable to pip dockerfile --- .devcontainer/rapids.Dockerfile | 2 ++ features/src/rapids-build-utils/devcontainer-feature.json | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile index 74cfe238..0a85aef3 100644 --- a/.devcontainer/rapids.Dockerfile +++ b/.devcontainer/rapids.Dockerfile @@ -28,6 +28,8 @@ RUN apt update -y \ ENV DEFAULT_VIRTUAL_ENV=rapids +ENV RAPIDS_LIBUCX_PREFER_SYSTEM_LIBRARY=true + FROM ${BASE} as conda-base ENV DEFAULT_CONDA_ENV=rapids diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 4df2e151..3e9258cb 100644 --- a/features/src/rapids-build-utils/devcontainer-feature.json +++ b/features/src/rapids-build-utils/devcontainer-feature.json @@ -4,8 +4,7 @@ "version": "24.12.4", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { - "BASH_ENV": "/etc/bash.bash_env", - "RAPIDS_LIBUCX_PREFER_SYSTEM_LIBRARY": "true" + "BASH_ENV": "/etc/bash.bash_env" }, "postStartCommand": [ "/bin/bash",