Merge branch 'develop' into task/2026_raja_and_friends

Author: cyrush

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Added a macro to make an integer a version number from major, minor, patch version numbers. Example: `CONDUIT_MAKE_VERSION_VALUE(0, 9, 6)`. This macro can be used to conditionally compile code that is valid for specific versions of Conduit.
 - Added `set` methods to `DataAccessor` that take `DataArray`s and `DataAccessor`s.
 - Added optional device execution support via RAJA and Umpire.
+- Added `conduit_bin_yaml` protocol case to `Node::load()` and `Node::save()`. Also added `conduit_bin_json`, which does the same thing as `conduit_bin` (creates a json schema file to go with the `conduit_bin` file).
 
 #### Blueprint
 - Finished `bent_multi_grid_amr` mesh by adding adjacency sets between spatially adjacent domains at the same level of refinement.
@@ -32,6 +33,12 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Updates to use Silo 4.12 and HDF5 2.0.0.
 - Reworked HDF5 handle managment to avoid resource leaks with exceptions.
 
+### Fixed
+
+#### Conduit
+- Fixed a bug preventing explicit length 0 in `yaml` schema.
+- Fixed a bug where empty objects or lists were not written correctly to `yaml` schema.
+
 ## [0.9.5] - Released 2025-09-10
 
 ### Added

src/libs/conduit/conduit_generator.cpp

@@ -1638,7 +1638,6 @@ Generator::Parser::JSON::walk_json_schema_external(Node   *node,
                     {
                         // node is already linked to the schema pointer
                         schema->set(dtype);
-                        schema->print();
                         node->set_data_ptr(data);
                     }
                     else
@@ -2574,7 +2573,7 @@ Generator::Parser::YAML::parse_leaf_dtype(yaml_document_t *yaml_doc,
                 length = get_yaml_sequence_length(value_node);
             }
             // support explicit length 0 in a schema
-            else if (fetch_yaml_node_from_object_by_name(yaml_doc, yaml_node, "number_of_elements"))
+            else if (! fetch_yaml_node_from_object_by_name(yaml_doc, yaml_node, "number_of_elements"))
             {
                 length = 1;
             }
@@ -2696,7 +2695,6 @@ Generator::Parser::YAML::walk_yaml_schema(Node *node,
                         {
                             // node is already linked to the schema pointer
                             schema->set(des_dtype);
-                            schema->print();
                             node->set_data_ptr(data);
                         }
                         else
@@ -3294,7 +3292,7 @@ Generator::data_ptr() const
 
 
 //-----------------------------------------------------------------------------
-// JSON Parsing interface
+// JSON & YAML Parsing interface
 //-----------------------------------------------------------------------------s
 
 
@@ -3304,7 +3302,8 @@ Generator::walk(Schema &schema) const
 {
     schema.reset();
     index_t curr_offset = 0;
-    if (m_protocol.find("json") != std::string::npos)
+
+    auto json_case = [&]()
     {
         conduit_json::Document document;
         std::string res = utils::json_sanitize(m_schema);
@@ -3315,8 +3314,8 @@ Generator::walk(Schema &schema) const
         }
 
         Parser::JSON::walk_json_schema(&schema,document,curr_offset);
-    }
-    else if (m_protocol.find("yaml") != std::string::npos)
+    };
+    auto yaml_case = [&]()
     {
         Parser::YAML::YAMLParserWrapper parser;
         parser.parse(m_schema.c_str());
@@ -3332,6 +3331,64 @@ Generator::walk(Schema &schema) const
                                        curr_offset);
 
         // YAMLParserWrapper cleans up for us
+    };
+
+    std::string error_message;
+    bool schema_walked = false;
+
+    // The protocol is default initialized to json. We choose to prefer
+    // walking based on the protocol but we can fall back if possible.
+    if (m_protocol.find("json") != std::string::npos)
+    {
+        try
+        {
+            json_case();
+            schema_walked = true;
+        }
+        catch (conduit::Error &e_json)
+        {
+            error_message = "JSON schema walk failed: " + e_json.message();
+            try
+            {
+                yaml_case();
+                schema_walked = true;
+            }
+            catch(conduit::Error &e_yaml)
+            {
+                error_message += "\nYAML schema walk failed: " + e_yaml.message();
+            }
+        }
+
+        if (! schema_walked)
+        {
+            CONDUIT_ERROR(error_message);
+        }
+    }
+    else if (m_protocol.find("yaml") != std::string::npos)
+    {
+        try
+        {
+            yaml_case();
+            schema_walked = true;
+        }
+        catch (conduit::Error &e_yaml)
+        {
+            error_message = "YAML schema walk failed: " + e_yaml.message();
+            try
+            {
+                json_case();
+                schema_walked = true;
+            }
+            catch(conduit::Error &e_json)
+            {
+                error_message += "\nJSON schema walk failed: " + e_json.message();
+            }
+        }
+
+        if (! schema_walked)
+        {
+            CONDUIT_ERROR(error_message);
+        }
     }
     else
     {

src/libs/conduit/conduit_generator.hpp

@@ -30,7 +30,7 @@ namespace conduit
 /// class: conduit::Generator
 ///
 /// description:
-///  The Generator class implements parsing logic for json schemas.
+///  The Generator class implements parsing logic for yaml and json schemas.
 ///
 //-----------------------------------------------------------------------------
 class CONDUIT_API Generator
@@ -60,8 +60,12 @@ class CONDUIT_API Generator
     /// protocols:
     ///   "json"
     ///   "conduit_json"
+    ///   "conduit_json_external"
     ///   "conduit_base64_json"
     ///   "yaml"
+    ///   "conduit_yaml"
+    ///   "conduit_yaml_external"
+    ///   "conduit_base64_yaml"
     ///
     Generator(const std::string &schema,
               const std::string &protocol = std::string("conduit_json"),