odb: remove more indirect includes

Signed-off-by: Rafael Moresco <[email protected]>

Author: rafaelmoresco

src/odb/src/3dblox/baseWriter.cpp

@@ -3,11 +3,13 @@
 
 #include "baseWriter.h"
 
+#include <yaml-cpp/yaml.h>
+
 #include <cstddef>
 #include <fstream>
-#include <sstream>
 #include <string>
 
+#include "odb/db.h"
 #include "odb/defout.h"
 #include "odb/lefout.h"
 #include "utl/Logger.h"

src/odb/src/3dblox/baseWriter.h

@@ -3,12 +3,10 @@
 
 #pragma once
 
-#include <yaml-cpp/node/node.h>
 #include <yaml-cpp/yaml.h>
 
 #include <string>
 
-#include "objects.h"
 #include "odb/db.h"
 #include "odb/dbObject.h"
 #include "odb/dbShape.h"

src/odb/src/3dblox/chipletHierarchy.h

@@ -5,7 +5,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 #include <vector>
 
 #include "odb/db.h"

src/odb/src/3dblox/dbvWriter.cpp

@@ -3,14 +3,17 @@
 
 #include "dbvWriter.h"
 
-#include <yaml-cpp/yaml.h>
+#include <yaml-cpp/emitterstyle.h>
+#include <yaml-cpp/node/node.h>
 
 #include <filesystem>
 #include <set>
 #include <sstream>
 #include <string>
+#include <vector>
 
 #include "baseWriter.h"
+#include "chipletHierarchy.h"
 #include "odb/db.h"
 #include "odb/geom.h"
 #include "utl/Logger.h"

src/odb/src/3dblox/dbvWriter.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <yaml-cpp/node/node.h>
+
 #include <string>
 #include <vector>
 

src/odb/src/3dblox/dbxWriter.cpp

@@ -3,9 +3,13 @@
 
 #include "dbxWriter.h"
 
-#include <fstream>
+#include <yaml-cpp/emitterstyle.h>
+#include <yaml-cpp/node/node.h>
+
+#include <string>
 
 #include "baseWriter.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {
@@ -110,10 +114,11 @@ void DbxWriter::writeStackInstance(YAML::Node& stack_instance_node,
   auto offset_x = chiplet->getOffset().getX() / db->getDbuPerMicron();
   auto offset_y = chiplet->getOffset().getY() / db->getDbuPerMicron();
 
-  YAML::Emitter loc_out;
-  loc_out << YAML::Flow << YAML::BeginSeq << offset_x << offset_y
-          << YAML::EndSeq;
-  stack_instance_node["loc"] = YAML::Load(loc_out.c_str());
+  YAML::Node loc_out;
+  loc_out.SetStyle(YAML::EmitterStyle::Flow);
+  loc_out.push_back(offset_x);
+  loc_out.push_back(offset_y);
+  stack_instance_node["loc"] = loc_out;
 
   stack_instance_node["z"] = 0.0;        // TODO: Calculate proper z position
   stack_instance_node["orient"] = "R0";  // TODO: Get proper orientation

src/odb/src/3dblox/dbxWriter.h

@@ -3,11 +3,9 @@
 
 #pragma once
 
-#include <yaml-cpp/yaml.h>
+#include <yaml-cpp/node/node.h>
 
-#include <map>
 #include <string>
-#include <vector>
 
 #include "baseWriter.h"
 #include "odb/db.h"