Skip to content

Commit

Permalink
Correct style issue found by CI
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmaynard committed Jul 9, 2024
1 parent 35fdb3b commit 322de17
Show file tree
Hide file tree
Showing 99 changed files with 277 additions and 239 deletions.
2 changes: 1 addition & 1 deletion cpp/include/cudf/aggregation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -771,4 +771,4 @@ template <typename Base>
std::unique_ptr<Base> make_merge_tdigest_aggregation(int max_centroids = 1000);

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/ast/detail/expression_transformer.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*
* Copyright (c) 2023, NVIDIA CORPORATION.
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -65,4 +65,4 @@ class expression_transformer {

} // namespace ast::detail

} // namespace CUDF_EXPORT cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/binaryop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ std::pair<rmm::device_buffer, size_type> scalar_col_valid_mask_and(
} // namespace binops

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf

namespace cudf::binops::compiled::detail {

Expand Down
9 changes: 4 additions & 5 deletions cpp/include/cudf/column/column_device_view.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -1497,11 +1497,10 @@ struct mutable_value_accessor {
* @return The device pointer to be used for the d_children member of the given column
*/
template <typename ColumnDeviceView, typename ColumnViewIterator>
CUDF_HIDDEN
ColumnDeviceView* child_columns_to_device_array(ColumnViewIterator child_begin,
ColumnViewIterator child_end,
void* h_ptr,
void* d_ptr)
CUDF_HIDDEN ColumnDeviceView* child_columns_to_device_array(ColumnViewIterator child_begin,
ColumnViewIterator child_end,
void* h_ptr,
void* d_ptr)
{
ColumnDeviceView* d_children = detail::align_ptr_for_type<ColumnDeviceView>(d_ptr);
auto num_children = std::distance(child_begin, child_end);
Expand Down
7 changes: 3 additions & 4 deletions cpp/include/cudf/column/column_view.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -283,8 +283,7 @@ class column_view_base {
size_type offset = 0);
};

class mutable_column_view_base : public column_view_base {
};
class mutable_column_view_base : public column_view_base {};

} // namespace cudf::detail

Expand Down Expand Up @@ -767,4 +766,4 @@ std::size_t shallow_hash(column_view const& input);
bool is_shallow_equivalent(column_view const& lhs, column_view const& rhs);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/concatenate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ std::unique_ptr<table> concatenate(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/contiguous_split.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,4 @@ table_view unpack(packed_columns const& input);
table_view unpack(uint8_t const* metadata, uint8_t const* gpu_data);

/** @} */
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/copying.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -973,4 +973,4 @@ std::unique_ptr<column> purge_nonempty_nulls(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/datetime.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,4 @@ std::unique_ptr<cudf::column> round_datetimes(
/** @} */ // end of group

} // namespace datetime
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/gather.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ std::unique_ptr<table> gather(table_view const& source_table,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/is_element_valid.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ bool is_element_valid_sync(column_view const& col_view,
rmm::cuda_stream_view stream);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/utilities/default_stream.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, NVIDIA CORPORATION.
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,4 +35,4 @@ extern rmm::cuda_stream_view const default_stream_value;

} // namespace detail

} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/utilities/stacktrace.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ std::string get_stacktrace(capture_last_stackframe capture_last_frame);
/** @} */ // end of group

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/utilities/stream_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ cuda_stream_pool& global_cuda_stream_pool();
void join_streams(host_span<rmm::cuda_stream_view const> streams, rmm::cuda_stream_view stream);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/dictionary/detail/search.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ std::unique_ptr<scalar> get_insert_index(dictionary_column_view const& dictionar

} // namespace detail
} // namespace dictionary
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/dictionary/dictionary_column_view.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2022, NVIDIA CORPORATION.
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/filling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,4 @@ std::unique_ptr<cudf::column> calendrical_month_sequence(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/groupby.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,4 +421,4 @@ class groupby {
};
/** @} */
} // namespace groupby
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/hashing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,4 @@ std::unique_ptr<column> xxhash_64(
} // namespace hashing

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/interop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -586,4 +586,4 @@ unique_column_view_t from_arrow_device_column(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/arrow_io_source.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ class arrow_io_source : public datasource {

/** @} */ // end of group
} // namespace io
} // namespace cudf
} // namespace CUDF_EXPORT cudf
1 change: 0 additions & 1 deletion cpp/include/cudf/io/detail/avro.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@ table_with_metadata read_avro(std::unique_ptr<cudf::io::datasource>&& source,
rmm::cuda_stream_view stream,
rmm::device_async_resource_ref mr);


} // namespace io::detail::avro
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/detail/orc.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
12 changes: 4 additions & 8 deletions cpp/include/cudf/io/detail/tokenize_json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
#include <rmm/device_uvector.hpp>
#include <rmm/resource_ref.hpp>

