Skip to content

Commit 9e91bb5

Browse files
author
Divya Kamath
committed
Fixed minor errors in serialize functions
1 parent ea773d4 commit 9e91bb5

20 files changed

+135
-84
lines changed

‎Simulator/Connections/Connections.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ CEREAL_CLASS_VERSION(Connections, 1);
115115
/// Cereal serialization method
116116
template <class Archive> void Connections::serialize(Archive &archive, std::uint32_t const version)
117117
{
118-
archive(cereal::make_nvp("edges_", edges_),
119-
cereal::make_nvp("synapseIndexMap_", synapseIndexMap_));
118+
archive(cereal::make_nvp("edges", edges_),
119+
cereal::make_nvp("synapseIndexMap", synapseIndexMap_));
120120
}

‎Simulator/Connections/Neuro/ConnGrowth.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ CEREAL_REGISTER_TYPE(ConnGrowth); // to enable polymorphism
204204
template <class Archive> void ConnGrowth::serialize(Archive &archive)
205205
{
206206
archive(cereal::base_class<Connections>(this), cereal::make_nvp("radiiSize", radiiSize_),
207-
cereal::make_nvp("growthParams_", growthParams_), cereal::make_nvp("W_", W_),
208-
cereal::make_nvp("radii_", radii_), cereal::make_nvp("rates_", rates_),
209-
cereal::make_nvp("area_", area_), cereal::make_nvp("outgrowth_", outgrowth_),
210-
cereal::make_nvp("deltaR_", deltaR_));
207+
cereal::make_nvp("growthParams", growthParams_), cereal::make_nvp("W", W_),
208+
cereal::make_nvp("radii", radii_), cereal::make_nvp("rates", rates_),
209+
cereal::make_nvp("delta", delta_), cereal::make_nvp("area", area_),
210+
cereal::make_nvp("outgrowth", outgrowth_), cereal::make_nvp("deltaR", deltaR_));
211211
}

‎Simulator/Connections/Neuro/ConnStatic.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ CEREAL_REGISTER_TYPE(ConnStatic);
137137
template <class Archive> void ConnStatic::serialize(Archive &archive)
138138
{
139139
archive(cereal::base_class<Connections>(this),
140-
cereal::make_nvp("sourceVertexIndexCurrentEpoch_", sourceVertexIndexCurrentEpoch_),
141-
cereal::make_nvp("destVertexIndexCurrentEpoch_", destVertexIndexCurrentEpoch_),
142-
cereal::make_nvp("WCurrentEpoch_", WCurrentEpoch_),
143-
cereal::make_nvp("radiiSize_", radiiSize_),
144-
cereal::make_nvp("connsPerVertex_", connsPerVertex_),
145-
cereal::make_nvp("threshConnsRadius_", threshConnsRadius_),
146-
cereal::make_nvp("rewiringProbability_", rewiringProbability_),
147-
cereal::make_nvp("excWeight_", excWeight_), cereal::make_nvp("inhWeight_", inhWeight_));
148-
}
140+
cereal::make_nvp("sourceVertexIndexCurrentEpoch", sourceVertexIndexCurrentEpoch_),
141+
cereal::make_nvp("destVertexIndexCurrentEpoch", destVertexIndexCurrentEpoch_),
142+
cereal::make_nvp("WCurrentEpoch", WCurrentEpoch_),
143+
cereal::make_nvp("radiiSize", radiiSize_),
144+
cereal::make_nvp("connsPerVertex", connsPerVertex_),
145+
cereal::make_nvp("threshConnsRadius", threshConnsRadius_),
146+
cereal::make_nvp("rewiringProbability", rewiringProbability_),
147+
cereal::make_nvp("excWeight", excWeight_), cereal::make_nvp("inhWeight", inhWeight_));
148+
}

‎Simulator/Core/CPUModel.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
#include "Edges/AllEdges.h"
4040
#include "Layouts/Layout.h"
4141
#include "Vertices/AllVertices.h"
42+
// cereal
43+
// #include <cereal/types/polymorphic.hpp>
4244

