Skip to content

Commit 5156933

Browse files
committed
Fix output messages in matrix classes.
1 parent 2ba4fd0 commit 5156933

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

resolve/matrix/Coo.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace ReSolve
133133
index_type* matrix::Coo::getRowData(memory::MemorySpace memspace)
134134
{
135135
using namespace ReSolve::memory;
136-
// syncData(memspace);
136+
137137
switch (memspace) {
138138
case HOST:
139139
return this->h_row_data_;
@@ -147,7 +147,7 @@ namespace ReSolve
147147
index_type* matrix::Coo::getColData(memory::MemorySpace memspace)
148148
{
149149
using namespace ReSolve::memory;
150-
// syncData(memspace);
150+
151151
switch (memspace) {
152152
case HOST:
153153
return this->h_col_data_;
@@ -161,7 +161,7 @@ namespace ReSolve
161161
real_type* matrix::Coo::getValues(memory::MemorySpace memspace)
162162
{
163163
using namespace ReSolve::memory;
164-
// syncData(memspace);
164+
165165
switch (memspace) {
166166
case HOST:
167167
return this->h_val_data_;
@@ -304,11 +304,11 @@ namespace ReSolve
304304
switch (memspace) {
305305
case HOST:
306306
if (h_data_updated_) {
307-
out::misc() << "In Csr::syncData trying to sync host, but host already up to date!\n";
307+
out::misc() << "In Coo::syncData trying to sync host, but host already up to date!\n";
308308
return 0;
309309
}
310310
if (!d_data_updated_) {
311-
out::error() << "In Csr::syncData trying to sync host with device, but device is out of date!\n";
311+
out::error() << "In Coo::syncData trying to sync host with device, but device is out of date!\n";
312312
assert(d_data_updated_);
313313
}
314314
if ((h_row_data_ == nullptr) != (h_col_data_ == nullptr)) {
@@ -330,11 +330,11 @@ namespace ReSolve
330330
return 0;
331331
case DEVICE:
332332
if (d_data_updated_) {
333-
out::misc() << "In Csr::syncData trying to sync device, but device already up to date!\n";
333+
out::misc() << "In Coo::syncData trying to sync device, but device already up to date!\n";
334334
return 0;
335335
}
336336
if (!h_data_updated_) {
337-
out::error() << "In Csr::syncData trying to sync device with host, but host is out of date!\n";
337+
out::error() << "In Coo::syncData trying to sync device with host, but host is out of date!\n";
338338
assert(h_data_updated_);
339339
}
340340
if ((d_row_data_ == nullptr) != (d_col_data_ == nullptr)) {

resolve/matrix/Csc.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace ReSolve
3434
index_type* matrix::Csc::getRowData(memory::MemorySpace memspace)
3535
{
3636
using namespace ReSolve::memory;
37-
// syncData(memspace);
37+
3838
switch (memspace) {
3939
case HOST:
4040
return this->h_row_data_;
@@ -48,7 +48,7 @@ namespace ReSolve
4848
index_type* matrix::Csc::getColData(memory::MemorySpace memspace)
4949
{
5050
using namespace ReSolve::memory;
51-
// syncData(memspace);
51+
5252
switch (memspace) {
5353
case HOST:
5454
return this->h_col_data_;
@@ -62,7 +62,7 @@ namespace ReSolve
6262
real_type* matrix::Csc::getValues(memory::MemorySpace memspace)
6363
{
6464
using namespace ReSolve::memory;
65-
// syncData(memspace);
65+
6666
switch (memspace) {
6767
case HOST:
6868
return this->h_val_data_;
@@ -237,11 +237,11 @@ namespace ReSolve
237237
return 0;
238238
case DEVICE:
239239
if (d_data_updated_) {
240-
out::misc() << "In Csr::syncData trying to sync device, but device already up to date!\n";
240+
out::misc() << "In Csc::syncData trying to sync device, but device already up to date!\n";
241241
return 0;
242242
}
243243
if (!h_data_updated_) {
244-
out::error() << "In Csr::syncData trying to sync device with host, but host is out of date!\n";
244+
out::error() << "In Csc::syncData trying to sync device with host, but host is out of date!\n";
245245
assert(h_data_updated_);
246246
}
247247
if ((d_row_data_ == nullptr) != (d_col_data_ == nullptr)) {

resolve/matrix/Csr.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ namespace ReSolve
151151
index_type* matrix::Csr::getRowData(memory::MemorySpace memspace)
152152
{
153153
using namespace ReSolve::memory;
154-
// syncData(memspace);
154+
155155
switch (memspace) {
156156
case HOST:
157157
return this->h_row_data_;
@@ -165,7 +165,7 @@ namespace ReSolve
165165
index_type* matrix::Csr::getColData(memory::MemorySpace memspace)
166166
{
167167
using namespace ReSolve::memory;
168-
// syncData(memspace);
168+
169169
switch (memspace) {
170170
case HOST:
171171
return this->h_col_data_;
@@ -179,7 +179,7 @@ namespace ReSolve
179179
real_type* matrix::Csr::getValues(memory::MemorySpace memspace)
180180
{
181181
using namespace ReSolve::memory;
182-
// syncData(memspace);
182+
183183
switch (memspace) {
184184
case HOST:
185185
return this->h_val_data_;

0 commit comments

Comments
 (0)