Changeset 2269 for XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/parallel_tree.cpp

Timestamp:

12/07/21 12:00:23 (3 years ago)

Author:

ymipsl

Message:

• Solve memory leak from remapper.
• shared_ptr add add for manage nodes.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/parallel_tree.cpp (modified) (23 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/parallel_tree.cpp

@@ -18 +18 @@
 
 // only the circle is packed, rest of node will be initialized on unpacking
-static void packNode(Node& node, char *buffer, int& index)
+static void packNode(NodePtr node, char *buffer, int& index)
 {
         if (buffer == NULL) // compute size only
@@ -24 +24 @@
         else
         {
-                *(Coord *)(&buffer[index]) = node.centre;
+                *(Coord *)(&buffer[index]) = node->centre;
                 index += sizeof(Coord);
 
-                *(double *)(&buffer[index]) = node.radius;
+                *(double *)(&buffer[index]) = node->radius;
                 index += sizeof(double);
         }
 }
 
-static void unpackNode(Node& node, char *buffer, int& index)
+static void unpackNode(NodePtr node, char *buffer, int& index)
 {
         Coord centre;
@@ -43 +43 @@
         index += sizeof(double);
 
-        node.centre = centre;
-        node.radius = r;
+        node->centre = centre;
+        node->radius = r;
 }
 
@@ -95 +95 @@
 }
 
-static void transferRoutedNodes(CMPIRouting& MPIRoute, /*const*/ vector<Node>& nodeSend, const vector<int>& route, vector<Node>& nodeRecv)
+static void transferRoutedNodes(CMPIRouting& MPIRoute, /*const*/ vector<NodePtr>& nodeSend, const vector<int>& route, vector<NodePtr>& nodeRecv)
 {
         /* `route` knows what goes where */
@@ -104 +104 @@
 }
 
-static void transferRoutedIntersections(CMPIRouting& MPIRoute, const vector<Node>& nodeSend, const vector<vector<int> >& route, vector<Node>& nodeRecv)
+static void transferRoutedIntersections(CMPIRouting& MPIRoute, const vector<NodePtr>& nodeSend, const vector<vector<int> >& route, vector<NodePtr>& nodeRecv)
 {
         // `route` knows what goes where
@@ -110 +110 @@
         int nRecv = MPIRoute.getTotalSourceElement();
         nodeRecv.resize(nRecv);
-        MPIRoute.transferToTarget((Node * /*mpi wants non-const*/) &nodeSend[0], &nodeRecv[0], packNode, unpackNode);
+        MPIRoute.transferToTarget((NodePtr*) &nodeSend[0], &nodeRecv[0], packNode, unpackNode);
 //cout << MPIRoute.mpiRank << " ROUTE " << nRecv << ": " << nodeSend.size() << " " << nodeRecv.size() << "    ";
 }
@@ -122 +122 @@
 }
 
-void CParallelTree::buildSampleTreeCascade(vector<Node>& sampleNodes /*route field will be modified*/, int level)
+void CParallelTree::buildSampleTreeCascade(vector<NodePtr>& sampleNodes /*route field will be modified*/, int level)
 {
         buildSampleTree(treeCascade[level], sampleNodes, cascade.level[level]);
@@ -132 +132 @@
                 treeCascade[level].routeNodes(route, sampleNodes, assignLevel);
 
-                vector<Node> routedNodes;
+                vector<NodePtr> routedNodes;
                 CMPIRouting mpiRoute(cascade.level[level].pg_comm);
                 transferRoutedNodes(mpiRoute, sampleNodes, route, routedNodes);
@@ -139 +139 @@
 }
 
-void buildSampleTree(CSampleTree& tree, const vector<Node>& node, const CCascadeLevel& comm)
+void buildSampleTree(CSampleTree& tree, const vector<NodePtr>& node, const CCascadeLevel& comm)
 /*
         In the beginning all the sample elements are distributed
@@ -175 +175 @@
         for (int i = 0; i < nsend; i++)
         {
-                const Node& no = node[randomArray[i]];
+                const Node& no = *node[randomArray[i]];
                 *((Coord *) (sendBuffer + index)) = no.centre;
                 index += sizeof(Coord)/sizeof(*sendBuffer);
@@ -210 +210 @@
         randomizeArray(randomArray);
         tree.leafs.resize(blocSize);
+        for(auto& it : tree.leafs) it=make_shared<Node>() ;
+
         index = 0;
   
@@ -220 +222 @@
                 double radius = recvBuffer[index%s];
     index++ ;
-                tree.leafs[randomArray[i]].centre = x;
-                tree.leafs[randomArray[i]].radius = radius;
+                tree.leafs[randomArray[i]]->centre = x;
+                tree.leafs[randomArray[i]]->radius = radius;
 
         }
@@ -233 +235 @@
         CTimer::get("buildSampleTree(local)").suspend();
         CTimer::get("buildSampleTree(local)").print();
-
         /* End gracefully if sample tree could not be constructed with desired number of nodes on assignLevel */
         int allok, ok = (tree.levelSize[assignLevel] == comm.group_size);
