Merge PoseyDevelopment into SharedDevelopment (#814)

NicolasJPosey · web-flow · commit 481e1cea0065 · 2025-03-13T16:46:37.000-07:00
* [issue-745] Refactor where summation is calculated (#777) * Refactor model class to generalize the summation logic method and move implementation into neuron class * Implement new AllVertices method in 911 class * Fix last compile errors * Clean up commented out code * Resolve code format failure * Remove dynamic cast of vertices so model with work with non-neuron models * Add override keyword to integrateVertexInputs declaration * Fix formatting issue * [issue-785] Remove neuro items from gpu model (#789) * Rename edge index map device variable name * Rename method names to remove neuro context * Rename variables both in method signature and implementation * Fix formatting * Remove neuro from GPU model and generalize what we can * Remove summation point operation as it's now done in the neuro vertices base class * Revert formatting that breaks code style * Clean up comments, variable names, and includes * Move edge sum index into all spiking synapses and rename neuro GPU methods in both edges and vertices * Fix style violation * Make corresponding updates to documentation * Re add serialize method to documentation * Fix const representation * Add All911Edges to connections documentation * Update diagram images * Add small 911 test to RunTests (#804) Moved small 911 test into Cpu subfolder since it was generated with Cpu code. This required corresponding update to github actions. Then updated RunTests so that it would build the appropriate list of tests based on the current processing unit. * [issue-806] Implement integrateVertexInputs in All911Vertices (#807) * Implement integrateVertexInputs in All911Vertices Since advanceEdges doesn't update the edge state until after we know that we can transfer the call, we move all of the advanceEdges logic into integrateVertexInputs. * fix style issue
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -76,7 +76,7 @@ jobs:
       run: ./cgraphitti -c ../Testing/RegressionTesting/configfiles/test-small-911.xml
     - name: verify test-small-911
       if: always() && steps.tt.conclusion == 'success'
-      run: diff ../Testing/RegressionTesting/TestOutput/test-small-911-out.xml ../Testing/RegressionTesting/GoodOutput/test-small-911-out.xml
+      run: diff ../Testing/RegressionTesting/TestOutput/test-small-911-out.xml ../Testing/RegressionTesting/GoodOutput/Cpu/test-small-911-out.xml
 
     - id: tm
       name: run test-medium
diff --git a/Simulator/Edges/NG911/All911Edges.cpp b/Simulator/Edges/NG911/All911Edges.cpp
@@ -46,55 +46,7 @@ void All911Edges::createEdge(BGSIZE iEdg, int srcVertex, int destVertex, BGFLOAT
 ///  Advance all the edges in the simulation.
 void All911Edges::advanceEdges(AllVertices &vertices, EdgeIndexMap &edgeIndexMap)
 {
-   Simulator &simulator = Simulator::getInstance();
-   All911Vertices &all911Vertices = dynamic_cast<All911Vertices &>(vertices);
-
-   for (int vertex = 0; vertex < simulator.getTotalVertices(); ++vertex) {
-      int start = edgeIndexMap.incomingEdgeBegin_[vertex];
-      int count = edgeIndexMap.incomingEdgeCount_[vertex];
-
-      if (simulator.getModel().getLayout().vertexTypeMap_[vertex] == vertexType::CALR) {
-         continue;   // TODO911: Caller Regions will have different behaviour
-      }
-
-      // Loop over all the edges and pull the data in
-      for (int eIdxMap = start; eIdxMap < start + count; ++eIdxMap) {
-         int edgeIdx = edgeIndexMap.incomingEdgeIndexMap_[eIdxMap];
-
-         if (!inUse_[edgeIdx]) {
-            continue;
-         }   // Edge isn't in use
-         if (isAvailable_[edgeIdx]) {
-            continue;
-         }   // Edge doesn't have a call
-
-         int dst = destVertexIndex_[edgeIdx];
-         // The destination vertex should be the one pulling the information
-         assert(dst == vertex);
-
-         CircularBuffer<Call> &dstQueue = all911Vertices.getQueue(dst);
-         if (dstQueue.size() >= (dstQueue.capacity() - all911Vertices.busyServers(dst))) {
-            // Call is dropped because there is no space in the waiting queue
-            if (!isRedial_[edgeIdx]) {
-               // Only count the dropped call if it's not a redial
-               all911Vertices.droppedCalls(dst)++;
-               // Record that we received a call
-               all911Vertices.receivedCalls(dst)++;
-               LOG4CPLUS_DEBUG(edgeLogger_,
-                               "Call dropped: " << all911Vertices.droppedCalls(dst) << ", time: "
-                                                << call_[edgeIdx].time << ", vertex: " << dst
-                                                << ", queue size: " << dstQueue.size());
-            }
-         } else {
-            // Transfer call to destination
-            dstQueue.put(call_[edgeIdx]);
-            // Record that we received a call
-            all911Vertices.receivedCalls(dst)++;
-            isAvailable_[edgeIdx] = true;
-            isRedial_[edgeIdx] = false;
-         }
-      }
-   }
+   // Edge properties are not updated until the vertex inputs are integrated into each vertex.
 }
 
 ///  Advance one specific edge.
diff --git a/Simulator/Vertices/NG911/All911Vertices.cpp b/Simulator/Vertices/NG911/All911Vertices.cpp
@@ -160,10 +160,59 @@ int All911Vertices::busyServers(int vIdx) const
 
 #if !defined(USE_GPU)
 
-// Short description of the method.
+// Take calls from the edges and transfer them to the vertex if it's queue is not full
 void All911Vertices::integrateVertexInputs(AllEdges &edges, EdgeIndexMap &edgeIndexMap)
 {
-   //TODO: Figure out where the appropriate logic is and move it here.
+   Simulator &simulator = Simulator::getInstance();
+   All911Edges &all911Edges = dynamic_cast<All911Edges &>(edges);
+
+   for (int vertex = 0; vertex < simulator.getTotalVertices(); ++vertex) {
+      int start = edgeIndexMap.incomingEdgeBegin_[vertex];
+      int count = edgeIndexMap.incomingEdgeCount_[vertex];
+
+      if (simulator.getModel().getLayout().vertexTypeMap_[vertex] == vertexType::CALR) {
+         continue;   // TODO911: Caller Regions will have different behaviour
+      }
+
+      // Loop over all the edges and pull the data in
+      for (int edge = start; edge < start + count; ++edge) {
+         int edgeIdx = edgeIndexMap.incomingEdgeIndexMap_[edge];
+
+         if (!all911Edges.inUse_[edgeIdx]) {
+            continue;
+         }   // Edge isn't in use
+         if (all911Edges.isAvailable_[edgeIdx]) {
+            continue;
+         }   // Edge doesn't have a call
+
+         int dst = all911Edges.destVertexIndex_[edgeIdx];
+         // The destination vertex should be the one pulling the information
+         assert(dst == vertex);
+
+         CircularBuffer<Call> &dstQueue = getQueue(dst);
+         if (dstQueue.size() >= (dstQueue.capacity() - busyServers(dst))) {
+            // Call is dropped because there is no space in the waiting queue
+            if (!all911Edges.isRedial_[edgeIdx]) {
+               // Only count the dropped call if it's not a redial
+               droppedCalls(dst)++;
+               // Record that we received a call
+               receivedCalls(dst)++;
+               LOG4CPLUS_DEBUG(vertexLogger_,
+                               "Call dropped: " << droppedCalls(dst)
+                                                << ", time: " << all911Edges.call_[edgeIdx].time
+                                                << ", vertex: " << dst
+                                                << ", queue size: " << dstQueue.size());
+            }
+         } else {
+            // Transfer call to destination
+            dstQueue.put(all911Edges.call_[edgeIdx]);
+            // Record that we received a call
+            receivedCalls(dst)++;
+            all911Edges.isAvailable_[edgeIdx] = true;
+            all911Edges.isRedial_[edgeIdx] = false;
+         }
+      }
+   }
 }
 
 // Update internal state of the indexed vertex (called by every simulation step).
diff --git a/Testing/RegressionTesting/GoodOutput/Cpu/test-small-911-out.xml b/Testing/RegressionTesting/GoodOutput/Cpu/test-small-911-out.xml
diff --git a/Testing/RunTests.sh b/Testing/RunTests.sh
@@ -56,15 +56,31 @@ NC='\033[0m' # No color
 CONFIG_DIR=../Testing/RegressionTesting/configfiles
 TEST_OUT_DIR=../Testing/RegressionTesting/TestOutput
 GOOD_OUT_DIR=../Testing/RegressionTesting/GoodOutput/${PROCESSING_UNIT}
-declare -a TEST_FILES=("test-tiny"
-                       "test-small"
-                       "test-small-connected"
-                       "test-small-long"
-                       "test-small-connected-long"
-                       "test-medium"
-                       "test-medium-connected"
-                       "test-medium-long"
-                       "test-medium-connected-long")
+
+# Get define the list of test files that we can run per processing unit
+# Lists are diffent when we have a CPU implementation of a model but no GPU implementation
+if [ $PROCESSING_UNIT == 'Cpu' ]; then
+    declare -a TEST_FILES=("test-tiny"
+                        "test-small"
+                        "test-small-connected"
+                        "test-small-long"
+                        "test-small-connected-long"
+                        "test-medium"
+                        "test-medium-connected"
+                        "test-medium-long"
+                        "test-medium-connected-long"
+                        "test-small-911")
+else
+    declare -a TEST_FILES=("test-tiny"
+                        "test-small"
+                        "test-small-connected"
+                        "test-small-long"
+                        "test-small-connected-long"
+                        "test-medium"
+                        "test-medium-connected"
+                        "test-medium-long"
+                        "test-medium-connected-long")
+fi
 
 # This function starts the simulations in parallel
 function run_simulations() {
