Move Transform from Contrib to Core

Summary:
In order to pybind, we need transform in core.

It's a basically finished product, with a big test suite. It's safe.

We can begin hooking up observers after this, and I have a diff coming up that pybinds some apply_transform function.

Reviewed By: bwasti

Differential Revision: D5522200

fbshipit-source-id: dea6aa606fc689af84e2533569d1ef348cb5f3f2

CMakeLists.txt

@@ -46,7 +46,6 @@ option(USE_REDIS "Use Redis" OFF)
 option(USE_MPI "Use MPI" ON)
 option(USE_GLOO "Use Gloo" ON)
 option(USE_OBSERVERS "Use Observer Library" OFF)
-option(USE_TRANSFORMS "Use Graph Transforms" OFF)
 option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON)
 option(USE_OPENMP "Use OpenMP for parallel code" ON)
 option(BUILD_PYTHON "Build Python binaries" ON)

caffe2/CMakeLists.txt

@@ -33,6 +33,7 @@ add_subdirectory(python)
 add_subdirectory(queue)
 add_subdirectory(sgd)
 # add_subdirectory(test) # todo: use caffe2_gtest_main instead of gtest_main because we will need to call GlobalInit
+add_subdirectory(transforms)
 add_subdirectory(utils)
 
 # Advanced: if we have white list specified, we will do intersections for all
@@ -282,4 +283,3 @@ endif()
 if (BUILD_BINARY)
   add_subdirectory(binaries)
 endif()
-

caffe2/contrib/CMakeLists.txt

@@ -3,7 +3,6 @@ add_subdirectory(nccl)
 add_subdirectory(nnpack)
 add_subdirectory(observers)
 add_subdirectory(shm_mutex)
-add_subdirectory(transform)
 # Finally pass the src lists back to the parent
 
 # CPU source, test sources, binary sources

caffe2/contrib/transform/CMakeLists.txt

@@ -1,12 +0,0 @@
-if(USE_TRANSFORMS)
-  add_subdirectory(transforms)
-  message(STATUS "Include Graph Transformations")
-  set(Caffe2_CONTRIB_TRANSFORMS_CPU_SRC
-    "${CMAKE_CURRENT_SOURCE_DIR}/transform.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/pattern_net_transform.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/graph.cc"
-  )
-
-  set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${Caffe2_TRANSFORMS_CPU_SRC})
-  set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} PARENT_SCOPE)
-endif()

caffe2/core/graph.cc

@@ -1,4 +1,4 @@
-#include "caffe2/contrib/transform/graph.h"
+#include "caffe2/core/graph.h"
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"

caffe2/core/graph_test.cc

@@ -1,6 +1,6 @@
 #include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
-#include "caffe2/contrib/transform/graph.h"
+#include "caffe2/core/graph.h"
 #include "caffe2/core/net.h"
 #include "caffe2/core/operator.h"
 

caffe2/core/transform.cc

@@ -1,4 +1,4 @@
-#include "caffe2/contrib/transform/transform.h"
+#include "caffe2/core/transform.h"
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"

caffe2/core/transform.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "caffe2/contrib/transform/graph.h"
 #include "caffe2/core/common.h"
+#include "caffe2/core/graph.h"
 #include "caffe2/proto/caffe2.pb.h"
 #include "caffe2/utils/proto_utils.h"
 

caffe2/core/transform_test.cc

@@ -1,8 +1,8 @@
 #include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
-#include "caffe2/contrib/transform/transform.h"
 #include "caffe2/core/net.h"
 #include "caffe2/core/operator.h"
+#include "caffe2/core/transform.h"
 
 namespace caffe2 {
 

caffe2/transforms/conv_to_nnpack_transform.cc

@@ -0,0 +1,7 @@
+#include "caffe2/transforms/conv_to_nnpack_transform.h"
+
+namespace caffe2 {
+
+REGISTER_TRANSFORM(ConvToNNPack, ConvToNNPackTransform);
+
+} // namespace caffe2

caffe2/transforms/conv_to_nnpack_transform.h

@@ -1,9 +1,8 @@
 #pragma once
 
-#include "caffe2/contrib/transform/transform.h"
-#include "caffe2/contrib/transform/transforms/single_op_transform.h"
 #include "caffe2/core/common.h"
 #include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/transforms/single_op_transform.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
@@ -23,6 +22,4 @@ class ConvToNNPackTransform : public SingleOpTransform {
   }
 };
 
-REGISTER_TRANSFORM(ConvToNNPack, ConvToNNPackTransform);
-
 } // namespace caffe2

caffe2/transforms/conv_to_nnpack_transform_test.cc

@@ -1,9 +1,8 @@
 #include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
-#include "caffe2/contrib/transform/transform.h"
-#include "caffe2/contrib/transform/transforms/conv_to_nnpack_transform.h"
 #include "caffe2/core/net.h"
 #include "caffe2/core/operator.h"
+#include "caffe2/transforms/conv_to_nnpack_transform.h"
 
 namespace caffe2 {
 

caffe2/transforms/pattern_net_transform.cc

@@ -1,4 +1,4 @@
-#include "caffe2/contrib/transform/transforms/pattern_net_transform.h"
+#include "caffe2/transforms/pattern_net_transform.h"
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"

caffe2/transforms/pattern_net_transform.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "caffe2/contrib/transform/transform.h"
 #include "caffe2/core/common.h"
+#include "caffe2/core/transform.h"
 #include "caffe2/proto/caffe2.pb.h"
 #include "caffe2/utils/proto_utils.h"
 

caffe2/transforms/pattern_net_transform_test.cc

@@ -1,8 +1,8 @@
 #include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
-#include "caffe2/contrib/transform/transforms/pattern_net_transform.h"
 #include "caffe2/core/net.h"
 #include "caffe2/core/operator.h"
+#include "caffe2/transforms/pattern_net_transform.h"
 
 namespace caffe2 {
 

caffe2/transforms/single_op_transform.cc

@@ -1,4 +1,4 @@
-#include "caffe2/contrib/transform/transforms/single_op_transform.h"
+#include "caffe2/transforms/single_op_transform.h"
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"

caffe2/transforms/single_op_transform.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "caffe2/contrib/transform/transform.h"
 #include "caffe2/core/common.h"
+#include "caffe2/core/transform.h"
 #include "caffe2/proto/caffe2.pb.h"
 #include "caffe2/utils/proto_utils.h"