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

[REVIEW] BUG fix misspelling of function calls in asserts causing debug build to fail #1166

Merged
Show file tree
Hide file tree
Changes from all commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- PR #1155 Remove RMM library dependency and CXX11 ABI handling
- PR #1158 Pass size_t* & size_t* instead of size_t[] & int[] for raft allgatherv's input parameters recvcounts & displs
- PR #1168 Disabled MG tests on single GPU
- PR #1166 Fix misspelling of function calls in asserts causing debug build to fail

# cuGraph 0.15.0 (26 Aug 2020)

Expand Down
4 changes: 2 additions & 2 deletions cpp/include/patterns/any_of_adj_matrix_row.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ namespace experimental {
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row properties
* for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param row_op Unary predicate operator that takes *(@p adj_matrix_row_value_input_first + i)
* (where i = [0, @p graph_view.get_number_of_adj_matrix_local_rows()) and returns either
* (where i = [0, @p graph_view.get_number_of_local_adj_matrix_partition_rows()) and returns either
* true or false.
* @return true If the predicate returns true at least once (in any process in multi-GPU).
* @return false If the predicate never returns true (in any process in multi-GPU).
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/patterns/copy_to_adj_matrix_col.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace experimental {
* @param adj_matrix_col_value_output_first Iterator pointing to the adjacency matrix column output
* property variables for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
*/
template <typename GraphViewType,
typename VertexValueInputIterator,
Expand All @@ -62,7 +62,7 @@ void copy_to_adj_matrix_col(raft::handle_t const& handle,
CUGRAPH_FAIL("unimplemented.");
} else {
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_cols());
graph_view.get_number_of_local_adj_matrix_partition_cols());
thrust::copy(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
vertex_value_input_first,
vertex_value_input_first + graph_view.get_number_of_local_vertices(),
Expand Down Expand Up @@ -96,7 +96,7 @@ void copy_to_adj_matrix_col(raft::handle_t const& handle,
* @param adj_matrix_col_value_output_first Iterator pointing to the adjacency matrix column output
* property variables for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
*/
template <typename GraphViewType,
typename VertexIterator,
Expand All @@ -113,7 +113,7 @@ void copy_to_adj_matrix_col(raft::handle_t const& handle,
CUGRAPH_FAIL("unimplemented.");
} else {
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_cols());
graph_view.get_number_of_local_adj_matrix_partition_cols());
auto val_first = thrust::make_permutation_iterator(vertex_value_input_first, vertex_first);
thrust::scatter(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
val_first,
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/patterns/copy_to_adj_matrix_row.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace experimental {
* @param adj_matrix_row_value_output_first Iterator pointing to the adjacency matrix row output
* property variables for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_output_last` (exclusive) is deduced as @p adj_matrix_row_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_rows().
* + @p graph_view.get_number_of_local_adj_matrix_partition_rows().
*/
template <typename GraphViewType,
typename VertexValueInputIterator,
Expand All @@ -62,7 +62,7 @@ void copy_to_adj_matrix_row(raft::handle_t const& handle,
CUGRAPH_FAIL("unimplemented.");
} else {
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_rows());
graph_view.get_number_of_local_adj_matrix_partition_rows());
thrust::copy(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
vertex_value_input_first,
vertex_value_input_first + graph_view.get_number_of_local_vertices(),
Expand Down Expand Up @@ -96,7 +96,7 @@ void copy_to_adj_matrix_row(raft::handle_t const& handle,
* @param adj_matrix_row_value_output_first Iterator pointing to the adjacency matrix row output
* property variables for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_output_last` (exclusive) is deduced as @p adj_matrix_row_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_rows().
* + @p graph_view.get_number_of_local_adj_matrix_partition_rows().
*/
template <typename GraphViewType,
typename VertexIterator,
Expand All @@ -113,7 +113,7 @@ void copy_to_adj_matrix_row(raft::handle_t const& handle,
CUGRAPH_FAIL("unimplemented.");
} else {
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_rows());
graph_view.get_number_of_local_adj_matrix_partition_rows());
auto val_first = thrust::make_permutation_iterator(vertex_value_input_first, vertex_first);
thrust::scatter(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
val_first,
Expand Down
12 changes: 6 additions & 6 deletions cpp/include/patterns/copy_v_transform_reduce_nbr.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ __global__ void for_all_major_for_all_nbr_low_out_degree(
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param adj_matrix_col_value_input_first Iterator pointing to the adjacency matrix column input
* properties for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
* @param e_op Quaternary (or quinary) operator takes edge source, edge destination, (optional edge
* weight), *(@p adj_matrix_row_value_input_first + i), and *(@p adj_matrix_col_value_input_first +
* j) (where i is in [0, graph_view.get_number_of_local_adj_matrix_partition_rows()) and j is in [0,
Expand Down Expand Up @@ -249,9 +249,9 @@ void copy_v_transform_reduce_in_nbr(raft::handle_t const& handle,
}

assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_rows());
graph_view.get_number_of_local_adj_matrix_partition_rows());
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_cols());
graph_view.get_number_of_local_adj_matrix_partition_cols());
detail::for_all_major_for_all_nbr_low_out_degree<GraphViewType::is_adj_matrix_transposed>
<<<update_grid.num_blocks, update_grid.block_size, 0, handle.get_stream()>>>(
matrix_partition,
Expand Down Expand Up @@ -283,11 +283,11 @@ void copy_v_transform_reduce_in_nbr(raft::handle_t const& handle,
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param adj_matrix_col_value_input_first Iterator pointing to the adjacency matrix column input
* properties for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
* @param e_op Quaternary (or quinary) operator takes edge source, edge destination, (optional edge
* weight), *(@p adj_matrix_row_value_input_first + i), and *(@p adj_matrix_col_value_input_first +
* j) (where i is in [0, graph_view.get_number_of_local_adj_matrix_partition_rows()) and j is in [0,
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/patterns/count_if_e.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ __global__ void for_all_major_for_all_nbr_low_out_degree(
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param adj_matrix_col_value_input_first Iterator pointing to the adjacency matrix column input
* properties for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
* @param e_op Quaternary (or quinary) operator takes edge source, edge destination, (optional edge
* weight), *(@p adj_matrix_row_value_input_first + i), and *(@p adj_matrix_col_value_input_first +
* j) (where i is in [0, graph_view.get_number_of_local_adj_matrix_partition_rows()) and j is in [0,
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/patterns/transform_reduce_e.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ __global__ void for_all_major_for_all_nbr_low_out_degree(
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param adj_matrix_col_value_input_first Iterator pointing to the adjacency matrix column input
* properties for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
* @param e_op Quaternary (or quinary) operator takes edge source, edge destination, (optional edge
* weight), *(@p adj_matrix_row_value_input_first + i), and *(@p adj_matrix_col_value_input_first +
* j) (where i is in [0, graph_view.get_number_of_local_adj_matrix_partition_rows()) and j is in [0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace experimental {
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param v_op Binary operator takes *(@p vertex_value_input_first + i) and *(@p
* adj_matrix_row_value_input_first + j) (where i and j are set for a vertex and the matching row)
* and returns a transformed value to be reduced.
Expand All @@ -73,7 +73,7 @@ T transform_reduce_v_with_adj_matrix_row(
CUGRAPH_FAIL("unimplemented.");
} else {
assert(graph_view.get_number_of_local_vertices() ==
graph_view.get_number_of_adj_matrix_local_rows());
graph_view.get_number_of_local_adj_matrix_partition_rows());
auto input_first = thrust::make_zip_iterator(
thrust::make_tuple(vertex_value_input_first, adj_matrix_row_value_input_first));
auto v_op_wrapper = [v_op] __device__(auto v_and_row_val) {
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/patterns/update_frontier_v_push_if_out_nbr.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,11 @@ __global__ void update_frontier_and_vertex_output_values(
* @param adj_matrix_row_value_input_first Iterator pointing to the adjacency matrix row input
* properties for the first (inclusive) row (assigned to this process in multi-GPU).
* `adj_matrix_row_value_input_last` (exclusive) is deduced as @p adj_matrix_row_value_input_first +
* @p graph_view.get_number_of_adj_matrix_local_rows().
* @p graph_view.get_number_of_local_adj_matrix_partition_rows().
* @param adj_matrix_col_value_input_first Iterator pointing to the adjacency matrix column input
* properties for the first (inclusive) column (assigned to this process in multi-GPU).
* `adj_matrix_col_value_output_last` (exclusive) is deduced as @p adj_matrix_col_value_output_first
* + @p graph_view.get_number_of_adj_matrix_local_cols().
* + @p graph_view.get_number_of_local_adj_matrix_partition_cols().
* @param e_op Quaternary (or quinary) operator takes edge source, edge destination, (optional edge
* weight), *(@p adj_matrix_row_value_input_first + i), and *(@p adj_matrix_col_value_input_first +
* j) (where i is in [0, graph_view.get_number_of_local_adj_matrix_partition_rows()) and j is in [0,
Expand Down