Skip to content

Commit e4500a6

Browse files
galipremsagargalipremsagar
committed
Merge remote-tracking branch 'upstream/branch-23.06' into pandas_2.0_feature_branch
2 parents 00f61cd + 7bbd5ee commit e4500a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+772
-487
lines changed

‎.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
31+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@py-39
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
40+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@py-39
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06
49+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@py-39
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -57,7 +57,7 @@ jobs:
5757
if: github.ref_type == 'branch' && github.event_name == 'push'
5858
needs: python-build
5959
secrets: inherit
60-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
60+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
6161
with:
6262
build_type: branch
6363
node_type: "gpu-v100-latest-1"
@@ -66,7 +66,7 @@ jobs:
6666
run_script: "ci/build_docs.sh"
6767
wheel-build-cudf:
6868
secrets: inherit
69-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
69+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@py-39
7070
with:
7171
build_type: ${{ inputs.build_type || 'branch' }}
7272
branch: ${{ inputs.branch }}
@@ -78,7 +78,7 @@ jobs:
7878
wheel-publish-cudf:
7979
needs: wheel-build-cudf
8080
secrets: inherit
81-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
81+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@py-39
8282
with:
8383
build_type: ${{ inputs.build_type || 'branch' }}
8484
branch: ${{ inputs.branch }}
@@ -88,7 +88,7 @@ jobs:
8888
wheel-build-dask-cudf:
8989
needs: wheel-publish-cudf
9090
secrets: inherit
91-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.06
91+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@py-39
9292
with:
9393
build_type: ${{ inputs.build_type || 'branch' }}
9494
branch: ${{ inputs.branch }}
@@ -99,7 +99,7 @@ jobs:
9999
wheel-publish-dask-cudf:
100100
needs: wheel-build-dask-cudf
101101
secrets: inherit
102-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@branch-23.06
102+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@py-39
103103
with:
104104
build_type: ${{ inputs.build_type || 'branch' }}
105105
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,49 @@ jobs:
2626
- wheel-build-dask-cudf
2727
- wheel-tests-dask-cudf
2828
secrets: inherit
29-
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.06
29+
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@py-39
3030
checks:
3131
secrets: inherit
32-
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.06
32+
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@py-39
3333
with:
3434
enable_check_generated_files: false
3535
conda-cpp-build:
3636
needs: checks
3737
secrets: inherit
38-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
38+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@py-39
3939
with:
4040
build_type: pull-request
4141
conda-cpp-tests:
4242
needs: conda-cpp-build
4343
secrets: inherit
44-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.06
44+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@py-39
4545
with:
4646
build_type: pull-request
4747
conda-python-build:
4848
needs: conda-cpp-build
4949
secrets: inherit
50-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
50+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@py-39
5151
with:
5252
build_type: pull-request
5353
conda-python-cudf-tests:
5454
needs: conda-python-build
5555
secrets: inherit
56-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
56+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@py-39
5757
with:
5858
build_type: pull-request
5959
test_script: "ci/test_python_cudf.sh"
6060
conda-python-other-tests:
6161
# Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
6262
needs: conda-python-build
6363
secrets: inherit
64-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
64+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@py-39
6565
with:
6666
build_type: pull-request
6767
test_script: "ci/test_python_other.sh"
6868
conda-java-tests:
6969
needs: conda-cpp-build
7070
secrets: inherit
71-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
71+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
7272
with:
7373
build_type: pull-request
7474
node_type: "gpu-v100-latest-1"
@@ -78,7 +78,7 @@ jobs:
7878
conda-notebook-tests:
7979
needs: conda-python-build
8080
secrets: inherit
81-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
81+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
8282
with:
8383
build_type: pull-request
8484
node_type: "gpu-v100-latest-1"
@@ -88,7 +88,7 @@ jobs:
8888
docs-build:
8989
needs: conda-python-build
9090
secrets: inherit
91-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
91+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
9292
with:
9393
build_type: pull-request
9494
node_type: "gpu-v100-latest-1"
@@ -98,7 +98,7 @@ jobs:
9898
wheel-build-cudf:
9999
needs: checks
100100
secrets: inherit
101-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
101+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@py-39
102102
with:
103103
build_type: pull-request
104104
package-name: cudf
@@ -107,7 +107,7 @@ jobs:
107107
wheel-tests-cudf:
108108
needs: wheel-build-cudf
109109
secrets: inherit
110-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
110+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@py-39
111111
with:
112112
build_type: pull-request
113113
package-name: cudf
@@ -118,7 +118,7 @@ jobs:
118118
wheel-build-dask-cudf:
119119
needs: wheel-tests-cudf
120120
secrets: inherit
121-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.06
121+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@py-39
122122
with:
123123
build_type: pull-request
124124
package-name: dask_cudf
@@ -127,7 +127,7 @@ jobs:
127127
wheel-tests-dask-cudf:
128128
needs: wheel-build-dask-cudf
129129
secrets: inherit
130-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.06
130+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@py-39
131131
with:
132132
build_type: pull-request
133133
package-name: dask_cudf