@@ -262 +263 @@
 
 
-void CParallelTree::buildLocalTree(const vector<Node>& node, const vector<int>& route)
+void CParallelTree::buildLocalTree(const vector<NodePtr>& node, const vector<int>& route)
 {
         CMPIRouting MPIRoute(communicator);
@@ -276 +277 @@
         vector<Elt*> ptElement(node.size());
         for (int i = 0; i < node.size(); i++)
-                ptElement[i] = (Elt *) (node[i].data);
+                ptElement[i] = (Elt *) (node[i]->data);
 
         vector<Elt*> ptLocalElement(nbLocalElements);
@@ -297 +298 @@
                 elt.id.ind = i;
                 elt.id.rank = mpiRank;
-                localTree.leafs.push_back(Node(elt.x, cptRadius(elt), &localElements[i]));
+                localTree.leafs.push_back(make_shared<Node>(elt.x, cptRadius(elt), &localElements[i]));
         }
         localTree.build(localTree.leafs);
@@ -306 +307 @@
 }
 
-void CParallelTree::build(vector<Node>& node, vector<Node>& node2)
+void CParallelTree::build(vector<NodePtr>& node, vector<NodePtr>& node2)
 {
 
@@ -332 +333 @@
 //      assert(node2.size() > nbSampleNodes);
 //      assert(node.size() + node2.size() > nbSampleNodes);
-        vector<Node> sampleNodes; sampleNodes.reserve(nbSampleNodes1+nbSampleNodes2);
+        vector<NodePtr> sampleNodes; sampleNodes.reserve(nbSampleNodes1+nbSampleNodes2);
 
         vector<int> randomArray1(node.size());
@@ -358 +359 @@
         }
 */
-        for (int i = 0; i <nbSampleNodes1; i++) sampleNodes.push_back(Node(node[randomArray1[i%nb1]].centre,  node[randomArray1[i%nb1]].radius, NULL));
-        for (int i = 0; i <nbSampleNodes2; i++) sampleNodes.push_back(Node(node2[randomArray2[i%nb2]].centre, node2[randomArray2[i%nb2]].radius, NULL));
+        for (int i = 0; i <nbSampleNodes1; i++) sampleNodes.push_back(make_shared<Node>(node[randomArray1[i%nb1]]->centre,  node[randomArray1[i%nb1]]->radius, nullptr));
+        for (int i = 0; i <nbSampleNodes2; i++) sampleNodes.push_back(make_shared<Node>(node2[randomArray2[i%nb2]]->centre, node2[randomArray2[i%nb2]]->radius, nullptr));
 
 /*          
@@ -393 +394 @@
 }
 
-void CParallelTree::routeNodes(vector<int>& route, vector<Node>& nodes /*route field used*/, int level)
+void CParallelTree::routeNodes(vector<int>& route, vector<NodePtr>& nodes /*route field used*/, int level)
 {
         treeCascade[level].routeNodes(route /*assign*/, nodes, assignLevel);
@@ -399 +400 @@
         if (level+1 < cascade.num_levels)
         {
-                vector<Node> routedNodes;
+                vector<NodePtr> routedNodes;
                 CMPIRouting MPIRoute(cascade.level[level].pg_comm);
                 transferRoutedNodes(MPIRoute, nodes, route /*use*/, routedNodes);
@@ -438 +439 @@
 }
 
-void CParallelTree::routeIntersections(vector<vector<int> >& routes, vector<Node>& nodes, int level)
+void CParallelTree::routeIntersections(vector<vector<int> >& routes, vector<NodePtr>& nodes, int level)
 {
         treeCascade[level].routeIntersections(routes /*assign*/, nodes);
@@ -444 +445 @@
         if (level+1 < cascade.num_levels)
         {
-                vector<Node> routedNodes;
+                vector<NodePtr> routedNodes;
                 CMPIRouting MPIRoute(cascade.level[level].pg_comm);
 
                 vector<int> flattenedRoutes1;
                 linearize(routes, flattenedRoutes1);
-                vector<Node> double_nodes(flattenedRoutes1.size());
+                vector<NodePtr> double_nodes(flattenedRoutes1.size());
                 int j = 0;
                 for (int i = 0; i < routes.size(); ++i)
                         for (int k = 0; k < routes[i].size(); ++k, ++j)
-                                double_nodes[j] = nodes[i];
+                        {
+                                double_nodes[j] = make_shared<Node>() ;
+                                *double_nodes[j] = *nodes[i];
+                        }
                 transferRoutedNodes(MPIRoute, double_nodes, flattenedRoutes1 /*use*/, routedNodes);
                 vector<vector<int> > globalRanks(routedNodes.size());