Move ideep ops from caffe2/contrib/ideep to caffe2/ideep (#7112)

caffe2/CMakeLists.txt

@@ -13,6 +13,7 @@ add_subdirectory(cuda_rtc)
 add_subdirectory(db)
 add_subdirectory(distributed)
 # add_subdirectory(experiments) # note, we may remove this folder at some point
+add_subdirectory(ideep)
 add_subdirectory(image)
 add_subdirectory(video)
 add_subdirectory(mkl)

caffe2/contrib/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_subdirectory(aten)
 add_subdirectory(gloo)
-add_subdirectory(ideep)
 add_subdirectory(nccl)
 add_subdirectory(opencl)
 add_subdirectory(prof)

caffe2/ideep/ideep_utils.h

@@ -4,8 +4,8 @@
 
 // All caffe2 ideep related headers
 #include <ideep.hpp>
-#include <caffe2/contrib/ideep/utils/ideep_context.h>
-#include <caffe2/contrib/ideep/utils/ideep_operator.h>
+#include <caffe2/ideep/utils/ideep_context.h>
+#include <caffe2/ideep/utils/ideep_operator.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/concat_split_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/conv_fusion_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/operators/conv_pool_base_op.h>
+#include <caffe2/ideep/operators/conv_pool_base_op.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/conv_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/operators/conv_pool_base_op.h>
+#include <caffe2/ideep/operators/conv_pool_base_op.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/conv_pool_base_op.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 #include <caffe2/operators/conv_pool_op_base.h>
 
 namespace caffe2 {

caffe2/ideep/operators/dropout_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/elementwise_sum_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/fully_connected_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/local_response_normalization_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/operator_fallback_ideep.cc

@@ -1,5 +1,5 @@
-#include <caffe2/contrib/ideep/operators/operator_fallback_ideep.h>
-#include <caffe2/contrib/ideep/utils/ideep_operator.h>
+#include <caffe2/ideep/operators/operator_fallback_ideep.h>
+#include <caffe2/ideep/utils/ideep_operator.h>
 
 #include <caffe2/operators/cross_entropy_op.h>
 #include <caffe2/operators/filler_op.h>

caffe2/ideep/operators/operator_fallback_ideep.h

@@ -3,7 +3,7 @@
 #include <caffe2/core/common.h>
 #include <caffe2/core/context.h>
 #include <caffe2/core/operator.h>
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 #include <caffe2/proto/caffe2.pb.h>
 
 namespace caffe2 {

caffe2/ideep/operators/pool_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/operators/conv_pool_base_op.h>
+#include <caffe2/ideep/operators/conv_pool_base_op.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/relu_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/ideep/operators/spatial_batch_norm_op.cc

@@ -1,4 +1,4 @@
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 

caffe2/python/pybind_state_ideep.cc

@@ -9,7 +9,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <caffe2/contrib/ideep/ideep_utils.h>
+#include <caffe2/ideep/ideep_utils.h>
 
 namespace caffe2 {
 namespace python {