Move c10 dispatcher back to ATen/core (#16050)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/16050

The c10 dispatcher will (soon) depend on IValue and IValue can't be moved to c10 yet because it depends on at::Tensor, which depends on legacy Type dispatch and we don't want the legacy dispatch in c10.

So instead, we move the c10 dispatcher back to ATen/core until we can actually move at::Tensor to c10.

Reviewed By: ezyang

Differential Revision: D13684517

fbshipit-source-id: 1125f4254223907c52f96ff73034f6d4ae9fd0a7

diff --git a/aten/src/ATen/core/CMakeLists.txt b/aten/src/ATen/core/CMakeLists.txt
index 59149be..02160a7 100644 (file)
--- a/aten/src/ATen/core/CMakeLists.txt
+++ b/aten/src/ATen/core/CMakeLists.txt
@@ -1,9 +1,9 @@
 # This file solely exists to let Caffe2 Android build get at the list
 # of core files without having to trundle through all of ATen's CMakeLists.txt
 
-FILE(GLOB ATen_CORE_HEADERS "*.h")
-FILE(GLOB ATen_CORE_SRCS "*.cpp")
-FILE(GLOB ATen_CORE_TEST_SRCS "*_test.cpp")
+FILE(GLOB_RECURSE ATen_CORE_HEADERS "*.h")
+FILE(GLOB_RECURSE ATen_CORE_SRCS "*.cpp")
+FILE(GLOB_RECURSE ATen_CORE_TEST_SRCS "*_test.cpp")
 EXCLUDE(ATen_CORE_SRCS "${ATen_CORE_SRCS}" ${ATen_CORE_TEST_SRCS})
 
 # Pass to parent

diff --git a/aten/src/ATen/core/dispatch/DeviceId.cpp b/aten/src/ATen/core/dispatch/DeviceId.cpp
new file mode 100644 (file)
index 0000000..7c65fbe
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/DeviceId.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/DeviceId.h>

diff --git a/c10/core/dispatch/DeviceId.h b/aten/src/ATen/core/dispatch/DeviceId.h
similarity index 100%
rename from c10/core/dispatch/DeviceId.h
rename to aten/src/ATen/core/dispatch/DeviceId.h

diff --git a/aten/src/ATen/core/dispatch/DispatchKey.cpp b/aten/src/ATen/core/dispatch/DispatchKey.cpp
new file mode 100644 (file)
index 0000000..33e8e29
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/DispatchKey.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/DispatchKey.h>

diff --git a/c10/core/dispatch/DispatchKey.h b/aten/src/ATen/core/dispatch/DispatchKey.h
similarity index 97%
rename from c10/core/dispatch/DispatchKey.h
rename to aten/src/ATen/core/dispatch/DispatchKey.h
index bb691bf..7c6cf15 100644 (file)
--- a/c10/core/dispatch/DispatchKey.h
+++ b/aten/src/ATen/core/dispatch/DispatchKey.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <c10/core/dispatch/DeviceId.h>
-#include <c10/core/dispatch/LayoutId.h>
+#include <ATen/core/dispatch/DeviceId.h>
+#include <ATen/core/dispatch/LayoutId.h>
 #include <c10/util/typeid.h>
 
 #include <vector>

diff --git a/aten/src/ATen/core/dispatch/DispatchTable.cpp b/aten/src/ATen/core/dispatch/DispatchTable.cpp
new file mode 100644 (file)
index 0000000..0bf7c59
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/DispatchTable.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/DispatchTable.h>

diff --git a/c10/core/dispatch/DispatchTable.h b/aten/src/ATen/core/dispatch/DispatchTable.h
similarity index 99%
rename from c10/core/dispatch/DispatchTable.h
rename to aten/src/ATen/core/dispatch/DispatchTable.h
index 936d780..77d782e 100644 (file)
--- a/c10/core/dispatch/DispatchTable.h
+++ b/aten/src/ATen/core/dispatch/DispatchTable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/OpSchema.h>
+#include <ATen/core/dispatch/OpSchema.h>
 #include <c10/util/LeftRight.h>
 #include <c10/util/Metaprogramming.h>
 #include <c10/util/flat_hash_map.h>

diff --git a/aten/src/ATen/core/dispatch/Dispatcher.cpp b/aten/src/ATen/core/dispatch/Dispatcher.cpp
new file mode 100644 (file)
index 0000000..9f76d8d
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/Dispatcher.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/Dispatcher.h>

diff --git a/c10/core/dispatch/Dispatcher.h b/aten/src/ATen/core/dispatch/Dispatcher.h
similarity index 97%
rename from c10/core/dispatch/Dispatcher.h
rename to aten/src/ATen/core/dispatch/Dispatcher.h
index c57d943..78eb105 100644 (file)
--- a/c10/core/dispatch/Dispatcher.h
+++ b/aten/src/ATen/core/dispatch/Dispatcher.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/DispatchTable.h>
+#include <ATen/core/dispatch/DispatchTable.h>
 
 namespace c10 {
 

diff --git a/aten/src/ATen/core/dispatch/KernelRegistration.cpp b/aten/src/ATen/core/dispatch/KernelRegistration.cpp
new file mode 100644 (file)
index 0000000..0848300
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/KernelRegistration.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/KernelRegistration.h>

diff --git a/c10/core/dispatch/KernelRegistration.h b/aten/src/ATen/core/dispatch/KernelRegistration.h
similarity index 98%
rename from c10/core/dispatch/KernelRegistration.h
rename to aten/src/ATen/core/dispatch/KernelRegistration.h
index 5b3c9e7..6141a5f 100644 (file)
--- a/c10/core/dispatch/KernelRegistration.h
+++ b/aten/src/ATen/core/dispatch/KernelRegistration.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <c10/util/Optional.h>
-#include <c10/core/dispatch/Dispatcher.h>
-#include <c10/core/dispatch/OpSchema.h>
+#include <ATen/core/dispatch/Dispatcher.h>
+#include <ATen/core/dispatch/OpSchema.h>
 
 /**
  * To register your own kernel for an operator, do in one (!) cpp file:

diff --git a/aten/src/ATen/core/dispatch/LayoutId.cpp b/aten/src/ATen/core/dispatch/LayoutId.cpp
new file mode 100644 (file)
index 0000000..bee71d8
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/LayoutId.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/LayoutId.h>

diff --git a/c10/core/dispatch/LayoutId.h b/aten/src/ATen/core/dispatch/LayoutId.h
similarity index 100%
rename from c10/core/dispatch/LayoutId.h
rename to aten/src/ATen/core/dispatch/LayoutId.h

diff --git a/aten/src/ATen/core/dispatch/OpSchema.cpp b/aten/src/ATen/core/dispatch/OpSchema.cpp
new file mode 100644 (file)
index 0000000..5959895
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/OpSchema.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/OpSchema.h>

diff --git a/c10/core/dispatch/OpSchema.h b/aten/src/ATen/core/dispatch/OpSchema.h
similarity index 99%
rename from c10/core/dispatch/OpSchema.h
rename to aten/src/ATen/core/dispatch/OpSchema.h
index 73ec4fe..ad2c767 100644 (file)
--- a/c10/core/dispatch/OpSchema.h
+++ b/aten/src/ATen/core/dispatch/OpSchema.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/DispatchKey.h>
+#include <ATen/core/dispatch/DispatchKey.h>
 #include <c10/util/Array.h>
 #include <c10/util/Metaprogramming.h>
 #include <c10/core/DeviceType.h>

diff --git a/aten/src/ATen/core/dispatch/OpSchemaRegistration.cpp b/aten/src/ATen/core/dispatch/OpSchemaRegistration.cpp
new file mode 100644 (file)
index 0000000..f153b5e
--- /dev/null
+++ b/aten/src/ATen/core/dispatch/OpSchemaRegistration.cpp
@@ -0,0 +1 @@
+#include <ATen/core/dispatch/OpSchemaRegistration.h>

diff --git a/c10/core/dispatch/OpSchemaRegistration.h b/aten/src/ATen/core/dispatch/OpSchemaRegistration.h
similarity index 94%
rename from c10/core/dispatch/OpSchemaRegistration.h
rename to aten/src/ATen/core/dispatch/OpSchemaRegistration.h
index dc81c05..29ecde2 100644 (file)
--- a/c10/core/dispatch/OpSchemaRegistration.h
+++ b/aten/src/ATen/core/dispatch/OpSchemaRegistration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/Dispatcher.h>
+#include <ATen/core/dispatch/Dispatcher.h>
 
 // TODO Better error message when this definition is missing
 

diff --git a/c10/test/core/dispatch/OpSchema_test.cpp b/aten/src/ATen/core/dispatch/OpSchema_test.cpp
similarity index 96%
rename from c10/test/core/dispatch/OpSchema_test.cpp
rename to aten/src/ATen/core/dispatch/OpSchema_test.cpp
index d10f7fc..f032547 100644 (file)
--- a/c10/test/core/dispatch/OpSchema_test.cpp
+++ b/aten/src/ATen/core/dispatch/OpSchema_test.cpp
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/OpSchema.h>
+#include <ATen/core/dispatch/OpSchema.h>
 #include <c10/util/Array.h>
 
 using namespace c10;

diff --git a/aten/src/ATen/core/opschema/layer_norm.cpp b/aten/src/ATen/core/opschema/layer_norm.cpp
new file mode 100644 (file)
index 0000000..be908a5
--- /dev/null
+++ b/aten/src/ATen/core/opschema/layer_norm.cpp
@@ -0,0 +1,4 @@
+#include <ATen/core/opschema/layer_norm.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
+
+C10_DEFINE_OP_SCHEMA(c10::core::opschema::LayerNorm);

diff --git a/c10/core/opschema/layer_norm.h b/aten/src/ATen/core/opschema/layer_norm.h
similarity index 100%
rename from c10/core/opschema/layer_norm.h
rename to aten/src/ATen/core/opschema/layer_norm.h

diff --git a/c10/core/dispatch/DeviceId.cpp b/c10/core/dispatch/DeviceId.cpp
deleted file mode 100644 (file)
index 60feda2..0000000
--- a/c10/core/dispatch/DeviceId.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/DeviceId.h>

diff --git a/c10/core/dispatch/DispatchKey.cpp b/c10/core/dispatch/DispatchKey.cpp
deleted file mode 100644 (file)
index 1d736d8..0000000
--- a/c10/core/dispatch/DispatchKey.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/DispatchKey.h>

diff --git a/c10/core/dispatch/DispatchTable.cpp b/c10/core/dispatch/DispatchTable.cpp
deleted file mode 100644 (file)
index fc3a86e..0000000
--- a/c10/core/dispatch/DispatchTable.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/DispatchTable.h>

diff --git a/c10/core/dispatch/Dispatcher.cpp b/c10/core/dispatch/Dispatcher.cpp
deleted file mode 100644 (file)
index 81fabbc..0000000
--- a/c10/core/dispatch/Dispatcher.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/Dispatcher.h>

diff --git a/c10/core/dispatch/KernelRegistration.cpp b/c10/core/dispatch/KernelRegistration.cpp
deleted file mode 100644 (file)
index a5a8a30..0000000
--- a/c10/core/dispatch/KernelRegistration.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/KernelRegistration.h>

diff --git a/c10/core/dispatch/LayoutId.cpp b/c10/core/dispatch/LayoutId.cpp
deleted file mode 100644 (file)
index 15396ee..0000000
--- a/c10/core/dispatch/LayoutId.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/LayoutId.h>

diff --git a/c10/core/dispatch/OpSchema.cpp b/c10/core/dispatch/OpSchema.cpp
deleted file mode 100644 (file)
index c5feae4..0000000
--- a/c10/core/dispatch/OpSchema.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/OpSchema.h>

diff --git a/c10/core/dispatch/OpSchemaRegistration.cpp b/c10/core/dispatch/OpSchemaRegistration.cpp
deleted file mode 100644 (file)
index 468fa89..0000000
--- a/c10/core/dispatch/OpSchemaRegistration.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/dispatch/OpSchemaRegistration.h>

diff --git a/c10/core/opschema/layer_norm.cpp b/c10/core/opschema/layer_norm.cpp
deleted file mode 100644 (file)
index c8f71ba..0000000
--- a/c10/core/opschema/layer_norm.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <c10/core/opschema/layer_norm.h>
-#include <c10/core/dispatch/OpSchemaRegistration.h>
-
-C10_DEFINE_OP_SCHEMA(c10::core::opschema::LayerNorm);

diff --git a/caffe2/core/operator_c10wrapper.h b/caffe2/core/operator_c10wrapper.h
index 35df591..4459187 100644 (file)
--- a/caffe2/core/operator_c10wrapper.h
+++ b/caffe2/core/operator_c10wrapper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/Dispatcher.h>
+#include <ATen/core/dispatch/Dispatcher.h>
 #include "caffe2/core/operator.h"
 #include <c10/util/ArrayRef.h>
 #include <c10/util/Metaprogramming.h>

diff --git a/caffe2/operators/experimental/c10/cpu/add_cpu.cc b/caffe2/operators/experimental/c10/cpu/add_cpu.cc
index dc62e25..b41cf09 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/add_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/add_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/elementwise_ops_utils.h"
 #include "caffe2/operators/experimental/c10/schemas/add.h"
 #include "caffe2/utils/math.h"

diff --git a/caffe2/operators/experimental/c10/cpu/averaged_loss_cpu.cc b/caffe2/operators/experimental/c10/cpu/averaged_loss_cpu.cc
index 6e4f2e9..f661c5d 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/averaged_loss_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/averaged_loss_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/averaged_loss.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/batch_gather_cpu.cc b/caffe2/operators/experimental/c10/cpu/batch_gather_cpu.cc
index 483a810..251b9a2 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/batch_gather_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/batch_gather_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/batch_gather.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/batch_matmul_cpu.cc b/caffe2/operators/experimental/c10/cpu/batch_matmul_cpu.cc
index b3b93bb..a12b3c6 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/batch_matmul_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/batch_matmul_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/batch_matmul.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/cast_cpu.cc b/caffe2/operators/experimental/c10/cpu/cast_cpu.cc
index 6dd478d..35b1daa 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/cast_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/cast_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/cast.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/concat_cpu.cc b/caffe2/operators/experimental/c10/cpu/concat_cpu.cc
index 1743bd2..a5089d4 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/concat_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/concat_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/concat.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/enforce_finite_cpu.cc b/caffe2/operators/experimental/c10/cpu/enforce_finite_cpu.cc
index 727ff3a..60f7b23 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/enforce_finite_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/enforce_finite_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/enforce_finite.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/expand_dims_cpu.cc b/caffe2/operators/experimental/c10/cpu/expand_dims_cpu.cc
index 8a6bd58..f4596c5 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/expand_dims_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/expand_dims_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/expand_dims.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/fc_cpu.cc b/caffe2/operators/experimental/c10/cpu/fc_cpu.cc
index ed201bb..9fbbfb7 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/fc_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/fc_cpu.cc
@@ -1,5 +1,5 @@
 #include "caffe2/core/context.h"
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/core/operator.h"
 #include "caffe2/operators/experimental/c10/schemas/fc.h"
 #include "caffe2/utils/conversions.h"

diff --git a/caffe2/operators/experimental/c10/cpu/filler_cpu.cc b/caffe2/operators/experimental/c10/cpu/filler_cpu.cc
index 77277ce..161b6eb 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/filler_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/filler_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/filler.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/flatten_cpu.cc b/caffe2/operators/experimental/c10/cpu/flatten_cpu.cc
index 347ed88..09099e0 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/flatten_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/flatten_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/flatten.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/mul_cpu.cc b/caffe2/operators/experimental/c10/cpu/mul_cpu.cc
index 3d29546..2be687f 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/mul_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/mul_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/elementwise_ops_utils.h"
 #include "caffe2/operators/experimental/c10/schemas/mul.h"
 #include "caffe2/utils/math.h"

diff --git a/caffe2/operators/experimental/c10/cpu/relu_cpu.cc b/caffe2/operators/experimental/c10/cpu/relu_cpu.cc
index f8182d2..a9971de 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/relu_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/relu_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/relu.h"
 #include "caffe2/utils/eigen_utils.h"
 #include "caffe2/utils/math.h"

diff --git a/caffe2/operators/experimental/c10/cpu/sigmoid_cpu.cc b/caffe2/operators/experimental/c10/cpu/sigmoid_cpu.cc
index 2a2a035..2f81947 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/sigmoid_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/sigmoid_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/sigmoid.h"
 #include "caffe2/utils/eigen_utils.h"
 #include "caffe2/utils/math.h"

diff --git a/caffe2/operators/experimental/c10/cpu/sigmoid_cross_entropy_with_logits_cpu.cc b/caffe2/operators/experimental/c10/cpu/sigmoid_cross_entropy_with_logits_cpu.cc
index 7fec595..bc7626b 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/sigmoid_cross_entropy_with_logits_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/sigmoid_cross_entropy_with_logits_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/cpu/sparse_lengths_sum_cpu.cc b/caffe2/operators/experimental/c10/cpu/sparse_lengths_sum_cpu.cc
index 2bc2307..a9f0f30 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/sparse_lengths_sum_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/sparse_lengths_sum_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.h"
 #include "caffe2/perfkernels/embedding_lookup.h"
 #include "caffe2/utils/math.h"

diff --git a/caffe2/operators/experimental/c10/cpu/stop_gradient_cpu.cc b/caffe2/operators/experimental/c10/cpu/stop_gradient_cpu.cc
index 5c7c23d..4c0cc8b 100644 (file)
--- a/caffe2/operators/experimental/c10/cpu/stop_gradient_cpu.cc
+++ b/caffe2/operators/experimental/c10/cpu/stop_gradient_cpu.cc
@@ -1,4 +1,4 @@
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 #include "caffe2/operators/experimental/c10/schemas/stop_gradient.h"
 #include "caffe2/utils/math.h"
 #include "caffe2/core/tensor.h"

diff --git a/caffe2/operators/experimental/c10/schemas/add.cc b/caffe2/operators/experimental/c10/schemas/add.cc
index fd3e7dc..4cd9c2f 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/add.cc
+++ b/caffe2/operators/experimental/c10/schemas/add.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/add.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/averaged_loss.cc b/caffe2/operators/experimental/c10/schemas/averaged_loss.cc
index 7a10f36..ef5bd71 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/averaged_loss.cc
+++ b/caffe2/operators/experimental/c10/schemas/averaged_loss.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/averaged_loss.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/batch_gather.cc b/caffe2/operators/experimental/c10/schemas/batch_gather.cc
index 070e9ce..b7d9a5f 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/batch_gather.cc
+++ b/caffe2/operators/experimental/c10/schemas/batch_gather.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/batch_gather.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/batch_matmul.cc b/caffe2/operators/experimental/c10/schemas/batch_matmul.cc
index 80747df..5e35117 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/batch_matmul.cc
+++ b/caffe2/operators/experimental/c10/schemas/batch_matmul.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/batch_matmul.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/cast.cc b/caffe2/operators/experimental/c10/schemas/cast.cc
index 73a1815..f959daf 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/cast.cc
+++ b/caffe2/operators/experimental/c10/schemas/cast.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/cast.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 #include "caffe2/utils/cast.h"
 

diff --git a/caffe2/operators/experimental/c10/schemas/concat.cc b/caffe2/operators/experimental/c10/schemas/concat.cc
index fad2b17..51fb607 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/concat.cc
+++ b/caffe2/operators/experimental/c10/schemas/concat.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/concat.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/concat.h b/caffe2/operators/experimental/c10/schemas/concat.h
index e41f62a..142cf93 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/concat.h
+++ b/caffe2/operators/experimental/c10/schemas/concat.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/DeviceId.h>
+#include <ATen/core/dispatch/DeviceId.h>
 #include <c10/core/Tensor.h>
 #include <c10/util/Array.h>
 #include <c10/util/ArrayRef.h>

diff --git a/caffe2/operators/experimental/c10/schemas/enforce_finite.cc b/caffe2/operators/experimental/c10/schemas/enforce_finite.cc
index cf6c745..2c550d0 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/enforce_finite.cc
+++ b/caffe2/operators/experimental/c10/schemas/enforce_finite.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/enforce_finite.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/expand_dims.cc b/caffe2/operators/experimental/c10/schemas/expand_dims.cc
index b6e56cf..82c2616 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/expand_dims.cc
+++ b/caffe2/operators/experimental/c10/schemas/expand_dims.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/expand_dims.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/fc.cc b/caffe2/operators/experimental/c10/schemas/fc.cc
index ee0e28c..a081c73 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/fc.cc
+++ b/caffe2/operators/experimental/c10/schemas/fc.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/fc.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/filler.cc b/caffe2/operators/experimental/c10/schemas/filler.cc
index f3d0e61..e0a0e59 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/filler.cc
+++ b/caffe2/operators/experimental/c10/schemas/filler.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/filler.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 #include "caffe2/utils/cast.h"
 

diff --git a/caffe2/operators/experimental/c10/schemas/filler.h b/caffe2/operators/experimental/c10/schemas/filler.h
index fa4ef51..4a843d9 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/filler.h
+++ b/caffe2/operators/experimental/c10/schemas/filler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/dispatch/DeviceId.h>
+#include <ATen/core/dispatch/DeviceId.h>
 #include <c10/core/Tensor.h>
 #include <c10/util/Array.h>
 #include <c10/util/ArrayRef.h>

diff --git a/caffe2/operators/experimental/c10/schemas/flatten.cc b/caffe2/operators/experimental/c10/schemas/flatten.cc
index 6c5d544..03b3971 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/flatten.cc
+++ b/caffe2/operators/experimental/c10/schemas/flatten.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/flatten.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/layer_norm.cc b/caffe2/operators/experimental/c10/schemas/layer_norm.cc
index e5be324..ed2f839 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/layer_norm.cc
+++ b/caffe2/operators/experimental/c10/schemas/layer_norm.cc
@@ -1,4 +1,4 @@
-#include <c10/core/opschema/layer_norm.h>
+#include <ATen/core/opschema/layer_norm.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 namespace {

diff --git a/caffe2/operators/experimental/c10/schemas/mul.cc b/caffe2/operators/experimental/c10/schemas/mul.cc
index 7c7d871..8bc905e 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/mul.cc
+++ b/caffe2/operators/experimental/c10/schemas/mul.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/mul.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/relu.cc b/caffe2/operators/experimental/c10/schemas/relu.cc
index fbc094d..3f0a93c 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/relu.cc
+++ b/caffe2/operators/experimental/c10/schemas/relu.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/relu.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/sigmoid.cc b/caffe2/operators/experimental/c10/schemas/sigmoid.cc
index d6eb86f..526c4ba 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/sigmoid.cc
+++ b/caffe2/operators/experimental/c10/schemas/sigmoid.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/sigmoid.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.cc b/caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.cc
index d9fd187..f10921b 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.cc
+++ b/caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.cc b/caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.cc
index 28a1428..a43e66b 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.cc
+++ b/caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/experimental/c10/schemas/stop_gradient.cc b/caffe2/operators/experimental/c10/schemas/stop_gradient.cc
index 94345b1..91e129d 100644 (file)
--- a/caffe2/operators/experimental/c10/schemas/stop_gradient.cc
+++ b/caffe2/operators/experimental/c10/schemas/stop_gradient.cc
@@ -1,5 +1,5 @@
 #include "caffe2/operators/experimental/c10/schemas/stop_gradient.h"
-#include <c10/core/dispatch/OpSchemaRegistration.h>
+#include <ATen/core/dispatch/OpSchemaRegistration.h>
 #include "caffe2/core/operator_c10wrapper.h"
 
 using caffe2::CPUContext;

diff --git a/caffe2/operators/layer_norm_op.cc b/caffe2/operators/layer_norm_op.cc
index 94cd177..d021022 100644 (file)
--- a/caffe2/operators/layer_norm_op.cc
+++ b/caffe2/operators/layer_norm_op.cc
@@ -1,7 +1,7 @@
 #include "caffe2/operators/layer_norm_op.h"
 #include "caffe2/utils/eigen_utils.h"
-#include <c10/core/opschema/layer_norm.h>
-#include <c10/core/dispatch/KernelRegistration.h>
+#include <ATen/core/opschema/layer_norm.h>
+#include <ATen/core/dispatch/KernelRegistration.h>
 
 namespace caffe2 {
 

diff --git a/setup.py b/setup.py
index f6c343f..fa0f7bf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -860,9 +860,9 @@ if __name__ == '__main__':
                 'lib/include/c10/*.h',
                 'lib/include/c10/macros/*.h',
                 'lib/include/c10/core/*.h',
-                'lib/include/c10/core/dispatch/*.h',
+                'lib/include/ATen/core/dispatch/*.h',
                 'lib/include/c10/core/impl/*.h',
-                'lib/include/c10/core/opschema/*.h',
+                'lib/include/ATen/core/opschema/*.h',
                 'lib/include/c10/util/*.h',
                 'lib/include/c10/cuda/*.h',
                 'lib/include/c10/cuda/impl/*.h',

diff --git a/torch/csrc/jit/c10_ops/layer_norm.cpp b/torch/csrc/jit/c10_ops/layer_norm.cpp
index 3d93b45..705f334 100644 (file)
--- a/torch/csrc/jit/c10_ops/layer_norm.cpp
+++ b/torch/csrc/jit/c10_ops/layer_norm.cpp
@@ -1,5 +1,5 @@
-#include <c10/core/dispatch/Dispatcher.h>
-#include <c10/core/opschema/layer_norm.h>
+#include <ATen/core/dispatch/Dispatcher.h>
+#include <ATen/core/opschema/layer_norm.h>
 #include <torch/csrc/jit/custom_operator.h>
 #include <torch/csrc/autograd/variable.h>