Skip to content

Commit

Permalink
Merge pull request #882 from lucbv/Matrix_converter_update
Browse files Browse the repository at this point in the history 
Matrix Converter: fixing issue with deallocation after Kokkos::fininalize()
  • Loading branch information
@lucbv
lucbv authored Jan 28, 2021
2 parents 1d70ac8 + 51f7193 commit 98e1c20
Showing 1 changed file with 157 additions and 155 deletions.
312 changes: 157 additions & 155 deletions test_common/KokkosKernels_MatrixConverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ int main (int argc, char* argv[]){
typedef int size_type;
typedef int idx;
typedef double wt;

Kokkos::initialize(argc,argv);

bool symmetrize = false, remove_diagonal = false, transpose = false;
char *in_mtx = NULL, *out_bin = NULL;
Expand Down Expand Up @@ -92,204 +90,208 @@ int main (int argc, char* argv[]){

exit(1);
}
typedef Kokkos::DefaultHostExecutionSpace MyExecSpace;

typedef typename KokkosSparse::CrsMatrix<wt, idx, MyExecSpace, void, size_type > crstmat_t;
typedef typename crstmat_t::StaticCrsGraphType graph_t;
typedef typename graph_t::row_map_type::non_const_type row_map_view_t;
typedef typename graph_t::entries_type::non_const_type cols_view_t;
typedef typename crstmat_t::values_type::non_const_type values_view_t;
Kokkos::initialize(argc,argv);
{

typedef Kokkos::DefaultHostExecutionSpace MyExecSpace;

typedef typename KokkosSparse::CrsMatrix<wt, idx, MyExecSpace, void, size_type > crstmat_t;
typedef typename crstmat_t::StaticCrsGraphType graph_t;
typedef typename graph_t::row_map_type::non_const_type row_map_view_t;
typedef typename graph_t::entries_type::non_const_type cols_view_t;
typedef typename crstmat_t::values_type::non_const_type values_view_t;


typedef typename graph_t::row_map_type::const_type c_row_map_view_t;
typedef typename graph_t::entries_type::const_type c_cols_view_t;
typedef typename crstmat_t::values_type::const_type c_values_view_t;
typedef typename graph_t::row_map_type::const_type c_row_map_view_t;
typedef typename graph_t::entries_type::const_type c_cols_view_t;
typedef typename crstmat_t::values_type::const_type c_values_view_t;

crstmat_t a_crsmat = KokkosKernels::Impl::read_kokkos_crst_matrix<crstmat_t>(in_mtx);
crstmat_t a_crsmat = KokkosKernels::Impl::read_kokkos_crst_matrix<crstmat_t>(in_mtx);

c_row_map_view_t orm = a_crsmat.graph.row_map;
c_cols_view_t oentries = a_crsmat.graph.entries;
c_values_view_t ovalues = a_crsmat.values;
c_row_map_view_t orm = a_crsmat.graph.row_map;
c_cols_view_t oentries = a_crsmat.graph.entries;
c_values_view_t ovalues = a_crsmat.values;

const size_type *prm = orm.data();
const idx *pentries = oentries.data();
const wt *pvals = ovalues.data();
const size_type *prm = orm.data();
const idx *pentries = oentries.data();
const wt *pvals = ovalues.data();

idx numrows = a_crsmat.numRows();
//idx numcols = a_crsmat.numCols();
idx nnz = ovalues.extent(0);
std::cout << "numrows :" << numrows << " nnz:" << nnz << std::endl;
//Kokkos::deep_copy(new_rowmap, a_crsmat.graph.row_map);
idx numrows = a_crsmat.numRows();
//idx numcols = a_crsmat.numCols();
idx nnz = ovalues.extent(0);
std::cout << "numrows :" << numrows << " nnz:" << nnz << std::endl;
//Kokkos::deep_copy(new_rowmap, a_crsmat.graph.row_map);

if (remove_diagonal) {
std::vector<size_type> nrm(numrows + 1, 0);
std::vector<idx> nentries(nnz + 1);
std::vector<wt> nvals(nnz + 1);
if (remove_diagonal) {
std::vector<size_type> nrm(numrows + 1, 0);
std::vector<idx> nentries(nnz + 1);
std::vector<wt> nvals(nnz + 1);

for (idx i = 0; i < numrows; ++i){
for (idx i = 0; i < numrows; ++i){

size_type begin = prm[i];
size_type end = prm[i+1];
for (size_type j = begin; j < end; ++ j){
idx col = pentries[j];
//wt val = pvals[j];
size_type begin = prm[i];
size_type end = prm[i+1];
for (size_type j = begin; j < end; ++ j){
idx col = pentries[j];
//wt val = pvals[j];

if (i == col){
nrm[i] = 1;
break;
}
if (i == col){
nrm[i] = 1;
break;
}
}
}
}

size_type prefix = 0;
for (idx i = 0; i <= numrows; ++i){
size_type current = nrm[i];
nrm[i] = prefix;
prefix += current;
size_type prefix = 0;
for (idx i = 0; i <= numrows; ++i){
size_type current = nrm[i];
nrm[i] = prefix;
prefix += current;

}
}


for (idx i = 0; i <= numrows; ++i){
nrm[i] = prm[i] - nrm[i];
}
for (idx i = 0; i <= numrows; ++i){
nrm[i] = prm[i] - nrm[i];
}


for (idx i = 0; i < numrows; ++i){
for (idx i = 0; i < numrows; ++i){

size_type begin = prm[i];
size_type end = prm[i+1];
size_type begin = prm[i];
size_type end = prm[i+1];

size_type obegin = nrm[i];
size_type obegin = nrm[i];


for (size_type j = begin; j < end; ++ j){
idx col = pentries[j];
wt val = pvals[j];
if (i != col){
nentries[obegin] = col;
nvals[obegin++] = val;
}
}
if (obegin != nrm[i+1]){
std::cout << "i:" << i << " nrm[i+1]:" << nrm[i+1] << " obegin:" << obegin << std::endl;
exit(1);
for (size_type j = begin; j < end; ++ j){
idx col = pentries[j];
wt val = pvals[j];
if (i != col){
nentries[obegin] = col;
nvals[obegin++] = val;
}
}
if (obegin != nrm[i+1]){
std::cout << "i:" << i << " nrm[i+1]:" << nrm[i+1] << " obegin:" << obegin << std::endl;
exit(1);
}
}
}



row_map_view_t new_rowmap ("new rowmap", numrows + 1);
row_map_view_t new_rowmap ("new rowmap", numrows + 1);

cols_view_t new_entries("new colmap", nrm[numrows]);
values_view_t new_values("new values", nrm[numrows ]);
cols_view_t new_entries("new colmap", nrm[numrows]);
values_view_t new_values("new values", nrm[numrows ]);

for (idx i = 0; i <= numrows; ++i){
new_rowmap(i) = nrm[i];
}

for (size_type i = 0; i < nrm[numrows ]; ++i){
new_entries(i) = nentries[i];
new_values(i) = nvals[i];
}
for (idx i = 0; i <= numrows; ++i){
new_rowmap(i) = nrm[i];
}

graph_t transpose_graph(new_entries, new_rowmap);
crstmat_t transpose_matrix("transpose", numrows, new_values, transpose_graph);
a_crsmat = transpose_matrix;
for (size_type i = 0; i < nrm[numrows ]; ++i){
new_entries(i) = nentries[i];
new_values(i) = nvals[i];
}

graph_t transpose_graph(new_entries, new_rowmap);
crstmat_t transpose_matrix("transpose", numrows, new_values, transpose_graph);
a_crsmat = transpose_matrix;

orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;

prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();
orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;

numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}
prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();

if (symmetrize) {
numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}

row_map_view_t new_rowmap;
cols_view_t new_entries;
if (symmetrize) {

KokkosKernels::Impl::symmetrize_graph_symbolic_hashmap
<c_row_map_view_t, c_cols_view_t, row_map_view_t, cols_view_t,MyExecSpace>
(numrows, orm, oentries, new_rowmap, new_entries);
values_view_t new_values("new_values",new_entries.extent(0));
row_map_view_t new_rowmap;
cols_view_t new_entries;

cols_view_t out_adj ("out_adj", new_entries.extent(0));
values_view_t out_vals("out_vals", new_entries.extent(0));
KokkosKernels::Impl::symmetrize_graph_symbolic_hashmap
<c_row_map_view_t, c_cols_view_t, row_map_view_t, cols_view_t,MyExecSpace>
(numrows, orm, oentries, new_rowmap, new_entries);
values_view_t new_values("new_values",new_entries.extent(0));

KokkosKernels::Impl::kk_sort_graph<row_map_view_t, cols_view_t,values_view_t, cols_view_t,values_view_t,MyExecSpace>
(new_rowmap, new_entries, new_values, out_adj, out_vals);
new_entries = out_adj;
new_values = out_vals;
cols_view_t out_adj ("out_adj", new_entries.extent(0));
values_view_t out_vals("out_vals", new_entries.extent(0));

graph_t symmetric_graph(new_entries, new_rowmap);
crstmat_t symmetric_marix("transpose", numrows, new_values, symmetric_graph);
a_crsmat = symmetric_marix;
KokkosKernels::Impl::kk_sort_graph<row_map_view_t, cols_view_t,values_view_t, cols_view_t,values_view_t,MyExecSpace>
(new_rowmap, new_entries, new_values, out_adj, out_vals);
new_entries = out_adj;
new_values = out_vals;

orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;
graph_t symmetric_graph(new_entries, new_rowmap);
crstmat_t symmetric_marix("transpose", numrows, new_values, symmetric_graph);
a_crsmat = symmetric_marix;

prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();
orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;

numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}
if (transpose) {
row_map_view_t new_rowmap ("new_rowmap", a_crsmat.numCols() + 1);
cols_view_t new_entries ("new_rowmap", a_crsmat.nnz());
values_view_t new_values ("new_rowmap", a_crsmat.nnz());

KokkosKernels::Impl::transpose_matrix<
c_row_map_view_t, c_cols_view_t, c_values_view_t,
row_map_view_t, cols_view_t, values_view_t, row_map_view_t, MyExecSpace>(
a_crsmat.numRows(), a_crsmat.numCols(),
a_crsmat.graph.row_map, a_crsmat.graph.entries, a_crsmat.values,
new_rowmap, new_entries, new_values);

std::cout << 1 << std::endl;
cols_view_t out_adj ("out_adj", new_entries.extent(0));
values_view_t out_vals("out_vals", new_entries.extent(0));
std::cout << 2 << std::endl;
KokkosKernels::Impl::kk_sort_graph<row_map_view_t, cols_view_t,values_view_t, cols_view_t,values_view_t,MyExecSpace>
(new_rowmap, new_entries, new_values, out_adj, out_vals);
new_entries = out_adj;
new_values = out_vals;
std::cout << 3 << std::endl;
MyExecSpace().fence();
KokkosKernels::Impl::kk_print_1Dview(out_adj);
KokkosKernels::Impl::kk_print_1Dview(out_vals);

graph_t transpose_graph(new_entries, new_rowmap);
crstmat_t transpose_matrix("transpose", a_crsmat.numRows(), new_values, transpose_graph);
a_crsmat = transpose_matrix;

orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;

prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();

numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}
prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();

numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}
if (transpose) {
row_map_view_t new_rowmap ("new_rowmap", a_crsmat.numCols() + 1);
cols_view_t new_entries ("new_rowmap", a_crsmat.nnz());
values_view_t new_values ("new_rowmap", a_crsmat.nnz());

KokkosKernels::Impl::transpose_matrix<
c_row_map_view_t, c_cols_view_t, c_values_view_t,
row_map_view_t, cols_view_t, values_view_t, row_map_view_t, MyExecSpace>(
a_crsmat.numRows(), a_crsmat.numCols(),
a_crsmat.graph.row_map, a_crsmat.graph.entries, a_crsmat.values,
new_rowmap, new_entries, new_values);

std::cout << 1 << std::endl;
cols_view_t out_adj ("out_adj", new_entries.extent(0));
values_view_t out_vals("out_vals", new_entries.extent(0));
std::cout << 2 << std::endl;
KokkosKernels::Impl::kk_sort_graph<row_map_view_t, cols_view_t,values_view_t, cols_view_t,values_view_t,MyExecSpace>
(new_rowmap, new_entries, new_values, out_adj, out_vals);
new_entries = out_adj;
new_values = out_vals;
std::cout << 3 << std::endl;
MyExecSpace().fence();
KokkosKernels::Impl::kk_print_1Dview(out_adj);
KokkosKernels::Impl::kk_print_1Dview(out_vals);

graph_t transpose_graph(new_entries, new_rowmap);
crstmat_t transpose_matrix("transpose", a_crsmat.numRows(), new_values, transpose_graph);
a_crsmat = transpose_matrix;

orm = a_crsmat.graph.row_map;
oentries = a_crsmat.graph.entries;
ovalues = a_crsmat.values;

prm = orm.data();
pentries = oentries.data();
pvals = ovalues.data();

numrows = a_crsmat.numRows();
//numcols = a_crsmat.numCols();
nnz = ovalues.extent(0);
}

KokkosKernels::Impl::write_kokkos_crst_matrix (a_crsmat, out_bin);

KokkosKernels::Impl::write_kokkos_crst_matrix (a_crsmat, out_bin);
}

Kokkos::finalize();

Expand Down

0 comments on commit 98e1c20

Please sign in to comment.