Enable torch static build on Windows

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

Reviewed By: yf225, pjh5

Differential Revision: D13597845

Pulled By: orionr

fbshipit-source-id: 99640e22974990ae570a4795ce07274c4447cb01

diff --git a/tools/build_pytorch_libs.bat b/tools/build_pytorch_libs.bat
index 390f25e..5848023 100755 (executable)
--- a/tools/build_pytorch_libs.bat
+++ b/tools/build_pytorch_libs.bat
@@ -242,7 +242,7 @@ goto:eof
                   -DCMAKE_CXX_FLAGS="/EHa %USER_CFLAGS%" ^
                   -DCMAKE_EXE_LINKER_FLAGS="%USER_LDFLAGS%" ^
                   -DCMAKE_SHARED_LINKER_FLAGS="%USER_LDFLAGS%" ^
-                  -DUSE_ROCM=%USE_ROCM%
+                  -DUSE_ROCM=%USE_ROCM% %EXTRA_CAFFE2_CMAKE_FLAGS%
   IF ERRORLEVEL 1 exit 1
   IF NOT ERRORLEVEL 0 exit 1
 

diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
index 578cd0e..f5343a8 100644 (file)
--- a/torch/CMakeLists.txt
+++ b/torch/CMakeLists.txt
@@ -264,6 +264,7 @@ endif()
 
 
 if (TORCH_STATIC)
+  target_compile_definitions(torch PUBLIC TORCH_BUILD_STATIC_LIBS)
   add_library(torch STATIC ${TORCH_SRCS})
 else()
   add_library(torch SHARED ${TORCH_SRCS})

diff --git a/torch/csrc/WindowsTorchApiMacro.h b/torch/csrc/WindowsTorchApiMacro.h
index 8b17709..371355a 100644 (file)
--- a/torch/csrc/WindowsTorchApiMacro.h
+++ b/torch/csrc/WindowsTorchApiMacro.h
@@ -1,11 +1,15 @@
 #pragma once
 
 #ifdef _WIN32
+#if !defined(TORCH_BUILD_STATIC_LIBS)
 #if defined(torch_EXPORTS)
 #define TORCH_API __declspec(dllexport)
 #else
 #define TORCH_API __declspec(dllimport)
 #endif
+#else
+#define TORCH_API
+#endif
 #elif defined(__GNUC__)
 #if defined(torch_EXPORTS)
 #define TORCH_API __attribute__((__visibility__("default")))