reduced level of nesting in fbcsr read

Slaedr · Slaedr · commit ea313ebae4ab · 2021-04-05T17:25:27.000+02:00
diff --git a/core/matrix/fbcsr.cpp b/core/matrix/fbcsr.cpp
@@ -336,43 +336,46 @@ void Fbcsr<ValueType, IndexType>::read(const mat_data &data)
                              blocks.size() * bs * bs, bs);
 
     tmp->row_ptrs_.get_data()[0] = 0;
-    if (data.nonzeros.size() > 0) {
-        index_type cur_brow = 0;
-        index_type cur_bnz = 0;
-        index_type cur_bcol = blocks.begin()->first.block_column;
-        const index_type num_brows = detail::get_num_blocks(bs, data.size[0]);
-
-        acc::range<acc::block_col_major<value_type, 3>> values(
-            std::array<size_type, 3>{blocks.size(), static_cast<size_type>(bs),
-                                     static_cast<size_type>(bs)},
-            tmp->values_.get_data());
-
-        for (auto it = blocks.begin(); it != blocks.end(); it++) {
-            GKO_ENSURE_IN_BOUNDS(cur_brow, num_brows);
-
-            tmp->col_idxs_.get_data()[cur_bnz] = it->first.block_column;
-            for (int ibr = 0; ibr < bs; ibr++) {
-                for (int jbr = 0; jbr < bs; jbr++) {
-                    values(cur_bnz, ibr, jbr) = it->second(ibr, jbr);
-                }
-            }
-            if (it->first.block_row > cur_brow) {
-                tmp->row_ptrs_.get_data()[++cur_brow] = cur_bnz;
-            } else {
-                assert(cur_brow == it->first.block_row);
-                assert(cur_bcol <= it->first.block_column);
-            }
+    if (data.nonzeros.size() == 0) {
+        tmp->move_to(this);
+        return;
+    }
 
-            cur_bcol = it->first.block_column;
-            cur_bnz++;
-        }
+    index_type cur_brow = 0;
+    index_type cur_bnz = 0;
+    index_type cur_bcol = blocks.begin()->first.block_column;
+    const index_type num_brows = detail::get_num_blocks(bs, data.size[0]);
+
+    acc::range<acc::block_col_major<value_type, 3>> values(
+        std::array<size_type, 3>{blocks.size(), static_cast<size_type>(bs),
+                                 static_cast<size_type>(bs)},
+        tmp->values_.get_data());
 
-        tmp->row_ptrs_.get_data()[++cur_brow] =
-            static_cast<index_type>(blocks.size());
+    for (auto it = blocks.begin(); it != blocks.end(); it++) {
+        GKO_ENSURE_IN_BOUNDS(cur_brow, num_brows);
 
-        assert(cur_brow == tmp->get_size()[0] / bs);
+        tmp->col_idxs_.get_data()[cur_bnz] = it->first.block_column;
+        for (int ibr = 0; ibr < bs; ibr++) {
+            for (int jbr = 0; jbr < bs; jbr++) {
+                values(cur_bnz, ibr, jbr) = it->second(ibr, jbr);
+            }
+        }
+        if (it->first.block_row > cur_brow) {
+            tmp->row_ptrs_.get_data()[++cur_brow] = cur_bnz;
+        } else {
+            assert(cur_brow == it->first.block_row);
+            assert(cur_bcol <= it->first.block_column);
+        }
+
+        cur_bcol = it->first.block_column;
+        cur_bnz++;
     }
 
+    tmp->row_ptrs_.get_data()[++cur_brow] =
+        static_cast<index_type>(blocks.size());
+
+    assert(cur_brow == tmp->get_size()[0] / bs);
+
     tmp->move_to(this);
 }
 
