Skip to content

Commit

Permalink
Revert "revert to sequential solves"
Browse files Browse the repository at this point in the history
This reverts commit dc5fb01.
  • Loading branch information
gforsyth committed Feb 18, 2025
1 parent dc5fb01 commit e9d896a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
10 changes: 4 additions & 6 deletions ci/test_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ source "$(dirname "$0")/test_common.sh"

rapids-logger "Downloading artifacts from previous jobs"
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
export UCXX_VERSION="$(head -1 ./VERSION)"

rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh
Expand All @@ -18,16 +17,15 @@ rapids-dependency-file-generator \
--output conda \
--file-key test_cpp \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \
--prepend-channel "${CPP_CHANNEL}" \
| tee env.yaml

# Heinous hack time!
sed -i "s#- libucxx#$- ${CPP_CHANNEL}::libucxx#" env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n test
conda activate test

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
"libucxx=${UCXX_VERSION}"


rapids-print-env

print_system_stats
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ files:
includes:
- cuda_version
- test_cpp
# - depends_on_libucxx
# - depends_on_libucxx_examples
# - depends_on_libucxx_tests
- depends_on_libucxx
- depends_on_libucxx_examples
- depends_on_libucxx_tests
test_python:
output: none
includes:
Expand Down

0 comments on commit e9d896a

Please sign in to comment.