‎.github/workflows/test.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ on:
1616
jobs:
1717
conda-cpp-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.06
19+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@py-39
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
2323
date: ${{ inputs.date }}
2424
sha: ${{ inputs.sha }}
2525
conda-cpp-memcheck-tests:
2626
secrets: inherit
27-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
27+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
2828
with:
2929
build_type: nightly
3030
branch: ${{ inputs.branch }}
@@ -36,7 +36,7 @@ jobs:
3636
run_script: "ci/test_cpp_memcheck.sh"
3737
conda-python-cudf-tests:
3838
secrets: inherit
39-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
39+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@py-39
4040
with:
4141
build_type: nightly
4242
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
conda-python-other-tests:
4747
# Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
4848
secrets: inherit
49-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
49+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@py-39
5050
with:
5151
build_type: nightly
5252
branch: ${{ inputs.branch }}
@@ -55,7 +55,7 @@ jobs:
5555
test_script: "ci/test_python_other.sh"
5656
conda-java-tests:
5757
secrets: inherit
58-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
58+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
5959
with:
6060
build_type: nightly
6161
branch: ${{ inputs.branch }}
@@ -67,7 +67,7 @@ jobs:
6767
run_script: "ci/test_java.sh"
6868
conda-notebook-tests:
6969
secrets: inherit
70-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
70+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@py-39
7171
with:
7272
build_type: nightly
7373
branch: ${{ inputs.branch }}
@@ -79,7 +79,7 @@ jobs:
7979
run_script: "ci/test_notebooks.sh"
8080
wheel-tests-cudf:
8181
secrets: inherit
82-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
82+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@py-39
8383
with:
8484
build_type: nightly
8585
branch: ${{ inputs.branch }}
@@ -90,7 +90,7 @@ jobs:
9090
test-unittest: "python -m pytest -n 8 ./python/cudf/cudf/tests"
9191
wheel-tests-dask-cudf:
9292
secrets: inherit
93-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.06
93+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@py-39
9494
with:
9595
build_type: nightly
9696
branch: ${{ inputs.branch }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ conda install -c rapidsai -c conda-forge -c nvidia \
7171
We also provide [nightly Conda packages](https://anaconda.org/rapidsai-nightly) built from the HEAD
7272
of our latest development branch.
7373

74-
Note: cuDF is supported only on Linux, and with Python versions 3.8 and later.
74+
Note: cuDF is supported only on Linux, and with Python versions 3.9 and later.
7575

7676
See the [Get RAPIDS version picker](https://rapids.ai/start.html) for more OS and version info.
7777

‎conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies:
6969
- pytest-xdist
7070
- python-confluent-kafka>=1.9.0,<1.10.0a0
7171
- python-snappy>=0.6.0
72-
- python>=3.8,<3.11
72+
- python>=3.9,<3.11
7373
- pytorch<1.12.0
7474
- rmm==23.6.*
7575
- s3fs>=2022.3.0

‎conda/recipes/libcudf/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ outputs:
139139
- test -f $PREFIX/include/cudf/detail/utilities/integer_utils.hpp
140140
- test -f $PREFIX/include/cudf/detail/utilities/linked_column.hpp
141141
- test -f $PREFIX/include/cudf/detail/utilities/logger.hpp
142-
- test -f $PREFIX/include/cudf/detail/utilities/pinned_allocator.hpp
142+
- test -f $PREFIX/include/cudf/detail/utilities/pinned_host_vector.hpp
143143
- test -f $PREFIX/include/cudf/detail/utilities/vector_factories.hpp
144144
- test -f $PREFIX/include/cudf/detail/utilities/visitor_overload.hpp
145145
- test -f $PREFIX/include/cudf/dictionary/detail/concatenate.hpp

‎cpp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ add_library(
514514
src/stream_compaction/stable_distinct.cu
515515
src/stream_compaction/unique.cu
516516
src/stream_compaction/unique_count.cu
517+
src/stream_compaction/unique_count_column.cu
517518
src/strings/attributes.cu
518519
src/strings/capitalize.cu
519520
src/strings/case.cu

‎cpp/benchmarks/io/text/multibyte_split.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <cudf_test/file_utilities.hpp>
2424

2525
#include <cudf/column/column_factories.hpp>
26-
#include <cudf/detail/utilities/pinned_allocator.hpp>
26+
#include <cudf/detail/utilities/pinned_host_vector.hpp>
2727
#include <cudf/detail/utilities/vector_factories.hpp>
2828
#include <cudf/io/text/data_chunk_source_factories.hpp>
2929
#include <cudf/io/text/detail/bgzip_utils.hpp>
@@ -33,7 +33,6 @@
3333
#include <cudf/types.hpp>
3434
#include <cudf/utilities/default_stream.hpp>
3535

36-
#include <thrust/host_vector.h>
3736
#include <thrust/transform.h>
3837

3938
#include <nvbench/nvbench.cuh>
@@ -136,7 +135,7 @@ static void bench_multibyte_split(nvbench::state& state,
136135
std::unique_ptr<cudf::io::datasource> datasource;
137136
auto device_input = create_random_input(file_size_approx, delim_factor, 0.05, delim);
138137
auto host_input = std::vector<char>{};
139-
auto host_pinned_input = thrust::host_vector<char, cudf::detail::pinned_allocator<char>>{};
138+
auto host_pinned_input = cudf::detail::pinned_host_vector<char>{};
140139

141140
if (source_type != data_chunk_source_type::device &&
142141
source_type != data_chunk_source_type::host_pinned) {

‎cpp/include/cudf/detail/utilities/pinned_allocator.hpp renamed to ‎cpp/include/cudf/detail/utilities/pinned_host_vector.hpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2008-2022 NVIDIA Corporation
2+
* Copyright 2008-2023 NVIDIA Corporation
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
2222

2323
#include <cudf/utilities/error.hpp>
2424

25+
#include <thrust/host_vector.h>
26+
2527
namespace cudf::detail {
2628

2729
/*! \p pinned_allocator is a CUDA-specific host memory allocator
@@ -199,4 +201,11 @@ class pinned_allocator {
199201
return !operator==(x);
200202
}
201203
};
204+
205+
/**
206+
* @brief A vector class with pinned host memory allocator
207+
*/
208+
template <typename T>
209+
using pinned_host_vector = thrust::host_vector<T, pinned_allocator<T>>;
210+
202211
} // namespace cudf::detail

‎cpp/include/cudf/io/detail/orc.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class writer {
9696
*/
9797
explicit writer(std::unique_ptr<cudf::io::data_sink> sink,
9898
orc_writer_options const& options,
99-
SingleWriteMode mode,
99+
single_write_mode mode,
100100
rmm::cuda_stream_view stream);
101101

102102
/**
@@ -109,7 +109,7 @@ class writer {
109109
*/
110110
explicit writer(std::unique_ptr<cudf::io::data_sink> sink,
111111
chunked_orc_writer_options const& options,
112-
SingleWriteMode mode,
112+
single_write_mode mode,
113113
rmm::cuda_stream_view stream);
114114

115115
/**

‎cpp/include/cudf/io/detail/parquet.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class writer {
156156
*/
157157
explicit writer(std::vector<std::unique_ptr<data_sink>> sinks,
158158
parquet_writer_options const& options,
159-
SingleWriteMode mode,
159+
single_write_mode mode,
160160
rmm::cuda_stream_view stream);
161161

162162
/**
@@ -171,7 +171,7 @@ class writer {
171171
*/
172172
explicit writer(std::vector<std::unique_ptr<data_sink>> sinks,
173173
chunked_parquet_writer_options const& options,
174-
SingleWriteMode mode,
174+
single_write_mode mode,
175175
rmm::cuda_stream_view stream);
176176

177177
/**

‎cpp/include/cudf/io/detail/utils.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ namespace detail {
2222
/**
2323
* @brief Whether writer writes in chunks or all at once
2424
*/
25-
enum class SingleWriteMode : bool { YES, NO };
25+
enum class single_write_mode : bool { YES, NO };
2626
} // namespace detail
2727
} // namespace io
2828
} // namespace cudf

0 commit comments

Comments
 (0)