namespace CUDF_EXPORT cudf {
namespace io::json {
namespace cudf::io::json {

/// Type used to represent the atomic symbol type used within the finite-state machine
using SymbolT = char;
Expand Down Expand Up @@ -119,7 +118,7 @@ enum token_t : PdaTokenT {
NUM_TOKENS
};

namespace detail {
namespace CUDF_EXPORT detail {

/**
* @brief Parses the given JSON string and emits a sequence of tokens that demarcate relevant
Expand All @@ -138,9 +137,6 @@ std::pair<rmm::device_uvector<PdaTokenT>, rmm::device_uvector<SymbolOffsetT>> ge
rmm::cuda_stream_view stream,
rmm::device_async_resource_ref mr);

} // namespace detail

} // namespace io::json

} // namespace CUDF_EXPORT cudf
} // namespace CUDF_EXPORT detail

} // namespace cudf::io::json
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/orc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1465,4 +1465,4 @@ class orc_chunked_writer {

/** @} */ // end of group
} // namespace io
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/orc_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ enum ProtofType : uint8_t {

/** @} */ // end of group
} // namespace io::orc
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/parquet.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1407,4 +1407,4 @@ class parquet_chunked_writer {
/** @} */ // end of group

} // namespace io
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/text/data_chunk_source_factories.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ std::unique_ptr<data_chunk_source> make_source_from_bgzip_file(std::string_view
std::unique_ptr<data_chunk_source> make_source(cudf::string_scalar& data);

} // namespace io::text
} // namespace cudf
} // namespace CUDF_EXPORT cudf
13 changes: 12 additions & 1 deletion cpp/include/cudf/join.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,24 @@ enum class has_nested : bool { YES, NO };

// forward declaration
namespace hashing::detail {

/**
* @brief Forward declaration for our Murmur Hash 3 implementation
*/
template <typename T>
class MurmurHash3_x86_32;
} // namespace hashing::detail
namespace detail {

/**
* @brief Forward declaration for our hash join
*/
template <typename T>
class hash_join;

/**
* @brief Forward declaration for our distinct hash join
*/
template <cudf::has_nested HasNested>
class distinct_hash_join;
} // namespace detail
Expand Down Expand Up @@ -1180,4 +1191,4 @@ std::size_t conditional_left_anti_join_size(
ast::expression const& binary_predicate,
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());
/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
10 changes: 5 additions & 5 deletions cpp/include/cudf/lists/detail/scatter.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@ std::unique_ptr<column> scatter(scalar const& slr,
auto const num_rows = target.size();
if (num_rows == 0) { return cudf::empty_like(target); }

auto lv = static_cast<list_scalar const*>(&slr);
bool slr_valid = slr.is_valid(stream);
rmm::device_buffer null_mask =
slr_valid ? cudf::create_null_mask(1, mask_state::UNALLOCATED, stream, mr)
: cudf::create_null_mask(1, mask_state::ALL_NULL, stream, mr);
auto lv = static_cast<list_scalar const*>(&slr);
bool slr_valid = slr.is_valid(stream);
rmm::device_buffer null_mask = slr_valid
? cudf::create_null_mask(1, mask_state::UNALLOCATED, stream, mr)
: cudf::create_null_mask(1, mask_state::ALL_NULL, stream, mr);
auto offset_column =
make_numeric_column(data_type{type_to_id<size_type>()}, 2, mask_state::UNALLOCATED, stream, mr);
thrust::sequence(rmm::exec_policy_nosync(stream),
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/lists/filling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ std::unique_ptr<column> sequences(

/** @} */ // end of group
} // namespace lists
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/lists/reverse.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ std::unique_ptr<column> reverse(
/** @} */ // end of doxygen group

} // namespace lists
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/lists/set_operations.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ std::unique_ptr<column> difference_distinct(

/** @} */ // end of group
} // namespace lists
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/lists/stream_compaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ std::unique_ptr<column> distinct(
/** @} */ // end of group

} // namespace lists
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/merge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ std::unique_ptr<cudf::table> merge(
rmm::cuda_stream_view stream = cudf::get_default_stream(),
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());
/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/null_mask.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ cudf::size_type null_count(bitmask_type const* bitmask,
size_type stop,
rmm::cuda_stream_view stream = cudf::get_default_stream());
/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/partitioning.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,4 @@ std::pair<std::unique_ptr<cudf::table>, std::vector<cudf::size_type>> round_robi
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/quantiles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ std::unique_ptr<column> percentile_approx(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/reduction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,4 @@ std::pair<std::unique_ptr<scalar>, std::unique_ptr<scalar>> minmax(

/** @} */ // end of group

} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/replace.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,4 +309,4 @@ void normalize_nans_and_zeros(mutable_column_view& in_out,
rmm::cuda_stream_view stream = cudf::get_default_stream());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/reshape.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ std::unique_ptr<column> byte_cast(

/** @} */ // end of group

} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/rolling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -616,4 +616,4 @@ std::unique_ptr<column> rolling_window(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/round.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ std::unique_ptr<column> round(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/search.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ std::unique_ptr<column> contains(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/sorting.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -347,4 +347,4 @@ std::unique_ptr<table> stable_segmented_sort_by_key(
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

/** @} */ // end of group
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/stream_compaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,4 @@ cudf::size_type distinct_count(table_view const& input,
null_equality nulls_equal = null_equality::EQUAL);

/** @} */
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/strings/detail/merge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <rmm/cuda_stream_view.hpp>

namespace cudf ::strings ::detail {
namespace cudf::strings::detail {
/**
* @brief Merges two strings columns
*
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/timezone.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ std::unique_ptr<table> make_timezone_transition_table(
std::string_view timezone_name,
rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource());

} // namespace cudf
} // namespace CUDF_EXPORT cudf
Loading

0 comments on commit 322de17

Please sign in to comment.