[ISSUE-131] Moving GPU memory management to OperationManager

Simulator/Core/Core.cpp

@@ -206,7 +206,7 @@ int Core::runSimulation(string executableName, string cmdLineArguments)
    }
 
    // Helper function for recorder to register spike history variables for all neurons.
-   simulator.getModel().getLayout().getVertices().registerHistoryVariables();
+   OperationManager::getInstance().executeOperation(Operations::registerHistoryVariables);
 
    // Run simulation
    LOG4CPLUS_TRACE(consoleLogger, "Starting Simulation");

Simulator/Core/GPUModel.h

@@ -22,7 +22,10 @@
 #pragma once
 
 #include "AllEdges.h"
+#include "AllSpikingNeurons.h"
+#include "AllSpikingSynapses.h"
 #include "AllVertices.h"
+#include "OperationManager.h"
 
 #ifdef VALIDATION_MODE
    #include <fstream>
@@ -81,25 +84,33 @@ class GPUModel : public Model {
    /// over the past epoch. Should be called once every epoch.
    virtual void updateConnections() override;
 
-   /// Copy GPU edge data to CPU.
-   virtual void copyGPUtoCPU() override;
-
-   /// Copy CPU edge data to GPU.
+   /// Copies neuron and synapse data from CPU to GPU memory.
+   /// TODO: Refactor this. Currently, GPUModel handles low-level memory transfer for vertices and edges.
+   ///       Consider moving this responsibility to a more appropriate class, such as a dedicated memory manager
+   ///       or the OperationManager, to better separate concerns and keep the model focused on high-level coordination.
    virtual void copyCPUtoGPU() override;
 
+   // GPUModel itself does not have anything to be copied back, this function is a
+   // dummy function just to make GPUModel non virtual
+   virtual void copyGPUtoCPU() override
+   {
+   }
+
    /// Print out EdgeProps on the GPU.
    void printGPUEdgesPropsModel() const;
 
+   /// Getter for edge (synapse) structures in device memory
+   AllEdgesDeviceProperties *&getAllEdgesDevice();
+
+   /// Getter for vertex (neuron) structures in device memory
+   AllVerticesDeviceProperties *&getAllVerticesDevice();
+
 protected:
    /// Allocates  and initializes memories on CUDA device.
-   /// @param[out] allVerticesDevice          Memory location of the pointer to the vertices list on device memory.
-   /// @param[out] allEdgesDevice         Memory location of the pointer to the edges list on device memory.
-   void allocDeviceStruct(void **allVerticesDevice, void **allEdgesDevice);
+   void allocDeviceStruct();
 
-   /// Copies device memories to host memories and deallocates them.
-   /// @param[out] allVerticesDevice          Memory location of the pointer to the vertices list on device memory.
-   /// @param[out] allEdgesDevice         Memory location of the pointer to the edges list on device memory.
-   virtual void deleteDeviceStruct(void **allVerticesDevice, void **allEdgesDevice);
+   /// Deallocates device memories.
+   virtual void deleteDeviceStruct();
 
    /// Pointer to device random noise array.
    float *randNoise_d;
@@ -118,11 +129,6 @@ class GPUModel : public Model {
 private:
    void allocEdgeIndexMap(int count);
 
-   void deleteEdgeIndexMap();
-
-public:   //2020/03/14 changed to public for accessing in Core
-   void copyEdgeIndexMapHostToDevice(EdgeIndexMap &edgeIndexMapHost, int numVertices);
-
 private:
    void updateHistory();
 

Simulator/Core/OperationManager.cpp

@@ -71,6 +71,8 @@ string OperationManager::operationToString(const Operations &operation) const
          return "copyToGPU";
       case Operations::copyFromGPU:
          return "copyFromGPU";
+      case Operations::allocateGPU:
+         return "allocateGPU";
       default:
          return "Operation isn't in OperationManager::operationToString()";
    }

Simulator/Core/Operations.h

@@ -20,5 +20,7 @@ enum class Operations {
    deallocateGPUMemory,   // Make sure deallocate memory isn't called until all GPU memory is copied back.
    restoreToDefault,   // Not sure what this refers to.
    copyToGPU,
-   copyFromGPU
-};
+   copyFromGPU,
+   allocateGPU,
+   registerHistoryVariables
+};

