Skip to content

Commit 517c7c9

Browse files
ezyangfacebook-github-bot
ezyang
authored and
facebook-github-bot
committed
Canonicalize all includes in PyTorch. (pytorch#14849)
Summary: Anywhere we used #include "foo.h", we now say #include <foo.h> Paths are adjusted to be rooted out of aten/src, torch/lib, or the root level directory. I modified CMakeLists.txt by hand to remove TH and THC from the include paths. I used the following script to do the canonicalization: ``` import subprocess import re import os.path files = subprocess.check_output(['git', 'ls-files']).decode('utf-8').rstrip().split('\n') for fn in files: if not any(fn.endswith(suff) for suff in ['.cu', '.cpp', '.in', '.h', '.hpp', '.cu', '.cuh', '.cc']): continue if not any(fn.startswith(pref) for pref in ["aten/", "torch/"]): continue with open(fn, 'r') as f: c = f.read() def fmt(p): return "#include <{}>".format(p) def repl(m): p = m.group(1) if p in ["dlfcn.h", "unistd.h", "nvrtc.h", "cuda.h", "cuda_runtime.h", "cstdint", "cudnn.h", "Python.h", "cusparse.h", "cuda_runtime_api.h", "cuda_fp16.h", "cublas_v2.h", "stdint.h", "curand_kernel.h"]: return fmt(p) if any(p.startswith(pref) for pref in ["torch/csrc", "c10/", "ATen/", "caffe2/", "TH/", "THC/", "Eigen/", "gtest/", "zdl/", "gloo/", "onnx/", "miopen/"]): return fmt(p) for root in ["aten/src", "torch/lib", ""]: for bad_root in [os.path.dirname(fn), "aten/src/TH", "aten/src/THC", "torch/csrc"]: new_p = os.path.relpath(os.path.join(bad_root, p), root) if not new_p.startswith("../") and (os.path.exists(os.path.join(root, new_p)) or os.path.exists(os.path.join(root, new_p + ".in"))): return fmt(new_p) print("ERROR: ", fn, p) return m.group(0) new_c = re.sub(r'#include "([^"]+)"', repl, c) if new_c != c: print(fn) with open(fn, 'w') as f: f.write(new_c) ``` Signed-off-by: Edward Z. Yang <[email protected]> Pull Request resolved: pytorch#14849 Reviewed By: dzhulgakov Differential Revision: D13363445 Pulled By: ezyang fbshipit-source-id: 52361f878a672785f9306c9e9ab2513128092b68
1 parent a7b3197 commit 517c7c9

File tree

998 files changed

+3770
-3806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

998 files changed

+3770
-3806
lines changed

‎aten/CMakeLists.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,11 @@ endif()
3535
set(TH_LINK_STYLE STATIC)
3636
add_subdirectory(src/TH)
3737
set(TH_CPU_INCLUDE
38-
# dense
39-
${CMAKE_CURRENT_SOURCE_DIR}/src/TH
40-
${CMAKE_CURRENT_BINARY_DIR}/src/TH
4138
${CMAKE_CURRENT_SOURCE_DIR}/src
4239
${CMAKE_CURRENT_BINARY_DIR}/src
4340
${CMAKE_BINARY_DIR}/aten/src)
4441
list(APPEND ATen_CPU_INCLUDE ${TH_CPU_INCLUDE})
4542

46-
if(USE_CUDA OR USE_ROCM)
47-
set(TH_CUDA_INCLUDE
48-
# dense
49-
${CMAKE_CURRENT_SOURCE_DIR}/src/THC
50-
${CMAKE_CURRENT_BINARY_DIR}/src/THC)
51-
list(APPEND ATen_CUDA_INCLUDE ${TH_CUDA_INCLUDE})
52-
endif()
53-
5443
add_subdirectory(src/THNN)
5544

5645
# Find the HIP package, set the HIP paths, load the HIP CMake.
@@ -82,14 +71,9 @@ else()
8271
SET(AT_CUDA_ENABLED 0)
8372
endif()
8473

85-
list(APPEND ATen_CPU_INCLUDE
86-
${CMAKE_CURRENT_SOURCE_DIR}/src/THNN
87-
${CMAKE_CURRENT_SOURCE_DIR}/src/THCUNN)
88-
8974
list(APPEND ATen_CPU_INCLUDE
9075
${CMAKE_CURRENT_SOURCE_DIR}/src
91-
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/catch/single_include
92-
${CMAKE_CURRENT_BINARY_DIR}/src/ATen)
76+
${CMAKE_CURRENT_SOURCE_DIR}/../third_party/catch/single_include)
9377
add_subdirectory(src/ATen)
9478

9579
# Pass source, includes, and libs to parent

‎aten/src/ATen/ATen.h

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#pragma once
22

3-
#include "ATen/Allocator.h"
4-
#include "ATen/CPUGeneral.h"
5-
#include "ATen/Context.h"
6-
#include "ATen/Device.h"
7-
#include "ATen/DeviceGuard.h"
8-
#include "ATen/DimVector.h"
9-
#include "ATen/Dispatch.h"
10-
#include "ATen/Formatting.h"
11-
#include "ATen/Functions.h"
12-
#include "ATen/ScalarOps.h"
13-
#include "ATen/Tensor.h"
14-
#include "ATen/TensorGeometry.h"
15-
#include "ATen/TensorOperators.h"
16-
#include "ATen/Type.h"
17-
#include "ATen/core/ATenGeneral.h"
18-
#include "ATen/core/Generator.h"
3+
#include <ATen/Allocator.h>
4+
#include <ATen/CPUGeneral.h>
5+
#include <ATen/Context.h>
6+
#include <ATen/Device.h>
7+
#include <ATen/DeviceGuard.h>
8+
#include <ATen/DimVector.h>
9+
#include <ATen/Dispatch.h>
10+
#include <ATen/Formatting.h>
11+
#include <ATen/Functions.h>
12+
#include <ATen/ScalarOps.h>
13+
#include <ATen/Tensor.h>
14+
#include <ATen/TensorGeometry.h>
15+
#include <ATen/TensorOperators.h>
16+
#include <ATen/Type.h>
17+
#include <ATen/core/ATenGeneral.h>
18+
#include <ATen/core/Generator.h>
1919
#include <c10/core/Layout.h>
20-
#include "ATen/core/Scalar.h"
20+
#include <ATen/core/Scalar.h>
2121
#include <c10/core/Storage.h>
22-
#include "ATen/core/TensorMethods.h"
23-
#include "c10/core/TensorOptions.h"
22+
#include <ATen/core/TensorMethods.h>
23+
#include <c10/core/TensorOptions.h>
2424
#include <c10/util/Exception.h>

‎aten/src/ATen/AccumulateType.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
2-
#include "ATen/Config.h"
3-
#include "ATen/core/Half.h"
2+
#include <ATen/Config.h>
3+
#include <ATen/core/Half.h>
44

55
// Defines the accumulation type for a scalar type.
66
// Example:

‎aten/src/ATen/CPUApplyUtils.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ATen/Parallel.h"
4-
#include "ATen/TensorUtils.h"
3+
#include <ATen/Parallel.h>
4+
#include <ATen/TensorUtils.h>
55
#include <limits>
66
#include <utility>
77
#include <cstring>

‎aten/src/ATen/CPUFixedAllocator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "TH/TH.h"
4-
#include "c10/util/Exception.h"
3+
#include <TH/TH.h>
4+
#include <c10/util/Exception.h>
55

66
// This file creates a fake allocator that just throws exceptions if
77
// it is actually used.

‎aten/src/ATen/CPUGeneral.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// linking errors using MSVC
55
// See https://msdn.microsoft.com/en-us/library/a90k134d.aspx
66
// This header adds this if using CAFFE2_API
7-
#include "ATen/core/ATenGeneral.h"
7+
#include <ATen/core/ATenGeneral.h>
88

99
namespace at {
1010
CAFFE2_API void set_num_threads(int);

‎aten/src/ATen/CPUGenerator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ATen/CPUGenerator.h"
1+
#include <ATen/CPUGenerator.h>
22

33
#define const_generator_cast(generator) \
44
dynamic_cast<const CPUGenerator&>(generator)

‎aten/src/ATen/CheckGenerator.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ATen/Utils.h"
4-
#include "ATen/core/Generator.h"
5-
#include "c10/util/Exception.h"
3+
#include <ATen/Utils.h>
4+
#include <ATen/core/Generator.h>
5+
#include <c10/util/Exception.h>
66

77
namespace at {
88

‎aten/src/ATen/Context.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "ATen/Config.h"
1+
#include <ATen/Config.h>
22

3-
#include "Context.h"
3+
#include <ATen/Context.h>
44

55
#include <c10/core/TensorOptions.h>
66

@@ -10,12 +10,12 @@
1010
#include <string>
1111
#include <stdexcept>
1212

13-
#include "ATen/CPUGenerator.h"
14-
#include "ATen/RegisterCPU.h"
15-
#include "ATen/Tensor.h"
13+
#include <ATen/CPUGenerator.h>
14+
#include <ATen/RegisterCPU.h>
15+
#include <ATen/Tensor.h>
1616
#include <ATen/cpu/FlushDenormal.h>
1717

18-
#include "TH/TH.h" // for USE_LAPACK
18+
#include <TH/TH.h> // for USE_LAPACK
1919

2020
namespace at {
2121

‎aten/src/ATen/Context.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#pragma once
22

33
#include <ATen/CPUGeneral.h>
4-
#include "ATen/Type.h"
5-
#include "ATen/TypeExtendedInterface.h"
6-
#include "ATen/Utils.h"
7-
#include "ATen/LegacyTHDispatch.h"
8-
#include "ATen/LegacyTHDispatcher.h"
9-
#include "ATen/core/ATenGeneral.h"
10-
#include "ATen/core/Generator.h"
11-
#include "ATen/core/LegacyTypeDispatch.h"
12-
#include "ATen/core/VariableHooksInterface.h"
13-
#include "ATen/detail/CUDAHooksInterface.h"
14-
#include "ATen/detail/HIPHooksInterface.h"
15-
#include "ATen/detail/ComplexHooksInterface.h"
16-
#include "c10/util/Exception.h"
4+
#include <ATen/Type.h>
5+
#include <ATen/TypeExtendedInterface.h>
6+
#include <ATen/Utils.h>
7+
#include <ATen/LegacyTHDispatch.h>
8+
#include <ATen/LegacyTHDispatcher.h>
9+
#include <ATen/core/ATenGeneral.h>
10+
#include <ATen/core/Generator.h>
11+
#include <ATen/core/LegacyTypeDispatch.h>
12+
#include <ATen/core/VariableHooksInterface.h>
13+
#include <ATen/detail/CUDAHooksInterface.h>
14+
#include <ATen/detail/HIPHooksInterface.h>
15+
#include <ATen/detail/ComplexHooksInterface.h>
16+
#include <c10/util/Exception.h>
1717

1818
#include <memory>
1919
#include <mutex>

‎aten/src/ATen/DLConvertor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "ATen/DLConvertor.h"
2-
#include "ATen/Functions.h"
1+
#include <ATen/DLConvertor.h>
2+
#include <ATen/Functions.h>
33

44
#include <iostream>
55
#include <sstream>

‎aten/src/ATen/DLConvertor.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ATen/Tensor.h"
4-
#include "ATen/ATen.h"
5-
#include "ATen/dlpack.h"
3+
#include <ATen/Tensor.h>
4+
#include <ATen/ATen.h>
5+
#include <ATen/dlpack.h>
66

77
// this convertor will:
88
// 1) take a Tensor object and wrap it in the DLPack tensor

‎aten/src/ATen/ExpandUtils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ATen/ExpandUtils.h"
1+
#include <ATen/ExpandUtils.h>
22

33
namespace at {
44

‎aten/src/ATen/ExpandUtils.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ATen/Tensor.h"
4-
#include "c10/util/Exception.h"
3+
#include <ATen/Tensor.h>
4+
#include <c10/util/Exception.h>
55

66
#include <functional>
77
#include <sstream>

‎aten/src/ATen/ScalarOps.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <c10/core/Scalar.h>
4-
#include "ATen/Tensor.h"
4+
#include <ATen/Tensor.h>
55

66
// This is in the c10 namespace because we use ADL to find the functions in it.
77
namespace c10 {

‎aten/src/ATen/SparseTensorImpl.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ATen/Tensor.h"
4-
#include "ATen/core/TensorImpl.h"
5-
#include "c10/util/Exception.h"
3+
#include <ATen/Tensor.h>
4+
#include <ATen/core/TensorImpl.h>
5+
#include <c10/util/Exception.h>
66

77
namespace at {
88
struct CAFFE2_API SparseTensorImpl : public TensorImpl {

‎aten/src/ATen/TensorOperators.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

33
#include <c10/core/Scalar.h>
4-
#include "ATen/Tensor.h"
5-
#include "ATen/Type.h"
4+
#include <ATen/Tensor.h>
5+
#include <ATen/Type.h>
66

77
#include <string>
88
#include <stdexcept>

‎aten/src/ATen/TensorUtils.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "ATen/Config.h"
2-
#include "ATen/TensorUtils.h"
1+
#include <ATen/Config.h>
2+
#include <ATen/TensorUtils.h>
33

4-
#include "ATen/ATen.h"
4+
#include <ATen/ATen.h>
55

66
#include <ostream>
77
#include <sstream>

‎aten/src/ATen/TensorUtils.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ATen/Tensor.h"
4-
#include "ATen/TensorGeometry.h"
5-
#include "ATen/Utils.h"
3+
#include <ATen/Tensor.h>
4+
#include <ATen/TensorGeometry.h>
5+
#include <ATen/Utils.h>
66

77
// These functions are NOT in Utils.h, because this file has a dep on Tensor.h
88

‎aten/src/ATen/UndefinedType.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "ATen/UndefinedType.h"
2-
#include "c10/util/Exception.h"
1+
#include <ATen/UndefinedType.h>
2+
#include <c10/util/Exception.h>
33

44
namespace at {
55

‎aten/src/ATen/UndefinedType.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ATen/TypeDefault.h"
4-
#include "ATen/CheckGenerator.h"
3+
#include <ATen/TypeDefault.h>
4+
#include <ATen/CheckGenerator.h>
55

66
#ifdef _MSC_VER
77
#ifdef Type

‎aten/src/ATen/Utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ATen/Utils.h"
1+
#include <ATen/Utils.h>
22
#include <stdarg.h>
33
#include <stdexcept>
44
#include <typeinfo>

‎aten/src/ATen/Utils.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include "ATen/core/ATenGeneral.h"
3+
#include <ATen/core/ATenGeneral.h>
44
#include <c10/core/StorageImpl.h>
5-
#include "ATen/core/UndefinedTensorImpl.h"
5+
#include <ATen/core/UndefinedTensorImpl.h>
66

77
#include <c10/core/ScalarType.h>
8-
#include "ATen/Formatting.h"
8+
#include <ATen/Formatting.h>
99
#include <c10/util/ArrayRef.h>
1010
#include <c10/util/Exception.h>
1111

‎aten/src/ATen/WrapDimUtils.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ATen/core/WrapDimMinimal.h"
4-
#include "ATen/core/TensorImpl.h"
3+
#include <ATen/core/WrapDimMinimal.h>
4+
#include <ATen/core/TensorImpl.h>
55

66
namespace at {
77

‎aten/src/ATen/WrapDimUtilsMulti.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ATen/core/TensorImpl.h"
4-
#include "ATen/WrapDimUtils.h"
3+
#include <ATen/core/TensorImpl.h>
4+
#include <ATen/WrapDimUtils.h>
55
#include <sstream>
66
#include <bitset>
77

‎aten/src/ATen/core/ATenGeneral.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
22

3-
#include "c10/macros/Macros.h"
3+
#include <c10/macros/Macros.h>

‎aten/src/ATen/core/Backtrace.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "c10/util/Backtrace.h"
2-
#include "c10/util/Type.h"
1+
#include <c10/util/Backtrace.h>
2+
#include <c10/util/Type.h>

‎aten/src/ATen/core/Formatting.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ATen/core/Formatting.h"
1+
#include <ATen/core/Formatting.h>
22

33
#include <cmath>
44
#include <cstdint>

‎aten/src/ATen/core/Half.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#pragma once
2-
#include "c10/Half.h"
2+
#include <c10/Half.h>

‎aten/src/ATen/core/Macros.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#pragma once
2-
#include "c10/macros/Macros.h"
2+
#include <c10/macros/Macros.h>

‎aten/src/ATen/core/Tensor.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <c10/core/Layout.h>
55
#include <c10/core/Scalar.h>
66
#include <c10/core/ScalarType.h>
7-
#include "ATen/core/SparseTensorRef.h"
7+
#include <ATen/core/SparseTensorRef.h>
88
#include <c10/core/Storage.h>
9-
#include "ATen/core/TensorAccessor.h"
10-
#include "ATen/core/TensorImpl.h"
11-
#include "ATen/core/UndefinedTensorImpl.h"
9+
#include <ATen/core/TensorAccessor.h>
10+
#include <ATen/core/TensorImpl.h>
11+
#include <ATen/core/UndefinedTensorImpl.h>
1212
#include <c10/util/Exception.h>
1313
#include <c10/util/Optional.h>
1414
#include <ATen/core/LegacyTypeDispatch.h>
@@ -738,4 +738,4 @@ Tensor make_tensor(Args&&... args) {
738738

739739
} // namespace at
740740

741-
#include "ATen/core/TensorMethods.h"
741+
#include <ATen/core/TensorMethods.h>

0 commit comments

Comments
 (0)