Move some files to c10/util (#12245)

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

Move these files to c10/util:
- C++17.h
- Metaprogramming.h
- TypeList.h
- TypeTraits.h
- Array.h

(including .cpp files and test cases)

Reviewed By: ezyang

Differential Revision: D10139933

fbshipit-source-id: ce7ce89392bf1a6be070ffdfc0407a8a2ce4ba6e

aten/src/ATen/core/ArrayRef.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 #include <ATen/core/Error.h>
 #include <ATen/core/SmallVector.h>
 

aten/src/ATen/core/C++17.cpp

@@ -1 +0,0 @@
-#include <ATen/core/C++17.h>

aten/src/ATen/core/Half.h

@@ -10,7 +10,7 @@
 /// intrinsics directly on the Half type from device code.
 
 #include <ATen/core/Macros.h>
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 
 #include <cmath>
 #include <cstdint>

aten/src/ATen/core/TensorTypeIdRegistration.cpp

@@ -1,5 +1,5 @@
+#include <c10/util/C++17.h>
 #include <ATen/core/TensorTypeIdRegistration.h>
-#include <ATen/core/C++17.h>
 #include <ATen/core/Error.h>
 
 namespace at {

aten/src/ATen/core/intrusive_ptr.h

@@ -4,7 +4,7 @@
 #include <ATen/core/Error.h>
 #include <atomic>
 #include <stdexcept>
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 
 namespace c10 {
 

aten/src/ATen/core/typeid.h

@@ -18,8 +18,8 @@
 #include <exception>
 
 #include "caffe2/core/macros.h"
+#include "c10/util/C++17.h"
 #include "ATen/core/Backtrace.h"
-#include "ATen/core/C++17.h"
 #include "ATen/core/Error.h"
 #include "ATen/core/Half.h"
 #include "ATen/core/IdWrapper.h"

aten/src/ATen/cpu/vec256/vec256_base.h

@@ -7,7 +7,7 @@
 #include <bitset>
 
 #include "ATen/Utils.h"
-#include "ATen/core/C++17.h"
+#include <c10/util/C++17.h>
 
 #if defined(__GNUC__)
 #define __at_align32__ __attribute__((aligned(32)))

aten/src/ATen/native/cpu/GridSamplerKernel.cpp

@@ -1,12 +1,12 @@
 #include <ATen/ATen.h>
 #include <ATen/Dispatch.h>
 #include <ATen/Parallel.h>
-#include <ATen/core/C++17.h>
 #include <ATen/TensorUtils.h>
 #include <ATen/NativeFunctions.h>
 #include <ATen/native/GridSampler.h>
 #include <ATen/native/cpu/GridSamplerKernel.h>
 #include <ATen/cpu/vml.h>
+#include <c10/util/C++17.h>
 
 #ifdef _OPENMP
 #include <omp.h>

c10/test/CMakeLists.txt

@@ -1,6 +1,6 @@
 # ---[ Test binaries.
 
-file(GLOB C10_ALL_TEST_FILES *.cpp)
+file(GLOB_RECURSE C10_ALL_TEST_FILES *.cpp)
 if (BUILD_TEST)
   foreach(test_src ${C10_ALL_TEST_FILES})
     get_filename_component(test_file_name ${test_src} NAME_WE)

c10/test/util/Array_test.cpp

@@ -1,4 +1,4 @@
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 #include <gtest/gtest.h>
 
 using c10::guts::array;

c10/test/util/Metaprogramming_test.cpp

@@ -1,4 +1,4 @@
-#include "caffe2/utils/Metaprogramming.h"
+#include <c10/util/Metaprogramming.h>
 #include <gtest/gtest.h>
 
 using namespace c10::guts;

c10/test/util/TypeList_test.cpp

@@ -1,4 +1,4 @@
-#include "caffe2/utils/TypeList.h"
+#include <c10/util/TypeList.h>
 #include <gtest/gtest.h>
 #include <memory>
 

c10/test/util/TypeTraits_test.cpp

@@ -1,4 +1,4 @@
-#include "caffe2/utils/TypeTraits.h"
+#include <c10/util/TypeTraits.h>
 #include <gtest/gtest.h>
 
 using namespace c10::guts;

c10/util/Array.cpp

@@ -0,0 +1 @@
+#include <c10/util/Array.h>

c10/util/Array.h

@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 #include <stdexcept>
 #include <string>
 #include <utility>

c10/util/C++17.cpp

@@ -0,0 +1 @@
+#include <c10/util/C++17.h>

c10/util/C++17.h

@@ -1,4 +1,6 @@
 #pragma once
+#ifndef C10_UTIL_CPP17_H_
+#define C10_UTIL_CPP17_H_
 
 #include <type_traits>
 #include <utility>
@@ -252,3 +254,5 @@ template<class T> inline std::string to_string(T value) {
 }
 
 }}
+
+#endif // C10_UTIL_CPP17_H_

c10/util/Metaprogramming.cpp

@@ -0,0 +1 @@
+#include <c10/util/Metaprogramming.h>

c10/util/Metaprogramming.h

@@ -3,8 +3,8 @@
 #include <type_traits>
 #include <array>
 #include <functional>
-#include "caffe2/utils/TypeList.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/TypeList.h>
+#include <c10/util/Array.h>
 
 namespace c10 { namespace guts {
 namespace detail {

c10/util/TypeList.cpp

@@ -0,0 +1 @@
+#include <c10/util/TypeList.h>

c10/util/TypeList.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ATen/core/C++17.h>
-#include "caffe2/utils/TypeTraits.h"
+#include <c10/util/C++17.h>
+#include <c10/util/TypeTraits.h>
 
 namespace c10 { namespace guts { namespace typelist {
 

c10/util/TypeTraits.cpp

@@ -0,0 +1 @@
+#include <c10/util/TypeTraits.h>

c10/util/TypeTraits.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 #include <functional>
 
 namespace c10 {

caffe2/core/dispatch/DeviceId.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/core/C++17.h>
+#include <c10/util/C++17.h>
 #include <functional>
 #include <iostream>
 

caffe2/core/dispatch/DispatchKey.h

@@ -7,7 +7,7 @@
 #include <vector>
 #include <functional>
 #include <sstream>
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace c10 {
 

caffe2/core/dispatch/DispatchTable.h

@@ -2,7 +2,7 @@
 
 #include "caffe2/core/dispatch/LeftRight.h"
 #include "caffe2/core/dispatch/OpSchema.h"
-#include "caffe2/utils/Metaprogramming.h"
+#include <c10/util/Metaprogramming.h>
 #include "caffe2/utils/flat_hash_map/flat_hash_map.h"
 
 #include <array>

caffe2/core/dispatch/OpSchema.h

@@ -2,8 +2,8 @@
 
 #include "caffe2/core/dispatch/DispatchKey.h"
 #include "caffe2/proto/caffe2_pb.h"
-#include "caffe2/utils/Array.h"
-#include "caffe2/utils/Metaprogramming.h"
+#include <c10/util/Array.h>
+#include <c10/util/Metaprogramming.h>
 
 namespace caffe2 {
 class Tensor;

caffe2/core/dispatch/OpSchema_test.cpp

@@ -1,5 +1,5 @@
 #include "caffe2/core/dispatch/OpSchema.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 using namespace c10;
 using namespace caffe2;

caffe2/core/operator_c10wrapper.h

@@ -3,7 +3,7 @@
 #include "caffe2/core/dispatch/Dispatcher.h"
 #include "caffe2/core/operator.h"
 #include <ATen/core/ArrayRef.h>
-#include "caffe2/utils/Metaprogramming.h"
+#include <c10/util/Metaprogramming.h>
 
 namespace caffe2 {
 

caffe2/operators/experimental/c10/schemas/add.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/averaged_loss.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/batch_gather.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/batch_matmul.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/cast.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/concat.h

@@ -2,7 +2,7 @@
 
 #include "caffe2/core/dispatch/DeviceId.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 #include <ATen/core/ArrayRef.h>
 
 namespace caffe2 {

caffe2/operators/experimental/c10/schemas/enforce_finite.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/expand_dims.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/fc.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/filler.h

@@ -2,7 +2,7 @@
 
 #include "caffe2/core/dispatch/DeviceId.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 #include <ATen/core/ArrayRef.h>
 
 namespace caffe2 {

caffe2/operators/experimental/c10/schemas/flatten.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/mul.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/relu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/sigmoid.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/sigmoid_cross_entropy_with_logits.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/sparse_lengths_sum.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/operators/experimental/c10/schemas/stop_gradient.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/tensor.h"
-#include "caffe2/utils/Array.h"
+#include <c10/util/Array.h>
 
 namespace caffe2 {
 namespace ops {

caffe2/utils/Array.cpp

@@ -1 +0,0 @@
-#include "caffe2/utils/Array.h"

caffe2/utils/CMakeLists.txt

@@ -54,10 +54,7 @@ set(Caffe2_HIP_TEST_SRCS ${Caffe2_HIP_TEST_SRCS}
 # TODO Remove the CMake_xxx variables above and add them to the variables for the local library target below instead
 
 set(LIB_SOURCES_CPU
-        Array.cpp
-        Metaprogramming.cpp
-        TypeList.cpp
-        TypeTraits.cpp
+        dummy.cpp
         )
 
 set(LIB_SOURCES_GPU
@@ -69,10 +66,6 @@ set(LIB_SOURCES_HIP
         )
 
 set(TEST_SOURCES_CPU
-        Array_test.cpp
-        Metaprogramming_test.cpp
-        TypeList_test.cpp
-        TypeTraits_test.cpp
         )
 
 set(LIB_SOURCES_GPU

caffe2/utils/Metaprogramming.cpp

@@ -1 +0,0 @@
-#include "caffe2/utils/Metaprogramming.h"

caffe2/utils/TypeList.cpp

@@ -1 +0,0 @@
-#include "caffe2/utils/TypeList.h"

caffe2/utils/TypeTraits.cpp

@@ -1 +0,0 @@
-#include "caffe2/utils/TypeTraits.h"

torch/csrc/jit/custom_operator.h

@@ -6,8 +6,8 @@
 #include <torch/csrc/jit/tracer.h>
 #include <torch/csrc/utils/variadic.h>
 
-#include <caffe2/utils/Metaprogramming.h>
-#include <caffe2/utils/TypeList.h>
+#include <c10/util/Metaprogramming.h>
+#include <c10/util/TypeList.h>
 
 namespace torch { namespace jit {
 namespace detail {