op:注册op

Author: miaobyte

excuter/op-mem-ompsimd/src/client/yml.cpp

@@ -5,7 +5,7 @@ namespace  client
 {
     using namespace deepx::op;
     using namespace deepx::mem;
-    shared_ptr<OpBase> parse(const char *yml)
+    Op parse(const char *yml)
     {
         YAML::Node config = YAML::Load(yml);
 
@@ -27,10 +27,8 @@ namespace  client
             returns_grad = config["returns_grad"].as<std::vector<std::string>>();
         }
 
-        // 通过工厂创建OP
-        auto op = OpFactory::Create(opname, dtype, args, returns,
-                                    require_grad, args_grad, returns_grad);
-
+        Op op;
+        op.init(opname+dtype, args, returns, require_grad, args_grad, returns_grad);
         return op;
     }
 }

excuter/op-mem-ompsimd/src/client/yml.hpp

@@ -10,6 +10,6 @@ namespace client
 {
     using namespace deepx::op;
     using namespace std;
-    shared_ptr<OpBase> parse(const char *yml);
+    Op parse(const char *yml);
 }
 #endif

excuter/op-mem-ompsimd/src/deepx/op/concat.hpp

@@ -7,25 +7,24 @@
 namespace deepx::op
 {
     template <typename T>
-    class Concat : public Op<T>
+    class Concat : public OpT<T>
     {
     public:
-        Concat(std::vector<string> input,string output,int axis)
-        {
-            this->name = std::string("concat") + "_" + dtype<T>::name();
-            this->args = input;
-            this->returns.push_back(output);
-            std::string axisstr=std::to_string(axis);
-            this->args.push_back(axisstr);
-        };
+        Concat(vector< string> args, vector< string> returns, bool require_grad = false, vector< string> args_grad = {}, vector< string> returns_grad = {}){
+            this->init("concat", args, returns, require_grad, args_grad, returns_grad);
+        }
+        Concat(initializer_list< string> args, initializer_list< string> returns, bool require_grad = false, initializer_list< string> args_grad = {}, initializer_list< string> returns_grad = {}){
+            this->init("concat", args, returns, require_grad, args_grad, returns_grad);
+        }
         void forward(mem::Mem<T> &mem) override
         {
             std::vector<Tensor<T>*> input;
             for (int i=0;i<this->args.size()-1;i++){
                 input.push_back(mem.get(this->args[i]).get());
             }
             auto output = mem.get(this->returns[0]).get();
-            int axis = std::stoi(this->args.back());
+ 
+            int axis = mem.get<int>(this->args.back());
             cpu::concat(input,axis,*output);
         };
         void backward(mem::Mem<T> &mem) override
@@ -34,7 +33,7 @@ namespace deepx::op
             for (int i=0;i<this->args.size()-1;i++){
                 input.push_back(mem.get(this->args[i]).get());
             }
-            int axis = std::stoi(this->args.back());
+            int axis = mem.get<int>(this->args.back());
             auto output = mem.get(this->returns[0]).get();
             cpu::split(output,axis,input);
         };