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.

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

fix gcc 11 compilation errors #10067

Merged
merged 5 commits into from
Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 1 addition & 0 deletions cpp/benchmarks/common/generate_benchmark_input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include <future>
#include <memory>
#include <optional>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for finding this benchmark issue, I have updated #10044 to address this as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.

#include <random>
#include <thread>
#include <vector>
Expand Down
2 changes: 2 additions & 0 deletions cpp/include/cudf/strings/repeat_strings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include <cudf/scalar/scalar.hpp>
#include <cudf/strings/strings_column_view.hpp>

#include <optional>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The <optional> include is being addressed in #10044

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.


namespace cudf {
namespace strings {
/**
Expand Down
2 changes: 2 additions & 0 deletions cpp/include/cudf/strings/replace_re.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <cudf/strings/regex/flags.hpp>
#include <cudf/strings/strings_column_view.hpp>

#include <optional>

namespace cudf {
namespace strings {
/**
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/io/orc/aggregate_orc_metadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ std::vector<metadata::stripe_source_mapping> aggregate_orc_metadata::select_stri

// Coalesce stripe info at the source file later since that makes downstream processing much
// easier in impl::read
for (const size_t& stripe_idx : user_specified_stripes[src_file_idx]) {
for (const size_t stripe_idx : user_specified_stripes[src_file_idx]) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#10045 already addresses this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.

CUDF_EXPECTS(stripe_idx < per_file_metadata[src_file_idx].ff.stripes.size(),
"Invalid stripe index");
stripe_infos.push_back(
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/io/utilities/trie.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include <cudf/utilities/span.hpp>

#include <optional>

namespace cudf {
namespace detail {
static constexpr char trie_terminating_character = '\n';
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/native/src/CompiledExpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class jni_serialized_ast {
check_for_eof(sizeof(T));
jlowe marked this conversation as resolved.
Show resolved Hide resolved
// use memcpy since data may be misaligned
T result;
memcpy(&result, data_ptr, sizeof(T));
memcpy(reinterpret_cast<jbyte *>(&result), data_ptr, sizeof(T));
data_ptr += sizeof(T);
return result;
}
Expand Down