From c69ea8fd98bab889b19d01ba2b03607b771f944c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 09:31:45 -0500 Subject: [PATCH 1/4] make conda installs in CI stricter --- ci/build_docs.sh | 10 +++++----- ci/test_cpp.sh | 6 +++++- ci/test_python.sh | 5 ++++- ci/test_python_distributed.sh | 6 +++++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index d11a9993..56932d9c 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,6 +6,9 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +export UCXX_VERSION="$(rapids-version)" +UCXX_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + ENV_YAML_DIR="$(mktemp -d)" rapids-dependency-file-generator \ @@ -23,11 +26,8 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - libucxx + "libucxx=${UCXX_VERSION}" -export UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" -export UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)" -export RAPIDS_VERSION_NUMBER="$UCXX_VERSION_MAJOR_MINOR" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-logger "Build CPP docs" @@ -37,4 +37,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/libucxx/html" mv html/* "${RAPIDS_DOCS_DIR}/libucxx/html" popd -rapids-upload-docs +RAPIDS_VERSION_NUMBER="${UCXX_VERSION_MAJOR_MINOR}" rapids-upload-docs diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index b3a8d4f9..7ef6a548 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +UCXX_VERSION="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ @@ -29,7 +31,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - libucxx libucxx-examples libucxx-tests + "libucxx=${UCXX_VERSION}" \ + "libucxx-examples=${UCXX_VERSION}" \ + "libucxx-tests=${UCXX_VERSION}" print_ucx_config diff --git a/ci/test_python.sh b/ci/test_python.sh index 452ddc29..a91149f5 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +UCXX_VERSION="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key test_python \ @@ -27,7 +29,8 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - libucxx ucxx + "libucxx=${UCXX_VERSION}" \ + "ucxx=${UCXX_VERSION}" print_ucx_config diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index 46160707..a6fabd3d 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +UCXX_VERSION="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key test_python_distributed \ @@ -27,7 +29,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - libucxx ucxx distributed-ucxx + "libucxx=${UCXX_VERSION}" \ + "ucxx=${UCXX_VERSION}" \ + "distributed-ucxx=${UCXX_VERSION}" print_ucx_config From 6b5dca0d81fea977c9b17badcb63dbfb08e7d4fa Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 10:02:24 -0500 Subject: [PATCH 2/4] rapids-version does not work in this repo --- ci/build_docs.sh | 4 ++-- ci/test_cpp.sh | 2 +- ci/test_python.sh | 2 +- ci/test_python_distributed.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 56932d9c..bdf21e58 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,8 +6,8 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -export UCXX_VERSION="$(rapids-version)" -UCXX_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" +export UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" +UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)" ENV_YAML_DIR="$(mktemp -d)" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 7ef6a548..45fd58b5 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(rapids-version)" +UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_python.sh b/ci/test_python.sh index a91149f5..1d3d93e8 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(rapids-version)" +UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index a6fabd3d..8429a87d 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(rapids-version)" +UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" rapids-dependency-file-generator \ --output conda \ From 9936410c5b34cf08b4f251708fe5b1ce6aee020a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 12:23:21 -0500 Subject: [PATCH 3/4] empty commit to get past github disruption From 5b5dddd60636df960ff4895e171228e53617609e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 16:29:31 -0500 Subject: [PATCH 4/4] use head for consistency with ucx-py --- ci/build_docs.sh | 2 +- ci/test_cpp.sh | 2 +- ci/test_python.sh | 2 +- ci/test_python_distributed.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index bdf21e58..30f3cd02 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,7 +6,7 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -export UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" +export UCXX_VERSION="$(head -1 ./VERSION)" UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)" ENV_YAML_DIR="$(mktemp -d)" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 45fd58b5..e6178bc6 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" +UCXX_VERSION="$(head -1 ./VERSION)" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_python.sh b/ci/test_python.sh index 1d3d93e8..d6e58cc8 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" +UCXX_VERSION="$(head -1 ./VERSION)" rapids-dependency-file-generator \ --output conda \ diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index 8429a87d..9ecbf3e1 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/test_common.sh" rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)" +UCXX_VERSION="$(head -1 ./VERSION)" rapids-dependency-file-generator \ --output conda \