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

mdf: fix initial value in select pivot functor #1916

Merged
merged 1 commit into from
Jul 27, 2023
Merged

mdf: fix initial value in select pivot functor #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions sparse/impl/KokkosSparse_mdf_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,7 @@ struct MDF_select_row {
}

KOKKOS_INLINE_FUNCTION
void init(value_type& dst) const {
dst = Kokkos::ArithTraits<ordinal_type>::zero();
}
void init(value_type& dst) const { dst = factorization_step; }

}; // MDF_select_row

Expand Down Expand Up @@ -567,15 +565,13 @@ struct MDF_compute_list_length {
KOKKOS_INLINE_FUNCTION
void operator()(const team_member_t team, ordinal_type& update_list_len,
ordinal_type& selected_row_len) const {
const ordinal_type selected_row = permutation(selected_row_idx);

const auto rowView = A.rowConst(selected_row);
const auto colView = At.rowConst(selected_row);
ordinal_type selected_row = 0;

size_type U_entryIdx = row_mapU(factorization_step);
size_type L_entryIdx = row_mapL(factorization_step);

Kokkos::single(Kokkos::PerTeam(team), [&] {
selected_row = permutation(selected_row_idx);
discarded_fill(selected_row) = Kokkos::ArithTraits<value_mag_type>::max();

// Swap entries in permutation vectors
Expand All @@ -595,6 +591,11 @@ struct MDF_compute_list_length {
});
++L_entryIdx;

// Only one thread has the selected row
team.team_reduce(Kokkos::Max<ordinal_type, execution_space>(selected_row));
const auto rowView = A.rowConst(selected_row);
const auto colView = At.rowConst(selected_row);

// Insert the upper part of the selected row in U
// including the diagonal term.
ordinal_type updateIdx = 0;
Expand Down
55 changes: 49 additions & 6 deletions sparse/src/KokkosSparse_mdf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,28 @@ void mdf_symbolic(const crs_matrix_type& A, MDF_handle& handle) {
return;
} // mdf_symbolic

template <class view_t, class ordinal_t = size_t>
void mdf_print_joined_view(
const view_t& dev_view, const char* sep,
ordinal_t max_count = Kokkos::ArithTraits<ordinal_t>::max()) {
const auto host_view =
Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), dev_view);

max_count = max_count > (ordinal_t)host_view.extent(0)
? (ordinal_t)host_view.extent(0)
: max_count;
for (ordinal_t i = 0; i < max_count; ++i) {
if (i) printf("%s", sep);
printf("%g", static_cast<double>(host_view[i]));
}
}

template <class crs_matrix_type, class MDF_handle>
void mdf_numeric(const crs_matrix_type& A, MDF_handle& handle) {
using col_ind_type = typename crs_matrix_type::StaticCrsGraphType::
entries_type::non_const_type;
using scalar_mag_type =
typename KokkosSparse::Impl::MDF_types<crs_matrix_type>::scalar_mag_type;
using values_mag_type =
typename KokkosSparse::Impl::MDF_types<crs_matrix_type>::values_mag_type;
using ordinal_type = typename crs_matrix_type::ordinal_type;
Expand Down Expand Up @@ -107,11 +125,11 @@ void mdf_numeric(const crs_matrix_type& A, MDF_handle& handle) {
for (ordinal_type factorization_step = 0; factorization_step < A.numRows();
++factorization_step) {
if (verbosity_level > 0) {
printf("\n\nFactorization step %d\n\n",
printf("\n\nFactorization step %d\n",
static_cast<int>(factorization_step));
}

{
if (update_list_len > 0) {
team_range_policy_type updatePolicy(update_list_len, Kokkos::AUTO,
Kokkos::AUTO);
KokkosSparse::Impl::MDF_discarded_fill_norm<crs_matrix_type, false>
Expand All @@ -122,6 +140,17 @@ void mdf_numeric(const crs_matrix_type& A, MDF_handle& handle) {
MDF_update_df_norm);
}

if (verbosity_level > 1) {
if constexpr (std::is_arithmetic_v<scalar_mag_type>) {
printf(" discarded_fill = {");
mdf_print_joined_view(discarded_fill, ", ");
printf("}\n");
}
printf(" deficiency = {");
mdf_print_joined_view(deficiency, ", ");
printf("}\n");
}

ordinal_type selected_row_idx = 0;
{
range_policy_type stepPolicy(factorization_step, Atmp.numRows());
Expand All @@ -147,6 +176,24 @@ void mdf_numeric(const crs_matrix_type& A, MDF_handle& handle) {
updateList, update_list_len, selected_row_len);
}

if (verbosity_level > 1) {
printf(" updateList = {");
mdf_print_joined_view(update_list, ", ", update_list_len);
printf("}\n permutation = {");
mdf_print_joined_view(handle.permutation, ", ");
printf("}\n permutation_inv = {");
mdf_print_joined_view(handle.permutation_inv, ", ");
printf("}\n");
}
if (verbosity_level > 0) {
printf(
" Selected row idx %d with length %d. Requires update of %d fill "
"norms.\n",
static_cast<int>(selected_row_idx),
static_cast<int>(selected_row_len),
static_cast<int>(update_list_len));
}

// If this was the last row no need to update A and At!
if (factorization_step < A.numRows() - 1) {
team_range_policy_type factorizePolicy(selected_row_len, Kokkos::AUTO,
Expand All @@ -159,10 +206,6 @@ void mdf_numeric(const crs_matrix_type& A, MDF_handle& handle) {
Kokkos::parallel_for("MDF: factorize row", factorizePolicy,
factorize_row);
}

if (verbosity_level > 0) {
printf("\n");
}
} // Loop over factorization steps

KokkosSparse::Impl::MDF_reindex_matrix<col_ind_type> reindex_U(
Expand Down