Skip to content

Commit 773ffc4

Browse files
authored
Merge Use Index map in PGM
This PR enables using an index map to create the coarse level using PGM for distributed matrices. IMO this simplifies the PGM implementation, since there is no 'manual' implementation needed anymore. This also has some consequences for the `distributed::Matrix` class. Namely, when creating a matrix with from local and non-local parts, an index map should be supplied, instead of the list of vectors. Again, I think this should simplify the interface. Note that currently there is no getter for the index map, since it's not necessary. But it might be useful for consistency. Related PR: #1639
2 parents e66d6d1 + 9b9d04b commit 773ffc4

File tree

10 files changed

+344
-260
lines changed

10 files changed

+344
-260
lines changed

benchmark/test/reference/distributed_solver.profile.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ DEBUG: begin components::fill_array
3636
DEBUG: end components::fill_array
3737
DEBUG: begin components::fill_array
3838
DEBUG: end components::fill_array
39+
DEBUG: begin components::fill_array
40+
DEBUG: end components::fill_array
41+
DEBUG: begin components::fill_array
42+
DEBUG: end components::fill_array
3943
DEBUG: begin copy(<typename>)
4044
DEBUG: begin copy
4145
DEBUG: end copy
@@ -92,8 +96,6 @@ DEBUG: begin copy
9296
DEBUG: end copy
9397
DEBUG: begin copy
9498
DEBUG: end copy
95-
DEBUG: begin copy
96-
DEBUG: end copy
9799
DEBUG: begin components::convert_idxs_to_ptrs
98100
DEBUG: end components::convert_idxs_to_ptrs
99101
DEBUG: begin components::convert_idxs_to_ptrs

benchmark/test/reference/spmv_distributed.profile.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ DEBUG: begin components::fill_array
5252
DEBUG: end components::fill_array
5353
DEBUG: begin components::fill_array
5454
DEBUG: end components::fill_array
55+
DEBUG: begin components::fill_array
56+
DEBUG: end components::fill_array
57+
DEBUG: begin components::fill_array
58+
DEBUG: end components::fill_array
5559
DEBUG: begin copy(<typename>)
5660
DEBUG: begin copy
5761
DEBUG: end copy
@@ -108,8 +112,6 @@ DEBUG: begin copy
108112
DEBUG: end copy
109113
DEBUG: begin copy
110114
DEBUG: end copy
111-
DEBUG: begin copy
112-
DEBUG: end copy
113115
DEBUG: begin components::convert_idxs_to_ptrs
114116
DEBUG: end components::convert_idxs_to_ptrs
115117
DEBUG: begin components::convert_idxs_to_ptrs

benchmark/test/reference/spmv_distributed.profile.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"comm_pattern": "stencil",
66
"spmv": {
77
"csr-csr": {
8-
"storage": 10948,
8+
"storage": 11476,
99
"time": 1.0,
1010
"repetitions": 1,
1111
"completed": true

benchmark/test/reference/spmv_distributed.simple.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"comm_pattern": "stencil",
66
"spmv": {
77
"csr-csr": {
8-
"storage": 10948,
8+
"storage": 11476,
99
"max_relative_norm2": 1.0,
1010
"time": 1.0,
1111
"repetitions": 10,

benchmark/test/reference/spmv_distributed_dcomplex.simple.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"comm_pattern": "stencil",
66
"spmv": {
77
"csr-csr": {
8-
"storage": 16772,
8+
"storage": 17300,
99
"max_relative_norm2": 1.0,
1010
"time": 1.0,
1111
"repetitions": 10,

0 commit comments

Comments
 (0)