Merge issues

src/ngraph/op/softmax.cpp

@@ -28,7 +28,8 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::Softmax::type_info;
+// *** SOFTMAX OP SET 0 ***
+constexpr NodeTypeInfo op::v0::Softmax::type_info;
 
 op::v0::Softmax::Softmax(const Output<Node>& arg, const AxisSet& axes)
     : Op({arg})
@@ -106,7 +107,7 @@ void op::v0::Softmax::generate_adjoints(autodiff::Adjoints& adjoints, const Node
 }
 
 // *** SOFTMAX OP SET V1 ***
-const string op::v1::Softmax::type_name{"Softmax"};
+constexpr NodeTypeInfo op::v1::Softmax::type_info;
 
 op::v1::Softmax::Softmax(const Output<Node>& arg, const size_t axis)
     : Op({arg})

src/ngraph/op/softmax.hpp

@@ -24,18 +24,14 @@ namespace ngraph
     {
         namespace v0
         {
-        public:
-            NGRAPH_API
-            static constexpr NodeTypeInfo type_info{"Softmax", 0};
-            const NodeTypeInfo& get_type_info() const override { return type_info; }
-            Softmax() = default;
-            /// \brief Constructs a softmax operation.
+            /// \brief Softmax operation.
+            ///
             class Softmax : public Op
             {
             public:
                 NGRAPH_API
-                static const std::string type_name;
-                const std::string& description() const override { return type_name; }
+                static constexpr NodeTypeInfo type_info{"Softmax", 0};
+                const NodeTypeInfo& get_type_info() const override { return type_info; }
                 Softmax() = default;
                 /// \brief Constructs a softmax operation.
                 ///
@@ -67,8 +63,8 @@ namespace ngraph
             {
             public:
                 NGRAPH_API
-                static const std::string type_name;
-                const std::string& description() const override { return type_name; }
+                static constexpr NodeTypeInfo type_info{"Softmax", 1};
+                const NodeTypeInfo& get_type_info() const override { return type_info; }
                 Softmax()
                     : m_axis(0)
                 {