Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IO statistics cleanup #8191

Merged
merged 13 commits into from
May 26, 2021
Merged

IO statistics cleanup #8191

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5fbff9e
Initial commit
kaatish May 7, 2021
001d7b2
Rename files
kaatish May 7, 2021
13a458c
Add timestamp and duration type conversion
kaatish May 8, 2021
ff249dc
Fix block reduce in gather statistics
kaatish May 10, 2021
6ba82e9
Merge branch 'branch-0.20' of https://github.com/rapidsai/cudf into i…
kaatish May 10, 2021
b825eb6
Style fix
kaatish May 10, 2021
1f821a4
PR review fixes
kaatish May 12, 2021
53b13f4
Added documentation and addresses reviews
kaatish May 14, 2021
96359ab
PR comment fixes
kaatish May 19, 2021
1d5e2b3
Merge branch 'branch-21.06' of https://github.com/rapidsai/cudf into …
kaatish May 21, 2021
16a9868
Added test for timedelta types
kaatish May 24, 2021
c59aa42
Style fix
kaatish May 24, 2021
698dfad
PR review fix
kaatish May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ add_library(cudf
src/io/parquet/parquet.cpp
src/io/parquet/reader_impl.cu
src/io/parquet/writer_impl.cu
src/io/statistics/column_stats.cu
src/io/utilities/column_buffer.cpp
src/io/utilities/data_sink.cpp
src/io/utilities/datasource.cpp
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/io/orc/orc_gpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "timezone.cuh"

#include <io/comp/gpuinflate.h>
#include <io/statistics/column_stats.h>
#include <io/statistics/statistics.cuh>
#include <cudf/table/table_device_view.cuh>
#include <cudf/types.hpp>
#include <cudf/utilities/span.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/io/orc/stats_enc.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ __global__ void __launch_bounds__(encode_threads_per_block)
// }
if (s->chunk.has_sum) { // Sum is equal to the number of 'true' values
cur[0] = 5 * 8 + PB_TYPE_FIXEDLEN;
cur = pb_put_packed_uint(cur + 2, 1, s->chunk.sum.i_val);
cur = pb_put_packed_uint(cur + 2, 1, s->chunk.sum.u_val);
kaatish marked this conversation as resolved.
Show resolved Hide resolved
fld_start[1] = cur - (fld_start + 2);
}
break;
Expand Down
27 changes: 15 additions & 12 deletions cpp/src/io/orc/writer_impl.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "writer_impl.hpp"

#include <io/statistics/column_stats.cuh>
#include <io/utilities/column_utils.cuh>

#include <cudf/null_mask.hpp>
Expand Down Expand Up @@ -798,18 +799,20 @@ std::vector<std::vector<uint8_t>> writer::impl::gather_statistic_blobs(
row_index_stride_,
stream);

GatherColumnStatistics(stat_chunks.data(), stat_groups.data(), num_chunks, stream);
MergeColumnStatistics(stat_chunks.data() + num_chunks,
stat_chunks.data(),
stat_merge.device_ptr(),
stripe_bounds.size() * columns.size(),
stream);

MergeColumnStatistics(stat_chunks.data() + num_chunks + stripe_bounds.size() * columns.size(),
stat_chunks.data() + num_chunks,
stat_merge.device_ptr(stripe_bounds.size() * columns.size()),
columns.size(),
stream);
detail::GatherColumnStatistics<detail::io_type::ORC>(
stat_chunks.data(), stat_groups.data(), num_chunks, stream);
detail::MergeColumnStatistics<detail::io_type::ORC>(stat_chunks.data() + num_chunks,
stat_chunks.data(),
stat_merge.device_ptr(),
stripe_bounds.size() * columns.size(),
stream);

detail::MergeColumnStatistics<detail::io_type::ORC>(
stat_chunks.data() + num_chunks + stripe_bounds.size() * columns.size(),
stat_chunks.data() + num_chunks,
stat_merge.device_ptr(stripe_bounds.size() * columns.size()),
columns.size(),
stream);
gpu::orc_init_statistics_buffersize(
stat_merge.device_ptr(), stat_chunks.data() + num_chunks, num_stat_blobs, stream);
stat_merge.device_to_host(stream, true);
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/io/parquet/parquet_gpu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "io/comp/gpuinflate.h"
#include "io/parquet/parquet_common.hpp"
#include "io/statistics/column_stats.h"
#include "io/statistics/statistics.cuh"
#include "io/utilities/column_buffer.hpp"
#include "io/utilities/hostdevice_vector.hpp"

Expand Down
17 changes: 10 additions & 7 deletions cpp/src/io/parquet/writer_impl.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* @brief cuDF-IO parquet writer class implementation
*/

#include <io/statistics/column_stats.cuh>
#include "writer_impl.hpp"

#include <io/utilities/column_utils.cuh>
Expand Down Expand Up @@ -738,7 +739,7 @@ void writer::impl::gather_fragment_statistics(
device_2dspan<statistics_group>(frag_stats_group.data(), num_columns, num_fragments);

gpu::InitFragmentStatistics(frag_stats_group_2dview, frag, col_desc, stream);
GatherColumnStatistics(
detail::GatherColumnStatistics<detail::io_type::PARQUET>(
frag_stats_chunk.data(), frag_stats_group.data(), num_fragments * num_columns, stream);
stream.synchronize();
}
Expand Down Expand Up @@ -780,13 +781,15 @@ void writer::impl::init_encoder_pages(hostdevice_2dvector<gpu::EncColumnChunk> &
(num_stats_bfr > num_pages) ? page_stats_mrg.data() + num_pages : nullptr,
stream);
if (num_stats_bfr > 0) {
MergeColumnStatistics(page_stats, frag_stats, page_stats_mrg.data(), num_pages, stream);
detail::MergeColumnStatistics<detail::io_type::PARQUET>(
page_stats, frag_stats, page_stats_mrg.data(), num_pages, stream);
if (num_stats_bfr > num_pages) {
MergeColumnStatistics(page_stats + num_pages,
page_stats,
page_stats_mrg.data() + num_pages,
num_stats_bfr - num_pages,
stream);
detail::MergeColumnStatistics<detail::io_type::PARQUET>(
page_stats + num_pages,
page_stats,
page_stats_mrg.data() + num_pages,
num_stats_bfr - num_pages,
stream);
}
}
stream.synchronize();
Expand Down
Loading