From f4a0bdfb194dee2e6cd77c790b77ad8f08146950 Mon Sep 17 00:00:00 2001 From: Mithun RK Date: Wed, 10 Mar 2021 20:12:32 -0800 Subject: [PATCH 1/4] Fix null-bounds calculation for ranged window queries --- cpp/src/rolling/grouped_rolling.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/rolling/grouped_rolling.cu b/cpp/src/rolling/grouped_rolling.cu index 3a9bc8c2779..00086d5a6d6 100644 --- a/cpp/src/rolling/grouped_rolling.cu +++ b/cpp/src/rolling/grouped_rolling.cu @@ -385,7 +385,7 @@ get_null_bounds_for_timestamp_column(column_view const& timestamp_column, if (timestamp_column.has_nulls()) { auto p_timestamps_device_view = column_device_view::create(timestamp_column); - auto num_groups = group_offsets.size(); + auto num_groups = group_offsets.size() - 1; // Null timestamps exist. Find null bounds, per group. thrust::for_each( From 35e544ac1348b989eaf2eb911161b28596db8090 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Mon, 8 Mar 2021 13:43:54 -0600 Subject: [PATCH 2/4] FIX Change dask and distributed branch to main --- ci/gpu/build.sh | 10 +++++----- conda/environments/cudf_dev_cuda10.1.yml | 4 ++-- conda/environments/cudf_dev_cuda10.2.yml | 4 ++-- conda/environments/cudf_dev_cuda11.0.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 581328a48a9..6902e5f5093 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -97,11 +97,11 @@ conda config --show-sources conda list --show-channel-urls function install_dask { - # Install the master version of dask, distributed, and streamz - gpuci_logger "Install the master version of dask, distributed, and streamz" + # 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@master" --upgrade --no-deps - pip install "git+https://github.com/dask/dask.git@master" --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 } @@ -151,7 +151,7 @@ else #Project Flash export LIB_BUILD_DIR="$WORKSPACE/ci/artifacts/cudf/cpu/libcudf_work/cpp/build" export LD_LIBRARY_PATH="$LIB_BUILD_DIR:$CONDA_PREFIX/lib:$LD_LIBRARY_PATH" - + if hasArg --skip-tests; then gpuci_logger "Skipping Tests" exit 0 diff --git a/conda/environments/cudf_dev_cuda10.1.yml b/conda/environments/cudf_dev_cuda10.1.yml index b810b87111a..fc75c45ec81 100644 --- a/conda/environments/cudf_dev_cuda10.1.yml +++ b/conda/environments/cudf_dev_cuda10.1.yml @@ -61,7 +61,7 @@ dependencies: - protobuf - nvtx>=0.2.1 - pip: - - git+https://github.com/dask/dask.git@master - - git+https://github.com/dask/distributed.git@master + - 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/environments/cudf_dev_cuda10.2.yml b/conda/environments/cudf_dev_cuda10.2.yml index b4e95bc6730..e0b818579fd 100644 --- a/conda/environments/cudf_dev_cuda10.2.yml +++ b/conda/environments/cudf_dev_cuda10.2.yml @@ -61,7 +61,7 @@ dependencies: - protobuf - nvtx>=0.2.1 - pip: - - git+https://github.com/dask/dask.git@master - - git+https://github.com/dask/distributed.git@master + - 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/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 3b21f00ab16..c0355c489a7 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -61,7 +61,7 @@ dependencies: - protobuf - nvtx>=0.2.1 - pip: - - git+https://github.com/dask/dask.git@master - - git+https://github.com/dask/distributed.git@master + - 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 From a1924ca8bc5a95b85a9e46e47ded696666f41c72 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Mon, 8 Mar 2021 21:42:23 -0500 Subject: [PATCH 3/4] fix missing git branch name updates --- ci/benchmark/build.sh | 8 ++++---- conda/recipes/dask-cudf/run_test.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index a9398f4527c..8dd133c8fa3 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -75,10 +75,10 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # conda install "your-pkg=1.0.0" # Install the master version of dask, distributed, and streamz -logger "pip install git+https://github.com/dask/distributed.git@master --upgrade --no-deps" -pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@master --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@master" --upgrade --no-deps +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/python-streamz/streamz.git --upgrade --no-deps" pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps diff --git a/conda/recipes/dask-cudf/run_test.sh b/conda/recipes/dask-cudf/run_test.sh index 0fc29d42721..3fc1182b33b 100644 --- a/conda/recipes/dask-cudf/run_test.sh +++ b/conda/recipes/dask-cudf/run_test.sh @@ -9,11 +9,11 @@ function logger() { } # Install the latest version of dask and distributed -logger "pip install git+https://github.com/dask/distributed.git@master --upgrade --no-deps" -pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps +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@master --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@master" --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" From fc8d3408f134c5353fa8c1eba44e7a18b0e5b208 Mon Sep 17 00:00:00 2001 From: Keith Kraus Date: Fri, 12 Mar 2021 12:38:27 -0500 Subject: [PATCH 4/4] fix fsspec imports --- python/dask_cudf/dask_cudf/io/orc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/dask_cudf/dask_cudf/io/orc.py b/python/dask_cudf/dask_cudf/io/orc.py index e96219fd23e..5b0d19b737b 100644 --- a/python/dask_cudf/dask_cudf/io/orc.py +++ b/python/dask_cudf/dask_cudf/io/orc.py @@ -2,11 +2,12 @@ from io import BufferedWriter, IOBase +from fsspec.core import get_fs_token_paths +from fsspec.utils import stringify_path from pyarrow import orc as orc from dask import dataframe as dd from dask.base import tokenize -from dask.bytes.core import get_fs_token_paths, stringify_path from dask.dataframe.io.utils import _get_pyarrow_dtypes import cudf