4345
class CPUModel : public Model {
4446
public:
@@ -63,4 +65,15 @@ class CPUModel : public Model {
6365

6466
/// Copy CPU Synapse data to GPU.
6567
virtual void copyCPUtoGPU() override;
68+
69+
/// Cereal serialization method
70+
template <class Archive> void serialize(Archive &archive);
6671
};
72+
73+
// CEREAL_REGISTER_TYPE(CPUModel);
74+
75+
// /// Cereal serialization method
76+
// template <class Archive> void CPUModel::serialize(Archive &archive)
77+
// {
78+
// archive(cereal::virtual_base_class<Model>(this));
79+
// }

‎Simulator/Core/EdgeIndexMap.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ struct EdgeIndexMapDevice {
111111
/// Cereal serialization method
112112
template <class Archive> void EdgeIndexMap::serialize(Archive &archive)
113113
{
114-
archive(cereal::make_nvp("outgoingEdgeIndexMap_", outgoingEdgeIndexMap_),
115-
cereal::make_nvp("outgoingEdgeBegin_", outgoingEdgeBegin_),
116-
cereal::make_nvp("outgoingEdgeCount_", outgoingEdgeCount_),
117-
cereal::make_nvp("incomingEdgeIndexMap_", incomingEdgeIndexMap_),
118-
cereal::make_nvp("incomingEdgeBegin_", incomingEdgeBegin_),
119-
cereal::make_nvp("incomingEdgeCount_", incomingEdgeCount_),
120-
cereal::make_nvp("numOfVertices_", numOfVertices_),
121-
cereal::make_nvp("numOfEdges_", numOfEdges_));
114+
archive(cereal::make_nvp("outgoingEdgeIndexMap", outgoingEdgeIndexMap_),
115+
cereal::make_nvp("outgoingEdgeBegin", outgoingEdgeBegin_),
116+
cereal::make_nvp("outgoingEdgeCount", outgoingEdgeCount_),
117+
cereal::make_nvp("incomingEdgeIndexMap", incomingEdgeIndexMap_),
118+
cereal::make_nvp("incomingEdgeBegin", incomingEdgeBegin_),
119+
cereal::make_nvp("incomingEdgeCount", incomingEdgeCount_),
120+
cereal::make_nvp("numOfVertices", numOfVertices_),
121+
cereal::make_nvp("numOfEdges", numOfEdges_));
122122
}

‎Simulator/Core/GPUModel.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737

3838
#include "AllSpikingNeurons.h"
3939
#include "AllSpikingSynapses.h"
40+
// cereal
41+
// #include <cereal/types/polymorphic.hpp>
4042

4143
#ifdef __CUDACC__
4244
#include "Book.h"
@@ -101,6 +103,9 @@ class GPUModel : public Model {
101103
/// Print out SynapseProps on the GPU.
102104
void printGPUSynapsesPropsModel() const;
103105

106+
/// Cereal serialization method
107+
template <class Archive> void serialize(Archive &archive);
108+
104109
protected:
105110
/// Allocates and initializes memories on CUDA device.
106111
/// @param[out] allVerticesDevice Memory location of the pointer to the neurons list on device memory.
@@ -166,3 +171,11 @@ extern __global__ void
166171
const EdgeIndexMapDevice *__restrict__ synapseIndexMapDevice_,
167172
const AllSpikingSynapsesDeviceProperties *__restrict__ allEdgesDevice);
168173
#endif
174+
175+
// CEREAL_REGISTER_TYPE(GPUModel);
176+
177+
// /// Cereal serialization method
178+
// template <class Archive> void GPUModel::serialize(Archive &archive)
179+
// {
180+
// archive(cereal::virtual_base_class<Model>(this));
181+
// }

‎Simulator/Core/Model.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include "Recorder.h"
2121
#include <log4cplus/loggingmacros.h>
2222
#include <memory>
23+
//cereal
24+
#include <cereal/types/memory.hpp>
2325

2426
using namespace std;
2527

@@ -79,6 +81,9 @@ class Model {
7981
/// might be similar to advance.
8082
virtual void updateConnections() = 0;
8183

84+
/// Cereal serialization method
85+
template <class Archive> void serialize(Archive &archive);
86+
8287
protected:
8388
// Note: This method was previously used for debugging, but it is now dead code left behind.
8489
/// Prints debug information about the current state of the network.
@@ -105,3 +110,11 @@ class Model {
105110
void
106111
createAllVertices(); /// Populate an instance of AllVertices with an initial state for each vertex.
107112
};
113+
114+
CEREAL_REGISTER_TYPE(Model);
115+
116+
/// Cereal serialization method
117+
template <class Archive> void Model::serialize(Archive &archive)
118+
{
119+
archive(cereal::make_nvp("connections", connections_), cereal::make_nvp("layout", layout_));
120+
}

‎Simulator/Edges/AllEdges.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ CEREAL_CLASS_VERSION(AllEdges, 1);
231231
template <class Archive> void AllEdges::serialize(Archive &archive, std::uint32_t const version)
232232
{
233233
// serialization
234-
archive(cereal::make_nvp("sourceVertexIndex_", sourceVertexIndex_),
234+
archive(cereal::make_nvp("sourceVertexIndex", sourceVertexIndex_),
235235
cereal::make_nvp("edgeWeights", W_),
236-
cereal::make_nvp("destVertexIndex_", destVertexIndex_), cereal::make_nvp("type_", type_),
237-
cereal::make_nvp("inUse_", inUse_), cereal::make_nvp("edgeCounts_", edgeCounts_),
238-
cereal::make_nvp("totalEdgeCount_", totalEdgeCount_),
239-
cereal::make_nvp("maxEdgesPerVertex_", maxEdgesPerVertex_),
240-
cereal::make_nvp("countVertices_", countVertices_));
236+
cereal::make_nvp("destVertexIndex", destVertexIndex_), cereal::make_nvp("type", type_),
237+
cereal::make_nvp("inUse", inUse_), cereal::make_nvp("edgeCounts", edgeCounts_),
238+
cereal::make_nvp("totalEdgeCount", totalEdgeCount_),
239+
cereal::make_nvp("maxEdgesPerVertex", maxEdgesPerVertex_),
240+
cereal::make_nvp("countVertices", countVertices_));
241241
}

‎Simulator/Edges/Neuro/AllDSSynapses.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CEREAL_REGISTER_TYPE(AllDSSynapses);
260260
/// Cereal serialization method
261261
template <class Archive> void AllDSSynapses::serialize(Archive &archive)
262262
{
263-
archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),
264-
cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),
265-
cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));
263+
archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),
264+
cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),
265+
cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));
266266
}

‎Simulator/Edges/Neuro/AllDynamicSTDPSynapses.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ CEREAL_REGISTER_TYPE(AllDynamicSTDPSynapses);
266266
/// Cereal serialization method
267267
template <class Archive> void AllDynamicSTDPSynapses::serialize(Archive &archive)
268268
{
269-
archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),
270-
cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),
271-
cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));
269+
archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),
270+
cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),
271+
cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));
272272
}

0 commit comments

Comments
 (0)