Merge pull request #142 from alliander-opensource/feature/use-int64-for-internal-index

use int64_t as internal indexing

Author: TonyXiang8787

include/power_grid_model/math_solver/sparse_lu_solver.hpp

@@ -51,7 +51,7 @@ struct sparse_lu_entry_trait<Tensor, RHSVector, XVector, enable_scalar_lu_t<Tens
     using Matrix = Tensor;
     using LUFactor = void;
     struct BlockPerm {};
-    using BlockPermArray = int;
+    using BlockPermArray = Idx;
 };
 
 template <class Tensor, class RHSVector, class XVector>

include/power_grid_model/power_grid_model.hpp

@@ -33,7 +33,7 @@ namespace power_grid_model {
 // id type
 using ID = int32_t;
 // idx type
-using Idx = int32_t;
+using Idx = int64_t;
 using IdxVector = std::vector<Idx>;
 
 using IntS = int8_t;

src/power_grid_model/_power_grid_core.pyx

@@ -22,8 +22,8 @@ from libcpp.string cimport string
 from libcpp.vector cimport vector
 
 # idx and id types
-from libc.stdint cimport int32_t as idx_t # isort: skip
-cdef np_idx_t = np.int32
+from libc.stdint cimport int64_t as idx_t # isort: skip
+cdef np_idx_t = np.int64
 from libc.stdint cimport int32_t as id_t # isort: skip
 cdef np_id_t = np.int32
 

src/power_grid_model/utils.py

@@ -93,7 +93,7 @@ def convert_list_to_batch_data(list_data: BatchList) -> BatchDataset:
             # Convert the index pointers to a numpy array and combine the list of object numpy arrays into a singe
             # numpy array. All objects of all batches are now stores in one large array, the index pointers define
             # which elemets of the array (rows) belong to which batch.
-            batch_data[component] = {"indptr": np.array(indptr, dtype=np.int32), "data": np.concatenate(data, axis=0)}
+            batch_data[component] = {"indptr": np.array(indptr, dtype=np.int64), "data": np.concatenate(data, axis=0)}
 
     return batch_data
 

tests/benchmark_cpp/benchmark.cpp

@@ -33,7 +33,7 @@ struct PowerGridBenchmark {
         Idx const n_feeders = n_nodes / nodes_per_feeder;
 
         // source node
-        Idx const id_source_node = 0;
+        ID const id_source_node = 0;
         NodeInput const source_node{{id_source_node}, 150.0e3};
         NodeInput const cycle_node_1{{id_source_node + 1}, 150.0e3}, cycle_node_2{{id_source_node + 2}, 150.0e3};
         LinkInput const link_1{{{3}, 0, 1, true, true}};
@@ -88,10 +88,10 @@ struct PowerGridBenchmark {
         link_input = {link_1, link_2, link_3};
 
         // vector of node ids at far end
-        IdxVector rind_nodes;
+        std::vector<ID> ring_nodes;
 
         // current id
-        Idx id_gen = 10;
+        ID id_gen = 10;
         for (Idx i = 0; i < n_feeders; i++) {
             NodeInput feeder_node = node;
             feeder_node.id = id_gen++;
@@ -101,10 +101,10 @@ struct PowerGridBenchmark {
             transformer_s.to_node = feeder_node.id;
             node_input.push_back(feeder_node);
             transformer_input.push_back(transformer_s);
-            Idx prev_node_id = feeder_node.id;
+            ID prev_node_id = feeder_node.id;
             for (Idx j = 0; j < nodes_per_feeder; j++) {
                 // node
-                Idx const current_node_id = id_gen++;
+                ID const current_node_id = id_gen++;
                 NodeInput node_s = node;
                 node_s.id = current_node_id;
                 // line
@@ -151,15 +151,15 @@ struct PowerGridBenchmark {
                 prev_node_id = current_node_id;
                 // push to rind node
                 if (j == ring_node_pos) {
-                    rind_nodes.push_back(node_input.back().id);
+                    ring_nodes.push_back(node_input.back().id);
                 }
             }
         }
         // add loop if needed, and there are more than one feeder, and there are ring nodes
-        if (n_feeders > 1 && meshed && !rind_nodes.empty()) {
-            rind_nodes.push_back(rind_nodes.front());
+        if (n_feeders > 1 && meshed && !ring_nodes.empty()) {
+            ring_nodes.push_back(ring_nodes.front());
             // loop all far end nodes
-            for (auto it = rind_nodes.cbegin(); it != rind_nodes.cend() - 1; ++it) {
+            for (auto it = ring_nodes.cbegin(); it != ring_nodes.cend() - 1; ++it) {
                 // line
                 LineInput line_s = line;
                 line_s.id = id_gen++;

tests/cpp_unit_tests/test_container.cpp

@@ -8,20 +8,20 @@
 namespace power_grid_model {
 
 struct C {
-    C(int a1) : a{a1} {
+    C(Idx a1) : a{a1} {
     }
 
-    int a;
+    Idx a;
 };
 
 struct C1 : C {
-    C1(int a1, double b1) : C{a1}, b{b1} {
+    C1(Idx a1, double b1) : C{a1}, b{b1} {
     }
     double b;
 };
 
 struct C2 : C {
-    C2(int a1, uint16_t b1) : C{a1}, b{b1} {
+    C2(Idx a1, uint16_t b1) : C{a1}, b{b1} {
     }
     uint16_t b;
 };

tests/cpp_unit_tests/test_main_model.cpp

@@ -105,7 +105,7 @@ TEST_CASE("Test main model") {
     main_model.set_construction_complete();
 
     SUBCASE("Test get indexer") {
-        IdxVector const node_id{2, 1, 3, 2};
+        std::vector<ID> const node_id{2, 1, 3, 2};
         IdxVector const expected_indexer{1, 0, 2, 1};
         IdxVector indexer(4);
         main_model.get_indexer("node", node_id.data(), 4, indexer.data());