move to more yaml output and fix for sparse field filtering (#1144)

* fix for field filtering with sparse fields * yaml instead of json in several places
Alpine-DAV · May 18, 2023 · 744a36a · 744a36a
1 parent 78783ff
commit 744a36a
Show file tree

Hide file tree

Showing 17 changed files with 259 additions and 41 deletions.
diff --git a/src/examples/proxies/kripke/Kripke/Sweep_Solver.cpp b/src/examples/proxies/kripke/Kripke/Sweep_Solver.cpp
@@ -94,7 +94,7 @@ void writeAscentData(Ascent &ascent, Grid_Data *grid_data, int timeStep)
   conduit::Node verify_info;
   if(!conduit::blueprint::mesh::verify(data,verify_info))
   {
-      CONDUIT_INFO("blueprint verify failed!" + verify_info.to_json());
+      CONDUIT_INFO("blueprint verify failed!" + verify_info.to_yaml());
   }
   else
   {

diff --git a/src/examples/proxies/lulesh2.0.3/lulesh-init.cc b/src/examples/proxies/lulesh2.0.3/lulesh-init.cc
@@ -261,7 +261,7 @@ Domain::Domain(Int_t numRanks, Int_t myRank,
    conduit::Node verify_info;
    if(!conduit::blueprint::mesh::verify(m_ascent_node,verify_info))
    {
-       CONDUIT_INFO("blueprint verify failed!" + verify_info.to_json());
+       CONDUIT_INFO("blueprint verify failed!" + verify_info.to_yaml());
    }
 
 /*--------------------------------------------------------------------------

diff --git a/src/libs/ascent/runtimes/ascent_empty_runtime.cpp b/src/libs/ascent/runtimes/ascent_empty_runtime.cpp
@@ -141,7 +141,7 @@ EmptyRuntime::Publish(const conduit::Node &data)
     {
          ASCENT_ERROR("Mesh Blueprint Verify failed!"
                         << std::endl
-                        << verify_info.to_json());
+                        << verify_info.to_yaml());
     }
 #endif
 

diff --git a/src/libs/ascent/runtimes/ascent_main_runtime.cpp b/src/libs/ascent/runtimes/ascent_main_runtime.cpp
@@ -1376,7 +1376,7 @@ AscentRuntime::CreateScenes(const conduit::Node &scenes)
     conduit::Node scene = scenes.child(i);
     if(!scene.has_path("plots"))
     {
-      ASCENT_ERROR("Scene must have at least one plot: "<<scene.to_json());
+      ASCENT_ERROR("Scene must have at least one plot: "<<scene.to_yaml());
     }
 
     // create the default render
@@ -2005,6 +2005,16 @@ void AscentRuntime::SourceFieldFilter()
             dom.remove("fields/"+names[f]);
         }
       } // for fields
+
+      // if all fields were removed - also remove the fields node
+      // or else blueprint verify will fail
+      // 
+      // (this can happen when some domains do not have selected fields)
+      //
+      if(dom["fields"].number_of_children() == 0)
+      {
+          dom.remove_child("fields");
+      }
     }
   } // for doms
 

diff --git a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_blueprint_filters.cpp b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_blueprint_filters.cpp
@@ -136,19 +136,18 @@ BlueprintVerify::execute()
     // some MPI tasks may not have data, that is fine
     // but blueprint verify will fail, so if the
     // input node is empty skip verify
-    int local_verify_ok = 0;
+    int local_verify_ok  = 0;
+    int local_verify_err = 0;
+
+    std::string verify_err_msg = "";
     if(!n_input->dtype().is_empty())
     {
         if(!conduit::blueprint::verify(protocol,
                                        *n_input,
                                        v_info))
         {
-            n_input->schema().print();
-            v_info.print();
-            ASCENT_ERROR("blueprint verify failed for protocol"
-                          << protocol << std::endl
-                          << "details:" << std::endl
-                          << v_info.to_json());
+            verify_err_msg = v_info.to_yaml();
+            local_verify_err = 1;
         }
         else
         {
@@ -158,17 +157,50 @@ BlueprintVerify::execute()
 
     // make sure some MPI task actually had bp data
 #ifdef ASCENT_MPI_ENABLED
+    // reduce flag for some valid data
     int global_verify_ok = 0;
     MPI_Comm mpi_comm = MPI_Comm_f2c(flow::Workspace::default_mpi_comm());
     MPI_Allreduce((void *)(&local_verify_ok),
-                (void *)(&global_verify_ok),
-                1,
-                MPI_INT,
-                MPI_SUM,
-                mpi_comm);
+                  (void *)(&global_verify_ok),
+                  1,
+                  MPI_INT,
+                  MPI_SUM,
+                  mpi_comm);
     local_verify_ok = global_verify_ok;
+
+    // reduce flag for errors
+    int global_verify_err = 0;
+    MPI_Allreduce((void *)(&local_verify_err),
+                  (void *)(&global_verify_err),
+                  1,
+                  MPI_INT,
+                  MPI_SUM,
+                  mpi_comm);
+    local_verify_err = global_verify_err;
+
+
 #endif
 
+    // check for an error on any rank
+    if(local_verify_err == 1)
+    {
+        if(verify_err_msg != "")
+        {
+            ASCENT_ERROR("blueprint verify failed for protocol"
+                          << protocol << std::endl
+                          << "one one more more ranks." << std::endl
+                          << "Details:" << std::endl
+                          << verify_err_msg);
+        } 
+        else
+        {
+            ASCENT_ERROR("blueprint verify failed for protocol"
+                          << protocol << std::endl
+                          << "one one more more ranks." << std::endl);
+        }
+    }
+
+    // check for no data
     if(local_verify_ok == 0)
     {
         ASCENT_ERROR("blueprint verify failed: published data is empty");

diff --git a/src/libs/flow/flow_data.cpp b/src/libs/flow/flow_data.cpp
@@ -84,11 +84,23 @@ Data::to_json() const
     return oss.str();
 }
 
+//-----------------------------------------------------------------------------
+std::string
+Data::to_yaml() const
+{
+    Node out;
+    info(out);
+    ostringstream oss;
+    out.to_yaml_stream(oss);
+    return oss.str();
+}
+
+
 //-----------------------------------------------------------------------------
 void
 Data::print() const
 {
-    CONDUIT_INFO(to_json());
+    CONDUIT_INFO(to_yaml());
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/libs/flow/flow_data.hpp b/src/libs/flow/flow_data.hpp
@@ -87,6 +87,7 @@ class FLOW_API Data
 
     void        info(conduit::Node &out) const;
     std::string to_json() const;
+    std::string to_yaml() const;
     void        print() const;
 
 protected:

diff --git a/src/libs/flow/flow_filter.cpp b/src/libs/flow/flow_filter.cpp
@@ -449,11 +449,23 @@ Filter::to_json() const
     return oss.str();
 }
 
+//-----------------------------------------------------------------------------
+std::string
+Filter::to_yaml() const
+{
+    Node out;
+    info(out);
+    ostringstream oss;
+    out.to_yaml_stream(oss);
+    return oss.str();
+}
+
+
 //-----------------------------------------------------------------------------
 void
 Filter::print() const
 {
-    CONDUIT_INFO(to_json());
+    CONDUIT_INFO(to_yaml());
 }
 
 

diff --git a/src/libs/flow/flow_filter.hpp b/src/libs/flow/flow_filter.hpp
@@ -217,7 +217,9 @@ class FLOW_API Filter
     void           info(conduit::Node &out) const;
     /// create json string from info
     std::string    to_json() const;
-    /// print json version of info
+    /// create  yaml string from info
+    std::string    to_yaml() const;
+    /// print yaml version of info
     void           print() const;
 
 

diff --git a/src/libs/flow/flow_graph.cpp b/src/libs/flow/flow_graph.cpp
@@ -135,7 +135,7 @@ Graph::add_filter(const std::string &filter_type,
         CONDUIT_ERROR("Cannot create filter " << f_name
                       << " because verify_params failed." << std::endl
                       << "Details:" << std::endl
-                      << v_info.to_json());
+                      << v_info.to_yaml());
         return NULL;
     }
 
@@ -357,7 +357,7 @@ Graph::connections(Node &out) const
 void
 Graph::add_filters(const Node &filters)
 {
-    CONDUIT_INFO(filters.to_json());
+    // CONDUIT_INFO(filters.to_json());
 
     NodeConstIterator filters_itr = filters.children();
 
@@ -424,7 +424,7 @@ Graph::add_filters(const Node &filters)
 void
 Graph::add_connections(const Node &conns)
 {
-    CONDUIT_INFO(conns.to_json());
+    // CONDUIT_INFO(conns.to_json());
 
     NodeConstIterator conns_itr = conns.children();
     while(conns_itr.has_next())
@@ -702,7 +702,7 @@ Graph::save_dot_html(const std::string &ofile) const
 void
 Graph::print() const
 {
-    CONDUIT_INFO(to_json());
+    CONDUIT_INFO(to_yaml());
 }
 
 

diff --git a/src/libs/flow/flow_registry.cpp b/src/libs/flow/flow_registry.cpp
@@ -588,11 +588,22 @@ Registry::to_json() const
     return oss.str();
 }
 
+//-----------------------------------------------------------------------------
+std::string
+Registry::to_yaml() const
+{
+    Node out;
+    info(out);
+    ostringstream oss;
+    out.to_yaml_stream(oss);
+    return oss.str();
+}
+
 //-----------------------------------------------------------------------------
 void
 Registry::print() const
 {
-    CONDUIT_INFO(to_json());
+    CONDUIT_INFO(to_yaml());
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/libs/flow/flow_registry.hpp b/src/libs/flow/flow_registry.hpp
@@ -137,7 +137,9 @@ class FLOW_API Registry
     void           info(conduit::Node &out) const;
     /// create json string from info
     std::string    to_json() const;
-    /// print json version of info
+    /// create yaml string from info
+    std::string    to_yaml() const;
+    /// print yaml version of info
     void           print() const;
 
 

diff --git a/src/libs/flow/flow_workspace.cpp b/src/libs/flow/flow_workspace.cpp
@@ -387,11 +387,23 @@ Workspace::to_json() const
     return oss.str();
 }
 
+
+//-----------------------------------------------------------------------------
+std::string
+Workspace::to_yaml() const
+{
+    Node out;
+    info(out);
+    ostringstream oss;
+    out.to_yaml_stream(oss);
+    return oss.str();
+}
+
 //-----------------------------------------------------------------------------
 void
 Workspace::print() const
 {
-    CONDUIT_INFO(to_json());
+    CONDUIT_INFO(to_yaml());
 }
 
 //-----------------------------------------------------------------------------
@@ -525,7 +537,7 @@ Workspace::register_filter_type(FilterFactoryMethod fr)
         CONDUIT_ERROR("filter type interface verify failed." << std::endl
                       << f_type_name   << std::endl
                       << "Details:" << std::endl
-                      << v_info.to_json());
+                      << v_info.to_yaml());
     }
 
     f_type_name =i_test["type_name"].as_string();
@@ -577,7 +589,7 @@ Workspace::register_filter_type(const std::string &filter_type_name,
         CONDUIT_ERROR("filter type interface verify failed." << std::endl
                       << f_type_name   << std::endl
                       << "Details:" << std::endl
-                      << v_info.to_json());
+                      << v_info.to_yaml());
     }
 
     f_type_name =i_test["type_name"].as_string();

diff --git a/src/libs/flow/flow_workspace.hpp b/src/libs/flow/flow_workspace.hpp
@@ -74,7 +74,9 @@ class FLOW_API Workspace
     void           info(conduit::Node &out) const;
     /// create json string from info
     std::string    to_json() const;
-    /// print json version of info
+    /// create yaml string from info
+    std::string    to_yaml() const;
+    /// print yaml version of info
     void           print() const;
 
     /// resets state used to capture timing events