Merge pull request #4 from nosovmik/mnosov/reader

FrontEndManager - private implementation
nosovmik · Apr 1, 2021 · 658ae1e · 658ae1e
2 parents 3e3e9e3 + bf6324f
commit 658ae1e
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 18 deletions.
diff --git a/ngraph/frontend/generic/include/frontend_manager/frontend_manager.hpp b/ngraph/frontend/generic/include/frontend_manager/frontend_manager.hpp
@@ -312,11 +312,19 @@ enum FrontEndCapabilities {
 class NGRAPH_API FrontEndManager
 {
 public:
-    FrontEndManager () {}
-    FrontEnd::Ptr loadByFramework (const std::string& framework, FrontEndCapabilities fec = FEC_DEFAULT);
-    FrontEnd::Ptr loadByModel (const std::string& path, FrontEndCapabilities fec = FEC_DEFAULT);
-    std::vector<std::string> availableFrontEnds () const;
+    FrontEndManager();
+    ~FrontEndManager();
+    FrontEnd::Ptr loadByFramework(const std::string& framework, FrontEndCapabilities fec = FEC_DEFAULT);
+    FrontEnd::Ptr loadByModel(const std::string& path, FrontEndCapabilities fec = FEC_DEFAULT);
+    std::vector<std::string> availableFrontEnds() const;
+
+    using FrontEndFactory = std::function<FrontEnd::Ptr(FrontEndCapabilities fec)>;
+    void registerFrontEnd(const std::string& name, FrontEndFactory creator);
+private:
+    class Impl;
+    std::unique_ptr<Impl> m_impl;
 };
+
 } // namespace frontend
 
 } // namespace ngraph
diff --git a/ngraph/frontend/generic/src/frontend_manager.cpp b/ngraph/frontend/generic/src/frontend_manager.cpp
@@ -28,6 +28,8 @@ namespace ngraph
     {
 
         #define FRONT_END_NOT_IMPLEMENTED(NAME) throw #NAME " is not implemented for this FrontEnd class";
+        #define FRONT_END_ASSERT(EXPRESSION) \
+            { if (!(EXPRESSION)) throw "AssertionFailed"; }
 
         std::vector<Place::Ptr> InputModel::getInputs () const
         {
@@ -429,26 +431,64 @@ namespace ngraph
             FRONT_END_NOT_IMPLEMENTED(normalize);
         }
 
-        FrontEnd::Ptr FrontEndManager::loadByFramework (const std::string& framework, FrontEndCapabilities fec)
+        //////////////////////////////////////////////////////////////
+        class FrontEndManager::Impl
         {
-            if (framework == "onnx")
-                return std::make_shared<FrontEndONNX>();
-            else if (framework == "pdpd")
-                return std::make_shared<FrontEndPDPD>();
-            else if (framework == "tf")
-                return std::make_shared<FrontEndTensorflow>();
-            else
-                throw "Framework " + framework + " is unknown for FrontEnd manager; cannot load it.";
+            std::map<std::string, FrontEndFactory> m_factories;
+
+            void registerDefault() {
+                registerFrontEnd("onnx", [](FrontEndCapabilities){return std::make_shared<FrontEndONNX>();});
+                registerFrontEnd("pdpd", [](FrontEndCapabilities){return std::make_shared<FrontEndPDPD>();});
+                registerFrontEnd("tf", [](FrontEndCapabilities){return std::make_shared<FrontEndTensorflow>();});
+            }
+        public:
+            Impl() {
+                registerDefault();
+            }
+            ~Impl() = default;
+            FrontEnd::Ptr loadByFramework(const std::string& framework, FrontEndCapabilities fec) {
+                FRONT_END_ASSERT(m_factories.count(framework))
+                return m_factories[framework](fec);
+            }
+
+            std::vector<std::string> availableFrontEnds() const {
+                std::vector<std::string> keys;
+
+                std::transform(m_factories.begin(), m_factories.end(),
+                               std::back_inserter(keys),
+                               [](const std::pair<std::string, FrontEndFactory>& item) {
+                                   return item.first;
+                               });
+                return keys;
+            }
+
+            FrontEnd::Ptr loadByModel (const std::string& path, FrontEndCapabilities fec)
+            {
+                FRONT_END_NOT_IMPLEMENTED(loadByModel);
+            }
+
+            void registerFrontEnd(const std::string& name, FrontEndFactory creator) {
+                m_factories.insert({name, creator});
+            }
+        };
+
+        FrontEndManager::FrontEndManager(): m_impl(new Impl()) {
+        }
+        FrontEndManager::~FrontEndManager() = default;
+
+        FrontEnd::Ptr FrontEndManager::loadByFramework(const std::string& framework, FrontEndCapabilities fec)
+        {
+            return m_impl->loadByFramework(framework, fec);
         }
 
-        FrontEnd::Ptr FrontEndManager::loadByModel (const std::string& path, FrontEndCapabilities fec)
+        FrontEnd::Ptr FrontEndManager::loadByModel(const std::string& path, FrontEndCapabilities fec)
         {
-            FRONT_END_NOT_IMPLEMENTED(loadByModel);
+            return m_impl->loadByModel(path, fec);
         }
 
-        std::vector<std::string> FrontEndManager::availableFrontEnds () const
+        std::vector<std::string> FrontEndManager::availableFrontEnds() const
         {
-            return {"onnx", "pdpd", "tf"};
+            return m_impl->availableFrontEnds();
         }
     } // namespace frontend
 

diff --git a/ngraph/frontend/paddlepaddle/src/frontend.cpp b/ngraph/frontend/paddlepaddle/src/frontend.cpp
@@ -16,6 +16,7 @@
 
 
 #include <algorithm>
+#include <numeric>
 #include <chrono>
 #include <memory>
 #include <map>
@@ -203,4 +204,4 @@ std::shared_ptr<ngraph::Function> ngraph::frontend::FrontEndPDPD::convert(InputM
 }
 
 }
-}
+}
diff --git a/ngraph/frontend/tensorflow/src/ngraph_builder.cpp b/ngraph/frontend/tensorflow/src/ngraph_builder.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  *******************************************************************************/
 
+#include <numeric>
 #include "graph.pb.h"
 #include "tensor.pb.h"