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

Jump to bottom

Accept r-value references in convert_table_for_return(): #10131

Merged
merged 6 commits into from
Jan 27, 2022
Merged

Accept r-value references in convert_table_for_return(): #10131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c8b172
Accept r-value references in convert_table_for_return():
mythrocks Jan 26, 2022
99a9419
Simplify code in *partition()
mythrocks Jan 26, 2022
d0d3aa7
Finished with TableJni.cpp
mythrocks Jan 26, 2022
28d26df
Const all the things.
mythrocks Jan 26, 2022
bb7ffd5
Merge remote-tracking branch 'origin/branch-22.04' into jni-followup-…
mythrocks Jan 27, 2022
c5340c2
Formatting.
mythrocks Jan 27, 2022
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
4 changes: 2 additions & 2 deletions java/src/main/native/include/jni_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ template <typename T> class native_jpointerArray {

T **data() { return reinterpret_cast<T **>(wrapped.data()); }

T const *begin() const { return data(); }
T const *end() const { return data() + size(); }
T *const *begin() const { return data(); }
T *const *end() const { return data() + size(); }

const jlongArray get_jArray() const { return wrapped.get_jArray(); }

Expand Down
17 changes: 7 additions & 10 deletions java/src/main/native/src/TableJni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2997,8 +2997,8 @@ JNIEXPORT jlongArray JNICALL Java_ai_rapids_cudf_Table_filter(JNIEnv *env, jclas
JNI_NULL_CHECK(env, mask_jcol, "mask column is null", 0);
try {
cudf::jni::auto_set_device(env);
cudf::table_view *input = reinterpret_cast<cudf::table_view *>(input_jtable);
cudf::column_view *mask = reinterpret_cast<cudf::column_view *>(mask_jcol);
auto input = reinterpret_cast<cudf::table_view *>(input_jtable);
auto mask = reinterpret_cast<cudf::column_view *>(mask_jcol);
mythrocks marked this conversation as resolved.
Show resolved Hide resolved
return convert_table_for_return(env, cudf::apply_boolean_mask(*input, *mask));
}
CATCH_STD(env, 0);
Expand Down Expand Up @@ -3075,8 +3075,7 @@ JNIEXPORT jlongArray JNICALL Java_ai_rapids_cudf_Table_scatterTable(JNIEnv *env,
auto const input = reinterpret_cast<cudf::table_view const *>(j_input);
auto const map = reinterpret_cast<cudf::column_view const *>(j_map);
auto const target = reinterpret_cast<cudf::table_view const *>(j_target);
auto result = cudf::scatter(*input, *map, *target, check_bounds);
return convert_table_for_return(env, result);
return convert_table_for_return(env, cudf::scatter(*input, *map, *target, check_bounds));
}
CATCH_STD(env, 0);
}
Expand All @@ -3092,13 +3091,11 @@ JNIEXPORT jlongArray JNICALL Java_ai_rapids_cudf_Table_scatterScalars(JNIEnv *en
cudf::jni::auto_set_device(env);
auto const scalars_array = cudf::jni::native_jpointerArray<cudf::scalar>(env, j_input);
std::vector<std::reference_wrapper<cudf::scalar const>> input;
for (int i = 0; i < scalars_array.size(); ++i) {
input.emplace_back(*scalars_array[i]);
}
std::transform(scalars_array.begin(), scalars_array.end(), std::back_inserter(input),
[](auto &scalar) { return std::ref(*scalar); });
auto const map = reinterpret_cast<cudf::column_view const *>(j_map);
auto const target = reinterpret_cast<cudf::table_view const *>(j_target);
auto result = cudf::scatter(input, *map, *target, check_bounds);
return convert_table_for_return(env, result);
return convert_table_for_return(env, cudf::scatter(input, *map, *target, check_bounds));
}
CATCH_STD(env, 0);
}
Expand Down Expand Up @@ -3577,7 +3574,7 @@ JNIEXPORT jlongArray JNICALL Java_ai_rapids_cudf_Table_sample(JNIEnv *env, jclas
JNI_NULL_CHECK(env, j_input, "input table is null", 0);
try {
cudf::jni::auto_set_device(env);
cudf::table_view *input = reinterpret_cast<cudf::table_view *>(j_input);
auto input = reinterpret_cast<cudf::table_view *>(j_input);
mythrocks marked this conversation as resolved.
Show resolved Hide resolved
auto sample_with_replacement =
replacement ? cudf::sample_with_replacement::TRUE : cudf::sample_with_replacement::FALSE;
return convert_table_for_return(env, cudf::sample(*input, n, sample_with_replacement, seed));
Expand Down