Don't leave output serialization shapes set. (#3824)

src/ngraph/serializer.cpp

@@ -172,6 +172,11 @@ void ngraph::set_serialize_output_shapes(bool enable)
     s_serialize_output_shapes_enabled = enable;
 }
 
+bool ngraph::get_serialize_output_shapes()
+{
+    return s_serialize_output_shapes_enabled;
+}
+
 // This expands the op list in op_tbl.hpp into a list of enumerations that look like this:
 // Abs,
 // Acos,

src/ngraph/serializer.hpp

@@ -61,4 +61,22 @@ namespace ngraph
     ///
     /// Option may be enabled by setting the environment variable NGRAPH_SERIALIZER_OUTPUT_SHAPES
     void set_serialize_output_shapes(bool enable);
+    bool get_serialize_output_shapes();
+
+    class WithSerializeOutputShapesEnabled
+    {
+    public:
+        WithSerializeOutputShapesEnabled(bool enabled = true)
+        {
+            m_serialize_output_shapes_enabled = get_serialize_output_shapes();
+            set_serialize_output_shapes(enabled);
+        }
+        ~WithSerializeOutputShapesEnabled()
+        {
+            set_serialize_output_shapes(m_serialize_output_shapes_enabled);
+        }
+
+    private:
+        bool m_serialize_output_shapes_enabled;
+    };
 }

test/serialize.cpp

@@ -209,7 +209,7 @@ TEST(benchmark, serialize)
     timer.stop();
     cout << "deserialize took " << timer.get_milliseconds() << "ms\n";
 
-    ngraph::set_serialize_output_shapes(true);
+    WithSerializeOutputShapesEnabled serialize_outputs(true);
     ofstream out("test.json");
     out << serialize(f, 4);
 }