Changeset 2021

Timestamp:

01/22/21 18:35:44 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src

Files:

• filter/client_to_server_store_filter.cpp (modified) (1 diff)
• filter/pass_through_filter.cpp (modified) (2 diffs)
• filter/temporal_filter.cpp (modified) (2 diffs)
• filter/transform_filter.cpp (modified) (3 diffs)
• filter/transform_filter.hpp (modified) (1 diff)
• graph_package.hpp (modified) (1 diff)
• node/field.cpp (modified) (2 diffs)
• node/grid.cpp (modified) (4 diffs)
• node/grid.hpp (modified) (1 diff)
• transformation/algorithm_transformation_transfer.hpp (modified) (1 diff)
• transformation/domain_algorithm/domain_algorithm_extract.hpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.hpp (modified) (1 diff)
• transformation/grid_algorithm.cpp (modified) (1 diff)
• transformation/grid_algorithm.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_graph/src/filter/client_to_server_store_filter.cpp

@@ -38 +38 @@
       this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
       if(!data[0]->graphPackage) data[0]->graphPackage = new CGraphDataPackage;
-      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      CWorkflowGraph::addNode("Client to Server Store filter", 5, true, 1, data[0]);
-      
+      CWorkflowGraph::addNode("Client to Server Store filter", 6, true, 1, data[0]);
+     
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
-      data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+      // flux can be redirected to other filters. So don't change the 'from' parameter
+      //data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
     }
   }

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

@@ -19 +19 @@
     if(this->graphEnabled)
     {
+      if(data[0]->graphPackage->currentField->getId() == this->graphPackage->inFields[0]->getId())
+      {
+        std::cout<<"PASS THROUGH FILTER OMITTED "<<this<<std::endl;
+        std::cout<<data[0]->graphPackage->currentField->getId()<< "-------"<< this->graphPackage->inFields[0]->getId()<<std::endl;
+        return;
+      }
       this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
       
@@ -26 +32 @@
         data[0]->graphPackage->fromFilter = -1;
       }
-          
+      
+      CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]);
       data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]);
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;

XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

@@ -34 +34 @@
     if(this->graphEnabled)
     {
-      if(!data[0]->graphPackage) data[0]->graphPackage = new CGraphDataPackage;
-      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
-      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+      }
       
       if(this->graphPackage->sourceFilterIds.size()==0)
@@ -46 +47 @@
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
-      this->graphPackage->sourceFilterIds.push_back(data[0]->graphPackage->fromFilter);    
+      this->graphPackage->sourceFilterIds.push_back(data[0]->graphPackage->fromFilter); 
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
     }
 

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

@@ -1 +1 @@
 #include "transform_filter.hpp"
 #include "grid_algorithm.hpp"
-
+#include "workflow_graph.hpp"
 namespace xios
 {
@@ -19 +19 @@
     packet->timestamp = data[0]->timestamp;
     packet->status = data[0]->status;
-
+    
     if (packet->status == CDataPacket::NO_ERROR) 
     {
+      cout<<"transformeFilter = "<<this<<" and graphEnabled = "<<this->graphEnabled<<std::endl;
+      buildWorkflowGraph(data, packet, algorithm_);
+      
       if (data.size()>1)
       {
@@ -33 +36 @@
   }
 
-
+  void CTransformFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm* algorithm)
+  {
+    if(this->graphEnabled)
+    {
+      this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+    
+      packet->graphPackage = new CGraphDataPackage;
+      if(data[0]->graphPackage)
+      {
+        packet->graphPackage->fromFilter = data[0]->graphPackage->fromFilter;
+      }
+      packet->graphPackage->toFilter = data[0]->graphPackage->toFilter;
+      packet->graphPackage->current_filter_name = data[0]->graphPackage->current_filter_name;
+      packet->graphPackage->contextId = data[0]->graphPackage->contextId;          
+      packet->graphPackage->currentField = data[0]->graphPackage->currentField;//this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+    
+      CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
+      CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);
+      packet->graphPackage->fromFilter = this->graphPackage->filterId;
+      packet->graphPackage->currentField = this->graphPackage->inFields[0];
+    }
+  }
 
 }

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.hpp

@@ -22 +22 @@
       */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data) ;
+      void buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm* algorithm);
+      
 //      void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest);
      

XIOS/dev/dev_trunk_graph/src/graph_package.hpp

@@ -20 +20 @@
     int distanceFromStart=-1;
     StdString contextId;
