Skip to content

Commit

Permalink
Move ideep ops from caffe2/contrib/ideep to caffe2/ideep (pytorch#7112)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yinghai Lu authored May 1, 2018
1 parent b2cdd08 commit 150af6a
Show file tree
Hide file tree
Showing 21 changed files with 18 additions and 18 deletions.
1 change: 1 addition & 0 deletions caffe2/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion caffe2/contrib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
add_subdirectory(aten)
add_subdirectory(gloo)
add_subdirectory(ideep)
add_subdirectory(nccl)
add_subdirectory(opencl)
add_subdirectory(prof)
Expand Down
0 caffe2/contrib/ideep/CMakeLists.txt → caffe2/ideep/CMakeLists.txt
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions caffe2/contrib/ideep/ideep_utils.h → caffe2/ideep/ideep_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ontrib/ideep/operators/concat_split_op.cc → caffe2/ideep/operators/concat_split_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
2 changes: 1 addition & 1 deletion ...contrib/ideep/operators/conv_fusion_op.cc → caffe2/ideep/operators/conv_fusion_op.cc
View file
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/ideep/operators/conv_op.cc → caffe2/ideep/operators/conv_op.cc
View file
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ntrib/ideep/operators/conv_pool_base_op.h → caffe2/ideep/operators/conv_pool_base_op.h
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/ideep/operators/dropout_op.cc → caffe2/ideep/operators/dropout_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
2 changes: 1 addition & 1 deletion ...rib/ideep/operators/elementwise_sum_op.cc → caffe2/ideep/operators/elementwise_sum_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
2 changes: 1 addition & 1 deletion ...rib/ideep/operators/fully_connected_op.cc → caffe2/ideep/operators/fully_connected_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
2 changes: 1 addition & 1 deletion ...rators/local_response_normalization_op.cc → ...rators/local_response_normalization_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
4 changes: 2 additions & 2 deletions ...deep/operators/operator_fallback_ideep.cc → ...deep/operators/operator_fallback_ideep.cc
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ideep/operators/operator_fallback_ideep.h → ...ideep/operators/operator_fallback_ideep.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/ideep/operators/pool_op.cc → caffe2/ideep/operators/pool_op.cc
View file
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/ideep/operators/relu_op.cc → caffe2/ideep/operators/relu_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
2 changes: 1 addition & 1 deletion .../ideep/operators/spatial_batch_norm_op.cc → .../ideep/operators/spatial_batch_norm_op.cc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <caffe2/contrib/ideep/ideep_utils.h>
#include <caffe2/ideep/ideep_utils.h>

namespace caffe2 {

Expand Down
0 caffe2/contrib/ideep/utils/ideep_context.h → caffe2/ideep/utils/ideep_context.h
View file
File renamed without changes.
0 caffe2/contrib/ideep/utils/ideep_operator.h → caffe2/ideep/utils/ideep_operator.h
View file
File renamed without changes.
0 caffe2/contrib/ideep/utils/ideep_register.cc → caffe2/ideep/utils/ideep_register.cc
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion caffe2/python/pybind_state_ideep.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 150af6a

Please sign in to comment.