Skip to content

Commit

Permalink
Format.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrhemstad committed Mar 25, 2021
1 parent 1453153 commit f99318e
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 15 deletions.
1 change: 0 additions & 1 deletion cpp/include/cudf/column/column_view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cudf/types.hpp>
#include <cudf/utilities/traits.hpp>


#include <vector>

/**
Expand Down
3 changes: 0 additions & 3 deletions cpp/include/cudf/detail/gather.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ struct column_gatherer_impl<list_view> {
}
};


/**
* @brief Column gather specialization for dictionary column type.
*/
Expand Down Expand Up @@ -487,7 +486,6 @@ struct column_gatherer_impl<struct_view> {
}
};


/**
* @brief Function object for applying a transformation on the gathermap
* that converts negative indices to positive indices
Expand Down Expand Up @@ -600,7 +598,6 @@ void gather_bitmask(table_view const& source,
}
}


/**
* @brief Gathers the specified rows of a set of columns according to a gather map.
*
Expand Down
9 changes: 2 additions & 7 deletions cpp/include/cudf/detail/scatter.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,11 @@ auto scatter_to_gather(MapIterator scatter_map_begin,

template <typename Element, typename Enable = void>
struct column_scatterer_impl {
std::unique_ptr<column> operator()(...) const
{
CUDF_FAIL("Unsupported type for scatter.");
}
std::unique_ptr<column> operator()(...) const { CUDF_FAIL("Unsupported type for scatter."); }
};

template <typename Element>
struct column_scatterer_impl<Element, std::enable_if_t<cudf::is_fixed_width<Element>()> >{

struct column_scatterer_impl<Element, std::enable_if_t<cudf::is_fixed_width<Element>()>> {
template <typename MapIterator>
std::unique_ptr<column> operator()(column_view const& source,
MapIterator scatter_map_begin,
Expand Down Expand Up @@ -145,7 +141,6 @@ struct column_scatterer_impl<list_view> {
}
};


template <>
struct column_scatterer_impl<dictionary32> {
template <typename MapIterator>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/interop/dlpack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
namespace cudf {
namespace {
struct get_column_data_impl {

template <typename T, std::enable_if_t<not is_rep_layout_compatible<T>()>* = nullptr>
void const* operator()(column_view const& col)
{
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/interop/from_arrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ struct dispatch_to_cudf_column {
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
CUDF_FAIL("Unsupported type in from_arrow.");
CUDF_FAIL("Unsupported type in from_arrow.");
}

template <typename T, std::enable_if_t<is_rep_layout_compatible<T>()>* = nullptr>
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/jit/type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ struct get_data_ptr_functor {

// TODO: both the failing operators can be combined into single template
template <typename T>
std::enable_if_t<not is_rep_layout_compatible<T>(), const void*> operator()(column_view const& view)
std::enable_if_t<not is_rep_layout_compatible<T>(), const void*> operator()(
column_view const& view)
{
CUDF_FAIL("Invalid data type for JIT operation");
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/merge/merge.cu
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ struct column_merger {
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource()) const
{
CUDF_FAIL("Unsupported type for merge.");
CUDF_FAIL("Unsupported type for merge.");
}

// column merger operator;
Expand Down

0 comments on commit f99318e

Please sign in to comment.