From ba066b6ad6dda49d2d914cf7753f528701232c92 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Jun 2021 10:32:52 -0700 Subject: [PATCH 1/4] add nightly version for ucx-py in ci --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index e1ddfa1cc56..9d1ad1da246 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -80,7 +80,7 @@ gpuci_conda_retry install -y \ "rapids-notebook-env=$MINOR_VERSION.*" \ "dask-cuda=${MINOR_VERSION}" \ "rmm=$MINOR_VERSION.*" \ - "ucx-py=${MINOR_VERSION}" + "ucx-py=0.21.0a*" # https://docs.rapids.ai/maintainers/depmgmt/ # gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env From 0ea5e8ee3f349bfe7ddcdb53f6f37591e17ddbbc Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 1 Jun 2021 13:56:19 -0500 Subject: [PATCH 2/4] Update build.sh --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 9d1ad1da246..d88fe837103 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -80,7 +80,7 @@ gpuci_conda_retry install -y \ "rapids-notebook-env=$MINOR_VERSION.*" \ "dask-cuda=${MINOR_VERSION}" \ "rmm=$MINOR_VERSION.*" \ - "ucx-py=0.21.0a*" + "ucx-py=0.21.*" # https://docs.rapids.ai/maintainers/depmgmt/ # gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env From 23e5316b1bd11fa5b9ad9d4d5c36067bfa2af62a Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Jun 2021 12:21:22 -0700 Subject: [PATCH 3/4] pin dask to tag --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- conda/environments/cudf_dev_cuda11.2.yml | 4 ++-- conda/recipes/dask-cudf/run_test.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 07d6a0e50af..b2426e22605 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -77,8 +77,8 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # Install the master version of dask, distributed, and streamz logger "pip install git+https://github.com/dask/distributed.git@main --upgrade --no-deps" pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@main --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps +logger "pip install git+https://github.com/dask/dask.git@2021.05.1 --upgrade --no-deps" +pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps logger "pip install git+https://github.com/python-streamz/streamz.git --upgrade --no-deps" pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 9d1ad1da246..edb2ae2aa2e 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -101,8 +101,8 @@ function install_dask { # Install the main version of dask, distributed, and streamz gpuci_logger "Install the main version of dask, distributed, and streamz" set -x - pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps - pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps + pip install "git+https://github.com/dask/distributed.git@2021.05.1" --upgrade --no-deps + pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps set +x } diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 6e3e2373492..3b5f3cea546 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -60,7 +60,7 @@ dependencies: - cachetools - transformers - pip: - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main + - git+https://github.com/dask/dask.git@2021.05.1 + - git+https://github.com/dask/distributed.git@2021.05.1 - git+https://github.com/python-streamz/streamz.git - pyorc diff --git a/conda/recipes/dask-cudf/run_test.sh b/conda/recipes/dask-cudf/run_test.sh index 3fc1182b33b..472e59149b5 100644 --- a/conda/recipes/dask-cudf/run_test.sh +++ b/conda/recipes/dask-cudf/run_test.sh @@ -12,8 +12,8 @@ function logger() { logger "pip install git+https://github.com/dask/distributed.git@main --upgrade --no-deps" pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@main --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps +logger "pip install git+https://github.com/dask/dask.git@2021.05.1 --upgrade --no-deps" +pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps logger "python -c 'import dask_cudf'" python -c "import dask_cudf" From 0d416a8992b05b673e052068d7dde39595b93ab6 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Jun 2021 12:29:36 -0700 Subject: [PATCH 4/4] revert dask pinning --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- conda/environments/cudf_dev_cuda11.2.yml | 4 ++-- conda/recipes/dask-cudf/run_test.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index b2426e22605..07d6a0e50af 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -77,8 +77,8 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # Install the master version of dask, distributed, and streamz logger "pip install git+https://github.com/dask/distributed.git@main --upgrade --no-deps" pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@2021.05.1 --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps +logger "pip install git+https://github.com/dask/dask.git@main --upgrade --no-deps" +pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps logger "pip install git+https://github.com/python-streamz/streamz.git --upgrade --no-deps" pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index df8a45f0e1a..d88fe837103 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -101,8 +101,8 @@ function install_dask { # Install the main version of dask, distributed, and streamz gpuci_logger "Install the main version of dask, distributed, and streamz" set -x - pip install "git+https://github.com/dask/distributed.git@2021.05.1" --upgrade --no-deps - pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps + pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps + pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps set +x } diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 3b5f3cea546..6e3e2373492 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -60,7 +60,7 @@ dependencies: - cachetools - transformers - pip: - - git+https://github.com/dask/dask.git@2021.05.1 - - git+https://github.com/dask/distributed.git@2021.05.1 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main - git+https://github.com/python-streamz/streamz.git - pyorc diff --git a/conda/recipes/dask-cudf/run_test.sh b/conda/recipes/dask-cudf/run_test.sh index 472e59149b5..3fc1182b33b 100644 --- a/conda/recipes/dask-cudf/run_test.sh +++ b/conda/recipes/dask-cudf/run_test.sh @@ -12,8 +12,8 @@ function logger() { logger "pip install git+https://github.com/dask/distributed.git@main --upgrade --no-deps" pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@2021.05.1 --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@2021.05.1" --upgrade --no-deps +logger "pip install git+https://github.com/dask/dask.git@main --upgrade --no-deps" +pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps logger "python -c 'import dask_cudf'" python -c "import dask_cudf"