Simulator/Core/Serializer.cpp

@@ -67,8 +67,7 @@ bool Serializer::deserialize()
 
 #if defined(USE_GPU)
    GPUModel &gpuModel = static_cast<GPUModel &>(simulator.getModel());
-   gpuModel.copyEdgeIndexMapHostToDevice(simulator.getModel().getConnections().getEdgeIndexMap(),
-                                         simulator.getTotalVertices());
+   gpuModel.copyCPUtoGPU();
 #endif   // USE_GPU
 
    return true;

Simulator/Edges/AllEdges.cpp

@@ -26,6 +26,28 @@ AllEdges::AllEdges() : totalEdgeCount_(0), maxEdgesPerVertex_(0), countVertices_
    OperationManager::getInstance().registerOperation(Operations::printParameters,
                                                      printParametersFunc);
 
+#if defined(USE_GPU)
+   // Register allocNeuronDeviceStruct function as a allocateGPU operation in the OperationManager
+   function<void()> allocateGPU
+      = bind(static_cast<void (AllEdges::*)()>(&AllEdges::allocEdgeDeviceStruct), this);
+   OperationManager::getInstance().registerOperation(Operations::allocateGPU, allocateGPU);
+
+   // Register AllEdges::copyEdgeHostToDevice function as a copyToGPU operation in the OperationManager
+   function<void()> copyCPUtoGPU
+      = bind(static_cast<void (AllEdges::*)()>(&AllEdges::copyEdgeHostToDevice), this);
+   OperationManager::getInstance().registerOperation(Operations::copyToGPU, copyCPUtoGPU);
+
+   // Register copyFromGPU operation for transferring edge data from device to host
+   function<void()> copyFromGPU = bind(&AllEdges::copyEdgeDeviceToHost, this);
+   OperationManager::getInstance().registerOperation(Operations::copyFromGPU, copyFromGPU);
+
+   // Register deleteEdgeDeviceStruct function as a deallocateGPUMemory operation in the OperationManager
+   function<void()> deallocateGPUMemory = bind(&AllEdges::deleteEdgeDeviceStruct, this);
+   OperationManager::getInstance().registerOperation(Operations::deallocateGPUMemory,
+                                                     deallocateGPUMemory);
+
+#endif
+
    fileLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("file"));
    edgeLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("edge"));
 }

Simulator/Edges/AllEdges.h

