[enco] caffe/frontend: rename Op to Layer (#2582)

This will rename "Op" to "Layer" for folder name and lookup parameter

Signed-off-by: SaeHie Park <saehie.park@samsung.com>

diff --git a/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.cpp b/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.cpp
index c7ff371..075b14f 100644 (file)
--- a/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.cpp
+++ b/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.cpp
@@ -16,13 +16,13 @@
 
 #include "GraphBuilderRegistry.h"
 
-#include "Op/Concatenation.h"
-#include "Op/Convolution.h"
-#include "Op/Eltwise.h"
-#include "Op/Input.h"
-#include "Op/Pooling.h"
-#include "Op/ReLU.h"
-#include "Op/Scale.h"
+#include "Layer/Concatenation.h"
+#include "Layer/Convolution.h"
+#include "Layer/Eltwise.h"
+#include "Layer/Input.h"
+#include "Layer/Pooling.h"
+#include "Layer/ReLU.h"
+#include "Layer/Scale.h"
 
 #include <stdex/Memory.h>
 

diff --git a/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.h b/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.h
index c32a4a6..407ddbb 100644 (file)
--- a/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.h
+++ b/contrib/enco/frontend/caffe/src/GraphBuilderRegistry.h
@@ -28,12 +28,12 @@ namespace caffeimport
 class GraphBuilderRegistry
 {
 public:
-  const GraphBuilder *lookup(std::string op) const
+  const GraphBuilder *lookup(std::string layer) const
   {
-    if (_builder_map.find(op) == _builder_map.end())
+    if (_builder_map.find(layer) == _builder_map.end())
       return nullptr;
 
-    return _builder_map.at(op).get();
+    return _builder_map.at(layer).get();
   }
 
   static GraphBuilderRegistry &get()

diff --git a/contrib/enco/frontend/caffe/src/Op/Concatenation.cpp b/contrib/enco/frontend/caffe/src/Layer/Concatenation.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Concatenation.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Concatenation.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Concatenation.h b/contrib/enco/frontend/caffe/src/Layer/Concatenation.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Concatenation.h
rename to contrib/enco/frontend/caffe/src/Layer/Concatenation.h

diff --git a/contrib/enco/frontend/caffe/src/Op/Convolution.cpp b/contrib/enco/frontend/caffe/src/Layer/Convolution.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Convolution.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Convolution.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Convolution.h b/contrib/enco/frontend/caffe/src/Layer/Convolution.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Convolution.h
rename to contrib/enco/frontend/caffe/src/Layer/Convolution.h

diff --git a/contrib/enco/frontend/caffe/src/Op/Eltwise.cpp b/contrib/enco/frontend/caffe/src/Layer/Eltwise.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Eltwise.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Eltwise.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Eltwise.h b/contrib/enco/frontend/caffe/src/Layer/Eltwise.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Eltwise.h
rename to contrib/enco/frontend/caffe/src/Layer/Eltwise.h

diff --git a/contrib/enco/frontend/caffe/src/Op/Input.cpp b/contrib/enco/frontend/caffe/src/Layer/Input.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Input.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Input.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Input.h b/contrib/enco/frontend/caffe/src/Layer/Input.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Input.h
rename to contrib/enco/frontend/caffe/src/Layer/Input.h

diff --git a/contrib/enco/frontend/caffe/src/Op/Pooling.cpp b/contrib/enco/frontend/caffe/src/Layer/Pooling.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Pooling.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Pooling.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Pooling.h b/contrib/enco/frontend/caffe/src/Layer/Pooling.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Pooling.h
rename to contrib/enco/frontend/caffe/src/Layer/Pooling.h

diff --git a/contrib/enco/frontend/caffe/src/Op/ReLU.cpp b/contrib/enco/frontend/caffe/src/Layer/ReLU.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/ReLU.cpp
rename to contrib/enco/frontend/caffe/src/Layer/ReLU.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/ReLU.h b/contrib/enco/frontend/caffe/src/Layer/ReLU.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/ReLU.h
rename to contrib/enco/frontend/caffe/src/Layer/ReLU.h

diff --git a/contrib/enco/frontend/caffe/src/Op/Scale.cpp b/contrib/enco/frontend/caffe/src/Layer/Scale.cpp
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Scale.cpp
rename to contrib/enco/frontend/caffe/src/Layer/Scale.cpp

diff --git a/contrib/enco/frontend/caffe/src/Op/Scale.h b/contrib/enco/frontend/caffe/src/Layer/Scale.h
similarity index 100%
rename from contrib/enco/frontend/caffe/src/Op/Scale.h
rename to contrib/enco/frontend/caffe/src/Layer/Scale.h