Remove WindowsTorchApiMacro.h in favor of Export.h (#69585)

Summary: Follow up to https://github.com/pytorch/pytorch/issues/68095 This also changes the files from the ATen folder to include c10's `Export.h` instead since they can't ever be exporting `TORCH_PYTHON_API`. cc pietern mrshenli pritamdamania87 zhaojuanmao satgera rohan-varma gqchen aazzolini osalpekar jiayisuse SciPioneer H-Huang Pull Request resolved: https://github.com/pytorch/pytorch/pull/69585 Reviewed By: mrshenli Differential Revision: D32958594 Pulled By: albanD fbshipit-source-id: 1ec7ef63764573fa2b486928955e3a1172150061
2025-10-21 05:34:18 +08:00 · 2021-12-09 17:26:46 -08:00
parent f87f1d08e8
commit b2e79ed5ec
235 changed files with 233 additions and 237 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -524,7 +524,6 @@ cc_library(
    name = "aten_headers",
    hdrs = [
        "torch/csrc/Export.h",
-        "torch/csrc/WindowsTorchApiMacro.h",
        "torch/csrc/jit/frontend/function_schema_parser.h",
    ] + glob([
        "aten/src/**/*.h",
--- a/aten/src/ATen/SequenceNumber.h
+++ b/aten/src/ATen/SequenceNumber.h
@ -1,7 +1,7 @@
 #pragma once

 #include <cstdint>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <c10/macros/Export.h>

 namespace at {

--- a/aten/src/ATen/TracerMode.h
+++ b/aten/src/ATen/TracerMode.h
@ -2,7 +2,7 @@

 #include <c10/core/impl/LocalDispatchKeySet.h>
 #include <c10/macros/Macros.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <c10/macros/Export.h>

 // NOTE [Tracing Mode Switches]
 //
--- a/aten/src/ATen/TypeDefault.h
+++ b/aten/src/ATen/TypeDefault.h
@ -6,7 +6,7 @@
 #include <c10/core/MemoryFormat.h>
 #include <c10/util/ArrayRef.h>
 #include <c10/util/intrusive_ptr.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <c10/macros/Export.h>
 #include <ATen/Dimname.h>

 namespace c10 {
--- a/aten/src/ATen/core/Dict.h
+++ b/aten/src/ATen/core/Dict.h
@ -1,12 +1,12 @@
 #pragma once

 #include <c10/macros/Macros.h>
+#include <c10/macros/Export.h>
 #include <c10/util/TypeTraits.h>
 #include <c10/util/TypeList.h>
 #include <c10/util/intrusive_ptr.h>
 #include <c10/util/order_preserving_flat_hash_map.h>
 #include <c10/util/Optional.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
 #include <ATen/core/TensorBody.h>

 namespace c10 {
--- a/aten/src/ATen/core/List.h
+++ b/aten/src/ATen/core/List.h
@ -2,12 +2,12 @@

 #include <ATen/core/ivalue_to.h>
 #include <c10/macros/Macros.h>
+#include <c10/macros/Export.h>
 #include <c10/util/TypeTraits.h>
 #include <c10/util/TypeList.h>
 #include <c10/util/intrusive_ptr.h>
 #include <c10/util/ArrayRef.h>
 #include <c10/util/Optional.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
 #include <vector>

 namespace at {
--- a/aten/src/ATen/core/ivalue.h
+++ b/aten/src/ATen/core/ivalue.h
@ -6,7 +6,7 @@
 #include <c10/util/C++17.h>
 #include <c10/util/MaybeOwned.h>
 #include <c10/util/intrusive_ptr.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <c10/macros/Export.h>
 #include <typeindex>

 namespace torch {
--- a/aten/src/ATen/templates/TensorBody.h
+++ b/aten/src/ATen/templates/TensorBody.h
@ -19,12 +19,12 @@
 #include <c10/util/MaybeOwned.h>
 #include <c10/util/Optional.h>
 #include <c10/util/intrusive_ptr.h>
+#include <c10/macros/Export.h>
 #include <ATen/core/DeprecatedTypePropertiesRegistry.h>
 #include <ATen/core/DeprecatedTypeProperties.h>
 #include <ATen/core/NamedTensor.h>
 #include <ATen/core/QuantizerBase.h>
 #include <ATen/core/TensorBase.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>

 namespace c10{
 template<class T> class List;
--- a/test/cpp/jit/torch_python_test.cpp
+++ b/test/cpp/jit/torch_python_test.cpp
@ -1,6 +1,6 @@
 #include <ATen/core/ivalue.h>
 #include <c10/util/Exception.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/api/module.h>
 #include <torch/script.h>

--- a/tools/autograd/templates/VariableType.h
+++ b/tools/autograd/templates/VariableType.h
@ -6,7 +6,7 @@

 #include <c10/util/intrusive_ptr.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/autograd_not_implemented_fallback.h>

 #include <cstdint> // for size_t
--- a/tools/build_variables.bzl
+++ b/tools/build_variables.bzl
@ -72,7 +72,6 @@ def libtorch_generated_sources(gencode_pattern):
 jit_core_headers = [
    "torch/csrc/utils/memory.h",
    "torch/csrc/Export.h",
-    "torch/csrc/WindowsTorchApiMacro.h",
    "torch/csrc/jit/frontend/source_range.h",
    "torch/csrc/jit/serialization/callstack_debug_info_serialization.h",
    "torch/csrc/jit/serialization/source_range_serialization.h",
--- a/torch/csrc/CudaIPCTypes.h
+++ b/torch/csrc/CudaIPCTypes.h
@ -1,6 +1,6 @@
 #pragma once
 #ifdef USE_CUDA
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <c10/core/Allocator.h>
 #include <c10/cuda/CUDACachingAllocator.h>
 #include <c10/cuda/CUDAException.h>
--- a/torch/csrc/Device.h
+++ b/torch/csrc/Device.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/csrc/python_headers.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <ATen/Device.h>

--- a/torch/csrc/Dtype.h
+++ b/torch/csrc/Dtype.h
@ -2,7 +2,7 @@

 #include <ATen/ATen.h>
 #include <torch/csrc/python_headers.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 const int DTYPE_NAME_LEN = 64;

--- a/torch/csrc/WindowsTorchApiMacro.h
+++ b/torch/csrc/WindowsTorchApiMacro.h
@ -1,2 +0,0 @@
-#pragma once
-#include <torch/csrc/Export.h>
--- a/torch/csrc/api/include/torch/cuda.h
+++ b/torch/csrc/api/include/torch/cuda.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstdint>
 #include <cstddef>
--- a/torch/csrc/api/include/torch/data/datasets/mnist.h
+++ b/torch/csrc/api/include/torch/data/datasets/mnist.h
@ -4,7 +4,7 @@
 #include <torch/data/example.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstddef>
 #include <string>
--- a/torch/csrc/api/include/torch/data/samplers/base.h
+++ b/torch/csrc/api/include/torch/data/samplers/base.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 #include <cstddef>
--- a/torch/csrc/api/include/torch/data/samplers/custom_batch_request.h
+++ b/torch/csrc/api/include/torch/data/samplers/custom_batch_request.h
@ -1,7 +1,7 @@
 #pragma once

 #include <cstddef>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace data {
--- a/torch/csrc/api/include/torch/data/samplers/distributed.h
+++ b/torch/csrc/api/include/torch/data/samplers/distributed.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/data/samplers/base.h>

 #include <cstddef>
--- a/torch/csrc/api/include/torch/data/samplers/random.h
+++ b/torch/csrc/api/include/torch/data/samplers/random.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/data/samplers/base.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/data/samplers/sequential.h
+++ b/torch/csrc/api/include/torch/data/samplers/sequential.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/data/samplers/base.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/data/samplers/stream.h
+++ b/torch/csrc/api/include/torch/data/samplers/stream.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/data/samplers/base.h>
 #include <torch/data/samplers/custom_batch_request.h>
 #include <torch/types.h>
--- a/torch/csrc/api/include/torch/enum.h
+++ b/torch/csrc/api/include/torch/enum.h
@ -5,7 +5,7 @@
 #include <ATen/core/Reduction.h>
 #include <c10/util/Exception.h>
 #include <c10/util/variant.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #define TORCH_ENUM_DECLARE(name) \
 namespace torch { \
--- a/torch/csrc/api/include/torch/jit.h
+++ b/torch/csrc/api/include/torch/jit.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/api/module.h>

 #include <string>
--- a/torch/csrc/api/include/torch/nn/init.h
+++ b/torch/csrc/api/include/torch/nn/init.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/enum.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/modules/activation.h
+++ b/torch/csrc/api/include/torch/nn/modules/activation.h
@ -6,7 +6,7 @@
 #include <torch/nn/modules/common.h>
 #include <torch/nn/modules/linear.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/modules/container/functional.h
+++ b/torch/csrc/api/include/torch/nn/modules/container/functional.h
@ -4,7 +4,7 @@
 #include <torch/nn/cloneable.h>
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <functional>
 #include <utility>
--- a/torch/csrc/api/include/torch/nn/modules/conv.h
+++ b/torch/csrc/api/include/torch/nn/modules/conv.h
@ -13,7 +13,7 @@
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstddef>
 #include <vector>
--- a/torch/csrc/api/include/torch/nn/modules/distance.h
+++ b/torch/csrc/api/include/torch/nn/modules/distance.h
@ -6,7 +6,7 @@
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/modules/dropout.h
+++ b/torch/csrc/api/include/torch/nn/modules/dropout.h
@ -5,7 +5,7 @@
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstddef>
 #include <vector>
--- a/torch/csrc/api/include/torch/nn/modules/loss.h
+++ b/torch/csrc/api/include/torch/nn/modules/loss.h
@ -7,7 +7,7 @@
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstddef>
 #include <vector>
--- a/torch/csrc/api/include/torch/nn/modules/padding.h
+++ b/torch/csrc/api/include/torch/nn/modules/padding.h
@ -4,7 +4,7 @@
 #include <torch/nn/cloneable.h>
 #include <torch/nn/functional/padding.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/modules/pixelshuffle.h
+++ b/torch/csrc/api/include/torch/nn/modules/pixelshuffle.h
@ -4,7 +4,7 @@
 #include <torch/nn/functional/pixelshuffle.h>
 #include <torch/nn/options/pixelshuffle.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/modules/pooling.h
+++ b/torch/csrc/api/include/torch/nn/modules/pooling.h
@ -6,7 +6,7 @@
 #include <torch/nn/functional/pooling.h>
 #include <torch/nn/modules/common.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/modules/upsampling.h
+++ b/torch/csrc/api/include/torch/nn/modules/upsampling.h
@ -6,7 +6,7 @@
 #include <torch/nn/pimpl.h>
 #include <torch/types.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <cstddef>
 #include <ostream>
--- a/torch/csrc/api/include/torch/nn/options/activation.h
+++ b/torch/csrc/api/include/torch/nn/options/activation.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/adaptive.h
+++ b/torch/csrc/api/include/torch/nn/options/adaptive.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/batchnorm.h
+++ b/torch/csrc/api/include/torch/nn/options/batchnorm.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/conv.h
+++ b/torch/csrc/api/include/torch/nn/options/conv.h
@ -2,7 +2,7 @@

 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/expanding_array.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/distance.h
+++ b/torch/csrc/api/include/torch/nn/options/distance.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/dropout.h
+++ b/torch/csrc/api/include/torch/nn/options/dropout.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/embedding.h
+++ b/torch/csrc/api/include/torch/nn/options/embedding.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <torch/enum.h>

--- a/torch/csrc/api/include/torch/nn/options/fold.h
+++ b/torch/csrc/api/include/torch/nn/options/fold.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/expanding_array.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/instancenorm.h
+++ b/torch/csrc/api/include/torch/nn/options/instancenorm.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/nn/options/batchnorm.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/linear.h
+++ b/torch/csrc/api/include/torch/nn/options/linear.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <c10/util/variant.h>

--- a/torch/csrc/api/include/torch/nn/options/loss.h
+++ b/torch/csrc/api/include/torch/nn/options/loss.h
@ -2,7 +2,7 @@

 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/normalization.h
+++ b/torch/csrc/api/include/torch/nn/options/normalization.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <vector>

--- a/torch/csrc/api/include/torch/nn/options/padding.h
+++ b/torch/csrc/api/include/torch/nn/options/padding.h
@ -3,7 +3,7 @@
 #include <c10/util/variant.h>
 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/expanding_array.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/pixelshuffle.h
+++ b/torch/csrc/api/include/torch/nn/options/pixelshuffle.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/pooling.h
+++ b/torch/csrc/api/include/torch/nn/options/pooling.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/expanding_array.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/rnn.h
+++ b/torch/csrc/api/include/torch/nn/options/rnn.h
@ -2,7 +2,7 @@

 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/options/transformer.h
+++ b/torch/csrc/api/include/torch/nn/options/transformer.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <torch/enum.h>

--- a/torch/csrc/api/include/torch/nn/options/transformercoder.h
+++ b/torch/csrc/api/include/torch/nn/options/transformercoder.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <torch/enum.h>

--- a/torch/csrc/api/include/torch/nn/options/transformerlayer.h
+++ b/torch/csrc/api/include/torch/nn/options/transformerlayer.h
@ -1,7 +1,7 @@
 #pragma once

 #include <torch/arg.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <torch/enum.h>

--- a/torch/csrc/api/include/torch/nn/options/upsampling.h
+++ b/torch/csrc/api/include/torch/nn/options/upsampling.h
@ -3,7 +3,7 @@
 #include <c10/util/variant.h>
 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/expanding_array.h>
 #include <torch/types.h>

--- a/torch/csrc/api/include/torch/nn/options/vision.h
+++ b/torch/csrc/api/include/torch/nn/options/vision.h
@ -2,7 +2,7 @@

 #include <torch/arg.h>
 #include <torch/enum.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/nn/utils/clip_grad.h
+++ b/torch/csrc/api/include/torch/nn/utils/clip_grad.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace nn {
--- a/torch/csrc/api/include/torch/nn/utils/convert_parameters.h
+++ b/torch/csrc/api/include/torch/nn/utils/convert_parameters.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>

 namespace torch {
--- a/torch/csrc/api/include/torch/optim/optimizer.h
+++ b/torch/csrc/api/include/torch/optim/optimizer.h
@ -4,7 +4,7 @@
 #include <c10/util/flat_hash_map.h>
 #include <c10/util/Exception.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/arg.h>

 #include <algorithm>
--- a/torch/csrc/api/include/torch/optim/schedulers/lr_scheduler.h
+++ b/torch/csrc/api/include/torch/optim/schedulers/lr_scheduler.h
@ -2,7 +2,7 @@

 #include <torch/optim/optimizer.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch {
 namespace optim {
--- a/torch/csrc/api/include/torch/serialize.h
+++ b/torch/csrc/api/include/torch/serialize.h
@ -3,7 +3,7 @@
 #include <c10/util/irange.h>
 #include <torch/serialize/archive.h>
 #include <torch/serialize/tensor.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <utility>

--- a/torch/csrc/api/include/torch/serialize/input-archive.h
+++ b/torch/csrc/api/include/torch/serialize/input-archive.h
@ -2,7 +2,7 @@

 #include <c10/util/Optional.h>
 #include <c10/core/Device.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/types.h>
 #include <torch/csrc/jit/api/module.h>

--- a/torch/csrc/api/include/torch/serialize/output-archive.h
+++ b/torch/csrc/api/include/torch/serialize/output-archive.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/api/module.h>

 #include <iosfwd>
--- a/torch/csrc/autograd/InferenceMode.h
+++ b/torch/csrc/autograd/InferenceMode.h
@ -1,7 +1,7 @@
 #pragma once

 #include <c10/core/InferenceMode.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch { namespace autograd {

--- a/torch/csrc/autograd/anomaly_mode.h
+++ b/torch/csrc/autograd/anomaly_mode.h
@ -2,7 +2,7 @@

 #include <string>
 #include <memory>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch { namespace autograd {

--- a/torch/csrc/autograd/engine.h
+++ b/torch/csrc/autograd/engine.h
@ -6,7 +6,7 @@
 #include <ATen/Tensor.h>
 #include <ATen/core/ivalue.h>
 #include <ATen/ThreadLocalState.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/anomaly_mode.h>
 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/functions/basic_ops.h>
--- a/torch/csrc/autograd/function_hook.h
+++ b/torch/csrc/autograd/function_hook.h
@ -1,7 +1,7 @@
 #pragma once

 #include <vector>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <ATen/Tensor.h>

 // A hook that's called on gradients
--- a/torch/csrc/autograd/functions/accumulate_grad.h
+++ b/torch/csrc/autograd/functions/accumulate_grad.h
@ -3,7 +3,7 @@
 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/variable.h>
 #include <torch/csrc/autograd/utils/grad_layout_contract.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <ATen/BatchedTensorImpl.h>

 #include <mutex>
--- a/torch/csrc/autograd/functions/basic_ops.h
+++ b/torch/csrc/autograd/functions/basic_ops.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/variable.h>

--- a/torch/csrc/autograd/functions/comm.h
+++ b/torch/csrc/autograd/functions/comm.h
@ -2,7 +2,7 @@

 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/variable.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <ATen/ATen.h>
 #include <ATen/cuda/CUDAContext.h>
--- a/torch/csrc/autograd/functions/tensor.h
+++ b/torch/csrc/autograd/functions/tensor.h
@ -2,7 +2,7 @@

 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/variable.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <ATen/TensorGeometry.h>
 #include <ATen/core/DeprecatedTypeProperties.h>
--- a/torch/csrc/autograd/functions/utils.h
+++ b/torch/csrc/autograd/functions/utils.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/autograd.h>
 #include <torch/csrc/autograd/function.h>
 #include <torch/csrc/autograd/variable.h>
--- a/torch/csrc/autograd/grad_mode.h
+++ b/torch/csrc/autograd/grad_mode.h
@ -1,7 +1,7 @@
 #pragma once

 #include <ATen/core/grad_mode.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 namespace torch { namespace autograd {

--- a/torch/csrc/autograd/profiler_legacy.h
+++ b/torch/csrc/autograd/profiler_legacy.h
@ -10,7 +10,7 @@
 #include <forward_list>
 #include <tuple>
 #include <ATen/ATen.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/profiler_utils.h>
 #ifndef _WIN32
 #include <ctime>
--- a/torch/csrc/autograd/saved_variable.h
+++ b/torch/csrc/autograd/saved_variable.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/forward_grad.h>
 #include <torch/csrc/autograd/saved_variable_hooks.h>

--- a/torch/csrc/autograd/variable.h
+++ b/torch/csrc/autograd/variable.h
@ -2,7 +2,7 @@

 #include <torch/csrc/utils/python_stub.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/autograd/edge.h>
 #include <torch/csrc/autograd/function_hook.h>
 #include <torch/csrc/autograd/cpp_hook.h>
--- a/torch/csrc/cuda/comm.h
+++ b/torch/csrc/cuda/comm.h
@ -1,7 +1,7 @@
 #pragma once

 #include <ATen/ATen.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <ATen/cuda/ATenCUDAGeneral.h>
 #include <ATen/cuda/CUDAContext.h>
 #include <c10/util/Optional.h>
--- a/torch/csrc/distributed/autograd/rpc_messages/autograd_metadata.h
+++ b/torch/csrc/distributed/autograd/rpc_messages/autograd_metadata.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <cstdint>

 namespace torch {
--- a/torch/csrc/distributed/rpc/profiler/remote_profiler_manager.h
+++ b/torch/csrc/distributed/rpc/profiler/remote_profiler_manager.h
@ -1,6 +1,6 @@
 #pragma once
 #include <c10/util/Optional.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/distributed/rpc/types.h>
 #include <mutex>
 #include <unordered_map>
--- a/torch/csrc/jit/api/compilation_unit.h
+++ b/torch/csrc/jit/api/compilation_unit.h
@ -7,7 +7,7 @@
 #include <torch/csrc/jit/ir/ir.h>
 #include <torch/csrc/jit/runtime/graph_executor.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/utils/memory.h>

 #include <ATen/core/function_schema.h>
--- a/torch/csrc/jit/api/module.h
+++ b/torch/csrc/jit/api/module.h
@ -9,7 +9,7 @@
 #include <torch/csrc/jit/runtime/argument_spec.h>
 #include <torch/csrc/jit/runtime/graph_executor.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/api/include/torch/ordered_dict.h>
 #include <torch/csrc/jit/api/compilation_unit.h>
 #include <torch/csrc/utils/memory.h>
--- a/torch/csrc/jit/codegen/cuda/arith.h
+++ b/torch/csrc/jit/codegen/cuda/arith.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/ir_interface_nodes.h>
 #include <torch/csrc/jit/codegen/cuda/type.h>
--- a/torch/csrc/jit/codegen/cuda/codegen.h
+++ b/torch/csrc/jit/codegen/cuda/codegen.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/codegen/cuda/kernel.h>

 #include <string>
--- a/torch/csrc/jit/codegen/cuda/compute_at.h
+++ b/torch/csrc/jit/codegen/cuda/compute_at.h
@ -3,7 +3,7 @@
 #include <torch/csrc/jit/codegen/cuda/root_domain_map.h>

 #include <c10/util/Exception.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <deque>
 #include <unordered_map>
--- a/torch/csrc/jit/codegen/cuda/dispatch.h
+++ b/torch/csrc/jit/codegen/cuda/dispatch.h
@ -3,7 +3,7 @@
 #include <torch/csrc/jit/codegen/cuda/utils.h>

 #include <c10/util/Exception.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <unordered_map>

--- a/torch/csrc/jit/codegen/cuda/expr_evaluator.h
+++ b/torch/csrc/jit/codegen/cuda/expr_evaluator.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/codegen/cuda/ir_interface_nodes.h>
 #include <torch/csrc/jit/codegen/cuda/iter_visitor.h>

--- a/torch/csrc/jit/codegen/cuda/fusion.h
+++ b/torch/csrc/jit/codegen/cuda/fusion.h
@ -2,7 +2,7 @@

 #include <ATen/core/ivalue.h>
 #include <c10/util/Exception.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/ir_base_nodes.h>
 #include <torch/csrc/jit/codegen/cuda/iter_visitor.h>
--- a/torch/csrc/jit/codegen/cuda/index_reference_replay.h
+++ b/torch/csrc/jit/codegen/cuda/index_reference_replay.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/compute_at_map.h>
 #include <torch/csrc/jit/codegen/cuda/index_compute.h>
--- a/torch/csrc/jit/codegen/cuda/instrumentation.cpp
+++ b/torch/csrc/jit/codegen/cuda/instrumentation.cpp
@ -1,6 +1,6 @@
 #include <torch/csrc/jit/codegen/cuda/instrumentation.h>

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #ifdef _WIN32
 #include <c10/util/win32-headers.h>
--- a/torch/csrc/jit/codegen/cuda/interface.h
+++ b/torch/csrc/jit/codegen/cuda/interface.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/ir/ir.h>
 #include <torch/csrc/jit/runtime/profiling_record.h>

--- a/torch/csrc/jit/codegen/cuda/ir_base_nodes.h
+++ b/torch/csrc/jit/codegen/cuda/ir_base_nodes.h
@ -3,7 +3,7 @@
 #include <c10/core/ScalarType.h>
 #include <c10/util/Exception.h>
 #include <c10/util/Optional.h>
-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/type.h>
 #include <torch/csrc/jit/codegen/cuda/utils.h>
--- a/torch/csrc/jit/codegen/cuda/ir_cloner.h
+++ b/torch/csrc/jit/codegen/cuda/ir_cloner.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/codegen/cuda/dispatch.h>

 #include <unordered_map>
--- a/torch/csrc/jit/codegen/cuda/ir_graphviz.h
+++ b/torch/csrc/jit/codegen/cuda/ir_graphviz.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/codegen/cuda/dispatch.h>

 #include <sstream>
--- a/torch/csrc/jit/codegen/cuda/ir_interface_nodes.h
+++ b/torch/csrc/jit/codegen/cuda/ir_interface_nodes.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/fusion.h>
 #include <torch/csrc/jit/codegen/cuda/ir_base_nodes.h>
--- a/torch/csrc/jit/codegen/cuda/ir_internal_nodes.h
+++ b/torch/csrc/jit/codegen/cuda/ir_internal_nodes.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/fusion.h>
 #include <torch/csrc/jit/codegen/cuda/ir_base_nodes.h>
--- a/torch/csrc/jit/codegen/cuda/ir_iostream.h
+++ b/torch/csrc/jit/codegen/cuda/ir_iostream.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/dispatch.h>

--- a/torch/csrc/jit/codegen/cuda/ir_printer.h
+++ b/torch/csrc/jit/codegen/cuda/ir_printer.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/ir_iostream.h>
 #include <torch/csrc/jit/codegen/cuda/iter_visitor.h>
--- a/torch/csrc/jit/codegen/cuda/iter_visitor.h
+++ b/torch/csrc/jit/codegen/cuda/iter_visitor.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>

 #include <torch/csrc/jit/codegen/cuda/dispatch.h>
 #include <torch/csrc/jit/codegen/cuda/type.h>
--- a/torch/csrc/jit/codegen/cuda/kernel.h
+++ b/torch/csrc/jit/codegen/cuda/kernel.h
@ -1,6 +1,6 @@
 #pragma once

-#include <torch/csrc/WindowsTorchApiMacro.h>
+#include <torch/csrc/Export.h>
 #include <torch/csrc/jit/codegen/cuda/kernel_ir.h>
 #include <torch/csrc/jit/codegen/cuda/lower_thread_predicate.h>
 #include <torch/csrc/jit/codegen/cuda/lower_warp_reduce.h>
--- a/Show More
+++ b/Show More