@@ -95,9 +95,7 @@ class AllEdges {
 public:
    ///  Allocate GPU memories to store all edges' states,
    ///  and copy them from host to GPU memory.
-   ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void allocEdgeDeviceStruct(void **allEdgesDevice) = 0;
+   virtual void allocEdgeDeviceStruct() = 0;
 
    ///  Allocate GPU memories to store all edges' states,
    ///  and copy them from host to GPU memory.
@@ -110,13 +108,10 @@ class AllEdges {
 
    ///  Delete GPU memories.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void deleteEdgeDeviceStruct(void *allEdgesDevice) = 0;
+   virtual void deleteEdgeDeviceStruct() = 0;
 
    ///  Copy all edges' data from host to device.
-   ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeHostToDevice(void *allEdgesDevice) = 0;
+   virtual void copyEdgeHostToDevice() = 0;
 
    ///  Copy all edges' data from host to device.
    ///
@@ -128,8 +123,7 @@ class AllEdges {
 
    ///  Copy all edges' data from device to host.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeDeviceToHost(void *allEdgesDevice) = 0;
+   virtual void copyEdgeDeviceToHost() = 0;
 
    ///  Get edge_counts in AllEdges struct on device memory.
    ///

Simulator/Edges/NG911/All911Edges.h

@@ -65,14 +65,14 @@ class All911Edges : public AllEdges {
    // GPU functionality for 911 simulation is unimplemented.
    // These signatures are required to make the class non-abstract
 public:
-   virtual void allocEdgeDeviceStruct(void **allEdgesDevice) {};
+   virtual void allocEdgeDeviceStruct() {};
    virtual void allocEdgeDeviceStruct(void **allEdgesDevice, int numVertices,
                                       int maxEdgesPerVertex) {};
-   virtual void deleteEdgeDeviceStruct(void *allEdgesDevice) {};
-   virtual void copyEdgeHostToDevice(void *allEdgesDevice) {};
+   virtual void deleteEdgeDeviceStruct() {};
+   virtual void copyEdgeHostToDevice() {};
    virtual void copyEdgeHostToDevice(void *allEdgesDevice, int numVertices, int maxEdgesPerVertex) {
    };
-   virtual void copyEdgeDeviceToHost(void *allEdgesDevice) {};
+   virtual void copyEdgeDeviceToHost() {};
    virtual void copyDeviceEdgeCountsToHost(void *allEdgesDevice) {};
    virtual void advanceEdges(void *allEdgesDevice, void *allVerticesDevice,
                              void *edgeIndexMapDevice) {};

Simulator/Edges/Neuro/AllDSSynapses.h

@@ -121,9 +121,7 @@ class AllDSSynapses : public AllSpikingSynapses {
 public:
    ///  Allocate GPU memories to store all synapses' states,
    ///  and copy them from host to GPU memory.
-   ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void allocEdgeDeviceStruct(void **allEdgesDevice) override;
+   virtual void allocEdgeDeviceStruct() override;
 
    ///  Allocate GPU memories to store all synapses' states,
    ///  and copy them from host to GPU memory.
@@ -136,13 +134,11 @@ class AllDSSynapses : public AllSpikingSynapses {
 
    ///  Delete GPU memories.
    ///
-   ///  @param  allEdgesDevice     GPU address of the allEdges struct on device memory.
-   virtual void deleteEdgeDeviceStruct(void *allEdgesDevice) override;
+   virtual void deleteEdgeDeviceStruct() override;
 
    ///  Copy all synapses' data from host to device.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeHostToDevice(void *allEdgesDevice) override;
+   virtual void copyEdgeHostToDevice() override;
 
    ///  Copy all synapses' data from host to device.
    ///
@@ -154,8 +150,7 @@ class AllDSSynapses : public AllSpikingSynapses {
 
    ///  Copy all synapses' data from device to host.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeDeviceToHost(void *allEdgesDevice) override;
+   virtual void copyEdgeDeviceToHost() override;
 
    ///  Set synapse class ID defined by enumClassSynapses for the caller's Synapse class.
    ///  The class ID will be set to classSynapses_d in device memory,

Simulator/Edges/Neuro/AllDSSynapses_d.cpp

@@ -14,11 +14,10 @@
 
 ///  Allocate GPU memories to store all synapses' states,
 ///  and copy them from host to GPU memory.
-///
-///  @param  allEdgesDevice  GPU address of the AllDSSynapsesDeviceProperties struct
-///                             on device memory.
-void AllDSSynapses::allocEdgeDeviceStruct(void **allEdgesDevice)
+void AllDSSynapses::allocEdgeDeviceStruct()
 {
+   GPUModel *gpuModel = static_cast<GPUModel *>(&Simulator::getInstance().getModel());
+   void **allEdgesDevice = reinterpret_cast<void **>(&(gpuModel->getAllEdgesDevice()));
    allocEdgeDeviceStruct(allEdgesDevice, Simulator::getInstance().getTotalVertices(),
                          Simulator::getInstance().getMaxEdgesPerVertex());
 }
@@ -67,12 +66,11 @@ void AllDSSynapses::allocDeviceStruct(AllDSSynapsesDeviceProperties &allEdges, i
 
 ///  Delete GPU memories.
 ///
-///  @param  allEdgesDevice  GPU address of the AllDSSynapsesDeviceProperties struct
-///                             on device memory.
-void AllDSSynapses::deleteEdgeDeviceStruct(void *allEdgesDevice)
+void AllDSSynapses::deleteEdgeDeviceStruct()
 {
    AllDSSynapsesDeviceProperties allEdges;
-
+   GPUModel *gpuModel = static_cast<GPUModel *>(&Simulator::getInstance().getModel());
+   void *allEdgesDevice = static_cast<void *>(gpuModel->getAllEdgesDevice());
    HANDLE_ERROR(cudaMemcpy(&allEdges, allEdgesDevice, sizeof(AllDSSynapsesDeviceProperties),
                            cudaMemcpyDeviceToHost));
 
@@ -100,10 +98,10 @@ void AllDSSynapses::deleteDeviceStruct(AllDSSynapsesDeviceProperties &allEdgesDe
 
 ///  Copy all synapses' data from host to device.
 ///
-///  @param  allEdgesDevice  GPU address of the AllDSSynapsesDeviceProperties struct
-///                            on device memory.
-void AllDSSynapses::copyEdgeHostToDevice(void *allEdgesDevice)
+void AllDSSynapses::copyEdgeHostToDevice()
 {   // copy everything necessary
+   GPUModel *gpuModel = static_cast<GPUModel *>(&Simulator::getInstance().getModel());
+   void *allEdgesDevice = static_cast<void *>(gpuModel->getAllEdgesDevice());
    copyEdgeHostToDevice(allEdgesDevice, Simulator::getInstance().getTotalVertices(),
                         Simulator::getInstance().getMaxEdgesPerVertex());
 }
@@ -156,13 +154,12 @@ void AllDSSynapses::copyHostToDevice(void *allEdgesDevice,
 
 ///  Copy all synapses' data from device to host.
 ///
-///  @param  allEdgesDevice  GPU address of the AllDSSynapsesDeviceProperties struct
-///                             on device memory.
-void AllDSSynapses::copyEdgeDeviceToHost(void *allEdgesDevice)
+void AllDSSynapses::copyEdgeDeviceToHost()
 {
    // copy everything necessary
    AllDSSynapsesDeviceProperties allEdgesDeviceProps;
-
+   GPUModel *gpuModel = static_cast<GPUModel *>(&Simulator::getInstance().getModel());
+   void *allEdgesDevice = static_cast<void *>(gpuModel->getAllEdgesDevice());
    HANDLE_ERROR(cudaMemcpy(&allEdgesDeviceProps, allEdgesDevice,
                            sizeof(AllDSSynapsesDeviceProperties), cudaMemcpyDeviceToHost));
 
@@ -328,7 +325,8 @@ void AllDSSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
       }
 
       for (int i = 0; i < countVertices_; i++) {
-         cout << "GPU edge_counts:" << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
+         cout << "GPU edge_counts:"
+              << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
       }
 
       cout << "GPU totalSynapseCount:" << totalSynapseCountPrint << endl;

Simulator/Edges/Neuro/AllDynamicSTDPSynapses.h

@@ -124,10 +124,8 @@ class AllDynamicSTDPSynapses : public AllSTDPSynapses {
 #if defined(USE_GPU)
 public:
    ///  Allocate GPU memories to store all synapses' states,
-   ///  and copy them from host to GPU memory.
-   ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void allocEdgeDeviceStruct(void **allEdgesDevice) override;
+   ///  and copy them from host to GPU memory. memory.
+   virtual void allocEdgeDeviceStruct() override;
 
    ///  Allocate GPU memories to store all synapses' states,
    ///  and copy them from host to GPU memory.
@@ -139,13 +137,11 @@ class AllDynamicSTDPSynapses : public AllSTDPSynapses {
 
    ///  Delete GPU memories.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void deleteEdgeDeviceStruct(void *allEdgesDevice) override;
+   virtual void deleteEdgeDeviceStruct() override;
 
    ///  Copy all synapses' data from host to device.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeHostToDevice(void *allEdgesDevice) override;
+   virtual void copyEdgeHostToDevice() override;
 
    ///  Copy all synapses' data from host to device.
    ///
@@ -157,8 +153,7 @@ class AllDynamicSTDPSynapses : public AllSTDPSynapses {
 
    ///  Copy all synapses' data from device to host.
    ///
-   ///  @param  allEdgesDevice  GPU address of the allEdges struct on device memory.
-   virtual void copyEdgeDeviceToHost(void *allEdgesDevice) override;
+   virtual void copyEdgeDeviceToHost() override;
 
    ///  Set synapse class ID defined by enumClassSynapses for the caller's Synapse class.
    ///  The class ID will be set to classSynapses_d in device memory,