Factor out common macros in single file

pytorch · Oct 15, 2020 · 2c3b9d0 · 2c3b9d0
1 parent 535504d
commit 2c3b9d0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,6 @@ endif()
 
 add_library(${PROJECT_NAME} SHARED ${MODELS_SOURCES} ${OPERATOR_SOURCES} ${IMAGE_SOURCES})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES} ${PNG_LIBRARY} ${JPEG_LIBRARIES} Python3::Python)
-target_compile_definitions(${PROJECT_NAME} PRIVATE VISION_BUILD_LIB)
 set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME TorchVision)
 
 include_directories(torchvision/csrc ${JPEG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS})

diff --git a/setup.py b/setup.py
@@ -178,7 +178,7 @@ def get_extensions():
         tests = test_file + source_models
         tests_include_dirs = [test_dir, models_dir]
 
-    define_macros = [('VISION_BUILD_LIB', None)]
+    define_macros = []
 
     extra_compile_args = {}
     if (torch.cuda.is_available() and ((CUDA_HOME is not None) or is_rocm_pytorch)) \

diff --git a/torchvision/csrc/cpu/vision_cpu.h b/torchvision/csrc/cpu/vision_cpu.h
@@ -1,15 +1,6 @@
 #pragma once
 #include <torch/extension.h>
-
-#ifdef _WIN32
-#if defined(torchvision_EXPORTS)
-#define VISION_API __declspec(dllexport)
-#else
-#define VISION_API __declspec(dllimport)
-#endif
-#else
-#define VISION_API
-#endif
+#include "../macros.h"
 
 VISION_API std::tuple<at::Tensor, at::Tensor> ROIPool_forward_cpu(
     const at::Tensor& input,

diff --git a/torchvision/csrc/cuda/vision_cuda.h b/torchvision/csrc/cuda/vision_cuda.h
@@ -1,15 +1,6 @@
 #pragma once
 #include <torch/extension.h>
-
-#ifdef _WIN32
-#if defined(torchvision_EXPORTS)
-#define VISION_API __declspec(dllexport)
-#else
-#define VISION_API __declspec(dllimport)
-#endif
-#else
-#define VISION_API
-#endif
+#include "../macros.h"
 
 VISION_API at::Tensor ROIAlign_forward_cuda(
     const at::Tensor& input,

diff --git a/torchvision/csrc/macros.h b/torchvision/csrc/macros.h
@@ -0,0 +1,24 @@
+#ifndef TORCHVISION_MACROS_H
+#define TORCHVISION_MACROS_H
+
+#ifdef _WIN32
+#if defined(torchvision_EXPORTS)
+#define VISION_API __declspec(dllexport)
+#else
+#define VISION_API __declspec(dllimport)
+#endif
+#else
+#define VISION_API
+#endif
+
+#if (defined __cpp_inline_variables) || __cplusplus >= 201703L
+#define VISION_INLINE_VARIABLE inline
+#else
+#ifdef _MSC_VER
+#define VISION_INLINE_VARIABLE __declspec(selectany)
+#else
+#define VISION_INLINE_VARIABLE __attribute__((weak))
+#endif
+#endif
+
+#endif // TORCHVISION_MACROS_H
diff --git a/torchvision/csrc/vision.h b/torchvision/csrc/vision.h
@@ -1,24 +1,8 @@
 #ifndef VISION_H
 #define VISION_H
 
-#include <c10/macros/Macros.h>
 #include <torchvision/models/models.h>
-
-#if (defined __cpp_inline_variables) || __cplusplus >= 201703L
-#define VISION_INLINE_VARIABLE inline
-#else
-#ifdef _MSC_VER
-#define VISION_INLINE_VARIABLE __declspec(selectany)
-#else
-#define VISION_INLINE_VARIABLE __attribute__((weak))
-#endif
-#endif
-
-#ifdef VISION_BUILD_LIB
-#define VISION_API C10_EXPORT
-#else
-#define VISION_API C10_IMPORT
-#endif
+#include "macros.h"
 
 namespace vision {
 VISION_API int RegisterOps() noexcept;