Skip to content

Commit 337a11f

Browse files
authored
Simplex work estimates (#856)
This PR converts dual simplex to use manual work estimates to simplify the code and ease maintenance. Work estimates are also calculated for more functions. Authors: - Chris Maes (https://github.com/chris-maes) Approvers: - Alice Boucher (https://github.com/aliceb-nv) URL: #856
1 parent f91f9cc commit 337a11f

28 files changed

Lines changed: 1104 additions & 843 deletions

cpp/src/barrier/barrier.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ class iteration_data_t {
13901390
// v = alpha * A * w + beta * v = alpha * A * Dinv * A^T * y + beta * v
13911391
matrix_vector_multiply(A, alpha, w, beta, v);
13921392
if (debug) {
1393-
printf("||A|| = %.16e\n", vector_norm2<i_t, f_t>(A.x.underlying()));
1393+
printf("||A|| = %.16e\n", vector_norm2<i_t, f_t>(A.x));
13941394
printf("||w|| = %.16e\n", vector_norm2<i_t, f_t>(w));
13951395
printf("||v|| = %.16e\n", vector_norm2<i_t, f_t>(v));
13961396
}

cpp/src/barrier/cusparse_view.cu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ cusparse_view_t<i_t, f_t>::cusparse_view_t(raft::handle_t const* handle_ptr,
159159
A_indices_ = device_copy(indices, handle_ptr->get_stream());
160160
A_data_ = device_copy(data, handle_ptr->get_stream());
161161

162-
A_T_offsets_ = device_copy(A.col_start.underlying(), handle_ptr->get_stream());
163-
A_T_indices_ = device_copy(A.i.underlying(), handle_ptr->get_stream());
164-
A_T_data_ = device_copy(A.x.underlying(), handle_ptr->get_stream());
162+
A_T_offsets_ = device_copy(A.col_start, handle_ptr->get_stream());
163+
A_T_indices_ = device_copy(A.i, handle_ptr->get_stream());
164+
A_T_data_ = device_copy(A.x, handle_ptr->get_stream());
165165

166166
cusparseCreateCsr(&A_,
167167
rows,

0 commit comments

Comments
 (0)