Force correct initialization order for ctors (#1666)

src/ngraph/runtime/cpu/cpu_builder.cpp

@@ -362,10 +362,15 @@ namespace ngraph
 
 #define TI(x) type_index(typeid(x))
 
-            BuildOpMap build_dispatcher{
-                {TI(ngraph::op::Parameter), &runtime::cpu::Builder::nop},
-                {TI(ngraph::runtime::cpu::op::ConvertLayout),
-                 &runtime::cpu::Builder::build<ngraph::runtime::cpu::op::ConvertLayout>}};
+            BuildOpMap& GetGlobalBuildDispatcher()
+            {
+                static BuildOpMap build_dispatcher{
+                    {TI(ngraph::op::Parameter), &runtime::cpu::Builder::nop},
+                    {TI(ngraph::runtime::cpu::op::ConvertLayout),
+                     &runtime::cpu::Builder::build<ngraph::runtime::cpu::op::ConvertLayout>}};
+
+                return build_dispatcher;
+            }
 
             REGISTER_OP_BUILDER(Constant);
             REGISTER_OP_BUILDER(Result);

src/ngraph/runtime/cpu/cpu_builder.hpp

@@ -220,8 +220,8 @@
     {                                                                                              \
         __register_##OP##_builder()                                                                \
         {                                                                                          \
-            build_dispatcher.insert({type_index(typeid(ngraph::op::OP)),                           \
-                                     &runtime::cpu::Builder::build<ngraph::op::OP>});              \
+            GetGlobalBuildDispatcher().insert({type_index(typeid(ngraph::op::OP)),                 \
+                                               &runtime::cpu::Builder::build<ngraph::op::OP>});    \
         }                                                                                          \
     } __register_##OP##_builder_instance;
 
@@ -239,7 +239,7 @@ namespace ngraph
 
             using BuildOpMap = std::unordered_map<std::type_index, BuildOpFunction>;
 
-            extern BuildOpMap build_dispatcher;
+            BuildOpMap& GetGlobalBuildDispatcher();
 
             class Builder
             {

src/ngraph/runtime/cpu/cpu_external_function.cpp

@@ -1257,8 +1257,8 @@ void runtime::cpu::CPU_ExternalFunction::build()
         }
         auto& n = *node; // Work around a compiler warning (*node inside typeid may have effects
         // with shared pointers, which is fine here but clang doesn't like it.)
-        auto handler = build_dispatcher.find(type_index(typeid(n)));
-        if (handler == build_dispatcher.end())
+        auto handler = GetGlobalBuildDispatcher().find(type_index(typeid(n)));
+        if (handler == GetGlobalBuildDispatcher().end())
         {
             throw unsupported_op(node->description());
         }