-    
+
+    CGraphDataPackage(): fromFilter(-1) {}
   }; 
 } // namespace xios

XIOS/dev/dev_trunk_graph/src/node/field.cpp

@@ -614 +614 @@
         // new
         
-        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid->buildTransformationGraph(gc, false,  gridSrc, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid->buildTransformationGraph(gc, false,  gridSrc, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
         lastFilter->connectOutput(filters.first, 0);
-        if(buildGraph_)
+        /*if(buildGraph_)
         {
           std::cout<<"============== field "<<this->getId()<<" calls a transformation filter 1 ============== "<<lastFilter<<" _ "<<filters.first<<" ***** "<<CXios::isClient<<std::endl;
@@ -622 +622 @@
           filters.first->graphPackage = new CGraphPackage;
           filters.first->graphPackage->inFields.push_back(this);
-        }
+        }*/
         lastFilter = filters.second;
         gridSrc = newGrid ;

XIOS/dev/dev_trunk_graph/src/node/grid.cpp

@@ -1691 +1691 @@
 
   std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > 
-  CGrid::buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid, bool graphEnabled)
+  CGrid::buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid, bool graphEnabled, CField* field)
   TRY
   {
@@ -1714 +1714 @@
     else  
     {
-      cout<<"Create new grid : "<<newId<<endl ;
+      StdString role = CXios::isClient? "Client ": "Server ";
+      cout<<role<<"Create new grid : "<<newId<<endl ;
       newGrid = CGrid::create(newId) ;
       isNewGrid = true ;
@@ -1986 +1987 @@
         shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(gridAlgorithm->createTransformFilter(gc, detectMissingValues, defaultValue)) ;
         outputFilter->connectOutput(transformFilter,0) ;
+        if(graphEnabled)
+        {
+          transformFilter->graphEnabled=true;
+          transformFilter->graphPackage = new CGraphPackage;
+          transformFilter->graphPackage->inFields.push_back(field);
+        }
+        
         vector<string> auxFieldId = algo->getAuxFieldId() ; // better to do that at transformation not algo ??
         int i=1; 
@@ -1994 +2002 @@
           auxField->getInstantDataFilter()->connectOutput(transformFilter,i) ;
           i++ ;
+          
         }
         outputFilter = transformFilter ;

XIOS/dev/dev_trunk_graph/src/node/grid.hpp

@@ -215 +215 @@
       public:
          pair<shared_ptr<CFilter>, shared_ptr<CFilter> > buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues,
-                                                                                  double defaultValue, CGrid*& newGrid, bool graphEnabled=false) ;
+                                                                                  double defaultValue, CGrid*& newGrid, bool graphEnabled=false, CField* field=nullptr) ;
       private:
         CGridAlgorithm* gridAlgorithm_ = nullptr ;

XIOS/dev/dev_trunk_graph/src/transformation/algorithm_transformation_transfer.hpp

@@ -17 +17 @@
       virtual void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut);
       virtual void computeRecvElement(CLocalView* srcView, CLocalView* dstView) ;
+      virtual StdString getAlgoName() {return "CAlgorithm transformation Transfer";}
    
     protected:

XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_extract.hpp

@@ -21 +21 @@
 
   virtual ~CDomainAlgorithmExtract() {}
+  virtual StdString getAlgoName() {return "\\nextract_domain";}
 
   static bool registerTrans();

XIOS/dev/dev_trunk_graph/src/transformation/generic_algorithm_transformation.hpp

@@ -41 +41 @@
     virtual void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, const vector<CArray<double,1>>& auxData, CArray<double,1>& dataOut) { abort() ;} //=0
     virtual bool isGenerateTransformation(void) { return false ;}
+    
+    virtual StdString getAlgoName() { return "Generic algorithm transformation";}
 
     virtual vector<string> getAuxFieldId(void) ;

XIOS/dev/dev_trunk_graph/src/transformation/grid_algorithm.cpp

@@ -13 +13 @@
   { 
     return algorithm_->isGenerateTransformation() ;
-  }  
+  } 
+
+
+  StdString CGridAlgorithm::getAlgoName()
+  {
+    return algorithm_->getAlgoName();
+  } 
 }

XIOS/dev/dev_trunk_graph/src/transformation/grid_algorithm.hpp

@@ -28 +28 @@
     virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, bool detectMissingValues, double defaultValue) ;
     virtual bool isGenerateTranformation(void) ;
+    virtual StdString getAlgoName() ;
    
     protected: