Header rename complex_type.h -> complex.h (#39885)
Summary:
This file should have been renamed as `complex.h`, but unfortunately, it was named as `complex_type.h` due to a name clash with FBCode. Is this still the case and is it easy to resolve the name clash? Maybe related to the comment at https://github.com/pytorch/pytorch/pull/39834#issuecomment-642950012
Pull Request resolved: https://github.com/pytorch/pytorch/pull/39885
Differential Revision: D22018575
Pulled By: ezyang
fbshipit-source-id: e237ccedbe2b30c31aca028a5b4c8c063087a30f
diff --git a/aten/src/ATen/Dispatch.h b/aten/src/ATen/Dispatch.h
index 5844c8c..53a22db 100644
--- a/aten/src/ATen/Dispatch.h
+++ b/aten/src/ATen/Dispatch.h
@@ -5,7 +5,7 @@
#include <c10/macros/Macros.h>
#include <c10/util/Exception.h>
#include <c10/util/Half.h>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#define AT_PRIVATE_CASE_TYPE(enum_type, type, ...) \
case enum_type: { \
diff --git a/aten/src/ATen/cpu/vec256/vec256_complex_double.h b/aten/src/ATen/cpu/vec256/vec256_complex_double.h
index ecde890..1673cef 100644
--- a/aten/src/ATen/cpu/vec256/vec256_complex_double.h
+++ b/aten/src/ATen/cpu/vec256/vec256_complex_double.h
@@ -3,7 +3,7 @@
// DO NOT DEFINE STATIC DATA IN THIS HEADER!
// See Note [Do not compile initializers with AVX]
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <ATen/cpu/vec256/intrinsics.h>
#include <ATen/cpu/vec256/vec256_base.h>
#if (defined(CPU_CAPABILITY_AVX) || defined(CPU_CAPABILITY_AVX2)) && !defined(_MSC_VER)
diff --git a/aten/src/ATen/cpu/vec256/vec256_complex_float.h b/aten/src/ATen/cpu/vec256/vec256_complex_float.h
index e091004..df6c124 100644
--- a/aten/src/ATen/cpu/vec256/vec256_complex_float.h
+++ b/aten/src/ATen/cpu/vec256/vec256_complex_float.h
@@ -3,7 +3,7 @@
// DO NOT DEFINE STATIC DATA IN THIS HEADER!
// See Note [Do not compile initializers with AVX]
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <ATen/cpu/vec256/intrinsics.h>
#include <ATen/cpu/vec256/vec256_base.h>
#if (defined(CPU_CAPABILITY_AVX) || defined(CPU_CAPABILITY_AVX2)) && !defined(_MSC_VER)
diff --git a/aten/src/ATen/cpu/vml.h b/aten/src/ATen/cpu/vml.h
index 3545456..8e20605 100644
--- a/aten/src/ATen/cpu/vml.h
+++ b/aten/src/ATen/cpu/vml.h
@@ -4,7 +4,7 @@
#include <ATen/Parallel.h>
#include <ATen/cpu/vec256/functional.h>
#include <ATen/cpu/vec256/vec256.h>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
// This header implements various unary operations using a MKL VML style
// interface.
diff --git a/aten/src/ATen/cuda/DeviceUtils.cuh b/aten/src/ATen/cuda/DeviceUtils.cuh
index 9ba0005..0bc3a3e 100644
--- a/aten/src/ATen/cuda/DeviceUtils.cuh
+++ b/aten/src/ATen/cuda/DeviceUtils.cuh
@@ -1,5 +1,5 @@
#include <cuda.h>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <c10/util/Half.h>
__device__ __forceinline__ unsigned int ACTIVE_MASK()
diff --git a/aten/src/ATen/native/cpu/zmath.h b/aten/src/ATen/native/cpu/zmath.h
index 8ccf75a..744968d 100644
--- a/aten/src/ATen/native/cpu/zmath.h
+++ b/aten/src/ATen/native/cpu/zmath.h
@@ -1,7 +1,7 @@
#pragma once
// Complex number math operations that act as no-ops for other dtypes.
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <c10/util/math_compat.h>
#include<ATen/NumericUtils.h>
diff --git a/aten/src/THC/THCAtomics.cuh b/aten/src/THC/THCAtomics.cuh
index 9375390..625b9b7 100644
--- a/aten/src/THC/THCAtomics.cuh
+++ b/aten/src/THC/THCAtomics.cuh
@@ -1,7 +1,7 @@
#ifndef THC_ATOMICS_INC
#define THC_ATOMICS_INC
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <THC/THC.h>
#include <TH/THHalf.h>
#include <THC/THCNumerics.cuh>
diff --git a/c10/core/ScalarType.h b/c10/core/ScalarType.h
index 0cc0de0..95ae2a3 100644
--- a/c10/core/ScalarType.h
+++ b/c10/core/ScalarType.h
@@ -1,12 +1,11 @@
#pragma once
#include <c10/util/ArrayRef.h>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <c10/util/Half.h>
#include <c10/util/BFloat16.h>
#include <c10/util/Optional.h>
#include <c10/util/typeid.h>
-#include <c10/util/complex_type.h>
#include <complex>
#include <cstdint>
diff --git a/c10/test/util/complex_math_test_common.h b/c10/test/util/complex_math_test_common.h
index 3e2779f..4715c37 100644
--- a/c10/test/util/complex_math_test_common.h
+++ b/c10/test/util/complex_math_test_common.h
@@ -1,6 +1,6 @@
// Warning: this file is included twice in aten/src/ATen/test/cuda_complex_math_test.cu
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <gtest/gtest.h>
#ifndef PI
diff --git a/c10/test/util/complex_test_common.h b/c10/test/util/complex_test_common.h
index 78d81cc..b9c91f7 100644
--- a/c10/test/util/complex_test_common.h
+++ b/c10/test/util/complex_test_common.h
@@ -1,7 +1,7 @@
#include <type_traits>
#include <tuple>
#include <sstream>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#include <c10/macros/Macros.h>
#include <gtest/gtest.h>
diff --git a/c10/util/Half.h b/c10/util/Half.h
index 9f6fc7d..2414a69 100644
--- a/c10/util/Half.h
+++ b/c10/util/Half.h
@@ -11,7 +11,7 @@
#include <c10/macros/Macros.h>
#include <c10/util/C++17.h>
-#include <c10/util/complex_type.h>
+#include <c10/util/complex.h>
#if defined(__cplusplus) && (__cplusplus >= 201103L)
#include <cmath>
diff --git a/c10/util/complex_type.h b/c10/util/complex.h
similarity index 100%
rename from c10/util/complex_type.h
rename to c10/util/complex.h
diff --git a/c10/util/complex_math.h b/c10/util/complex_math.h
index 231a451..1664400 100644
--- a/c10/util/complex_math.h
+++ b/c10/util/complex_math.h
@@ -1,5 +1,5 @@
#if !defined(C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H)
-#error "c10/util/complex_math.h is not meant to be individually included. Include c10/util/complex_type.h instead."
+#error "c10/util/complex_math.h is not meant to be individually included. Include c10/util/complex.h instead."
#endif
diff --git a/c10/util/complex_utils.h b/c10/util/complex_utils.h
index 5aa600d..40146dc 100644
--- a/c10/util/complex_utils.h
+++ b/c10/util/complex_utils.h
@@ -1,5 +1,5 @@
#if !defined(C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H)
-#error "c10/util/complex_utils.h is not meant to be individually included. Include c10/util/complex_type.h instead."
+#error "c10/util/complex_utils.h is not meant to be individually included. Include c10/util/complex.h instead."
#endif
#include <limits>
