Skip to content

Commit

Permalink
Remove debug prints
Browse files Browse the repository at this point in the history
  • Loading branch information
vyasr committed Jun 13, 2024
1 parent 9ac49e3 commit 311140a
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 23 deletions.
7 changes: 0 additions & 7 deletions cpp/src/join/hash_join.cu
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ probe_join_hash_table(
auto const probe_join_type =
(join == cudf::detail::join_kind::FULL_JOIN) ? cudf::detail::join_kind::LEFT_JOIN : join;

fprintf(stderr, "Size calculation\n");
std::size_t const join_size = output_size ? *output_size
: compute_join_output_size(build_table,
probe_table,
Expand Down Expand Up @@ -228,7 +227,6 @@ probe_join_hash_table(
right_indices->resize(actual_size, stream);
}
} else {
fprintf(stderr, "Retrieving pairs\n");
hash_table.pair_retrieve(iter,
iter + probe_table_num_rows,
out1_zip_begin,
Expand All @@ -243,7 +241,6 @@ probe_join_hash_table(
comparator_helper(device_comparator);
} else {
auto const device_comparator = row_comparator.equal_to<false>(probe_nulls, compare_nulls);
fprintf(stderr, "Calling comparator helper\n");
comparator_helper(device_comparator);
}

Expand Down Expand Up @@ -391,10 +388,8 @@ hash_join<Hasher>::hash_join(cudf::table_view const& build,

if (_is_empty) { return; }

fprintf(stderr, "Bitmask\n");
auto const row_bitmask =
cudf::detail::bitmask_and(build, stream, rmm::mr::get_current_device_resource()).first;
fprintf(stderr, "Building hash table\n");
cudf::detail::build_join_hash_table(_build,
_preprocessed_build,
_hash_table,
Expand Down Expand Up @@ -540,7 +535,6 @@ hash_join<Hasher>::probe_join_indices(cudf::table_view const& probe_table,

auto const preprocessed_probe =
cudf::experimental::row::equality::preprocessed_table::create(probe_table, stream);
fprintf(stderr, "Detail probe join\n");
auto join_indices = cudf::detail::probe_join_hash_table(_build,
probe_table,
_preprocessed_build,
Expand Down Expand Up @@ -587,7 +581,6 @@ hash_join<Hasher>::compute_hash_join(cudf::table_view const& probe,
"Mismatch in joining column data types",
cudf::data_type_error);

fprintf(stderr, "About to probe\n");
return probe_join_indices(probe, join, output_size, stream, mr);
}
} // namespace detail
Expand Down
4 changes: 0 additions & 4 deletions cpp/src/join/join.cu
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ inner_join(table_view const& left_input,
rmm::cuda_stream_view stream,
rmm::device_async_resource_ref mr)
{
fprintf(stderr, "libcudf inner_join\n");
// Make sure any dictionary columns have matched key sets.
// This will return any new dictionary columns created as well as updated table_views.
auto matched = cudf::dictionary::detail::match_dictionaries(
Expand All @@ -45,7 +44,6 @@ inner_join(table_view const& left_input,
rmm::mr::get_current_device_resource()); // temporary objects returned

// now rebuild the table views with the updated ones
fprintf(stderr, "Setup\n");
auto const left = matched.second.front();
auto const right = matched.second.back();
auto const has_nulls = cudf::has_nested_nulls(left) || cudf::has_nested_nulls(right)
Expand All @@ -60,9 +58,7 @@ inner_join(table_view const& left_input,
auto [right_result, left_result] = hj_obj.inner_join(right, std::nullopt, stream, mr);
return std::pair(std::move(left_result), std::move(right_result));
} else {
fprintf(stderr, "Create hash join\n");
cudf::hash_join hj_obj(right, has_nulls, compare_nulls, stream);
fprintf(stderr, "Run inner join\n");
return hj_obj.inner_join(left, std::nullopt, stream, mr);
}
}
Expand Down
6 changes: 0 additions & 6 deletions cpp/src/table/row_operators.cu
Original file line number Diff line number Diff line change
Expand Up @@ -848,21 +848,15 @@ namespace equality {
std::shared_ptr<preprocessed_table> preprocessed_table::create(table_view const& t,
rmm::cuda_stream_view stream)
{
fprintf(stderr, "preprocessed_table::create\n");
check_eq_compatibility(t);

fprintf(stderr, "preprocessed_table::create: check_eq_compatibility\n");
auto [null_pushed_table, nullable_data] =
structs::detail::push_down_nulls(t, stream, rmm::mr::get_current_device_resource());
fprintf(stderr, "preprocessed_table::create: push_down_nulls\n");
auto struct_offset_removed_table = remove_struct_child_offsets(null_pushed_table);
fprintf(stderr, "preprocessed_table::create: remove_struct_child_offsets\n");
auto verticalized_t =
std::get<0>(decompose_structs(struct_offset_removed_table, decompose_lists_column::YES));

fprintf(stderr, "preprocessed_table::create: decompose_structs\n");
auto d_t = table_device_view_owner(table_device_view::create(verticalized_t, stream));
fprintf(stderr, "preprocessed_table::create: table_device_view_owner\n");
return std::shared_ptr<preprocessed_table>(new preprocessed_table(
std::move(d_t), std::move(nullable_data.new_null_masks), std::move(nullable_data.new_columns)));
}
Expand Down
6 changes: 0 additions & 6 deletions python/cudf/cudf/core/join/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,11 @@ def __init__(
def _gather_maps(self, left_cols, right_cols):
# Produce gather maps for the join, optionally reordering to
# match pandas-order in compat mode.
print("Calling libcudf joiner")
maps = self._joiner(
left_cols,
right_cols,
how=self.how,
)
print(f"{self.preserve_key_order=}")
if not self.preserve_key_order:
return maps
# We should only get here if we're in a join on which
Expand All @@ -230,7 +228,6 @@ def _gather_maps(self, left_cols, right_cols):
# To reorder maps so that they are in order of the input
# tables, we gather from iota on both right and left, and then
# sort the gather maps with those two columns as key.
print("Calling libcudf gather")
key_order = list(
itertools.chain.from_iterable(
libcudf.copying.gather(
Expand All @@ -245,7 +242,6 @@ def _gather_maps(self, left_cols, right_cols):
for map_, n, null in zip(maps, lengths, nullify)
)
)
print("Calling libcudf sort")
return libcudf.sort.sort_by_key(
list(maps),
# If how is right, right map is primary sort key.
Expand Down Expand Up @@ -285,7 +281,6 @@ def perform_merge(self) -> cudf.DataFrame:
gather_kwargs = {
"keep_index": self._using_left_index or self._using_right_index,
}
print("Calling lhs gather")
left_result = (
self.lhs._gather(
GatherMap.from_column_unchecked(
Expand All @@ -297,7 +292,6 @@ def perform_merge(self) -> cudf.DataFrame:
else cudf.DataFrame._from_data({})
)
del left_rows
print("Calling rhs gather")
right_result = (
self.rhs._gather(
GatherMap.from_column_unchecked(
Expand Down

0 comments on commit 311140a

Please sign in to comment.