Skip to content

Commit f0ab354

Browse files
authored
Merge branch 'main' into test_gif_script
2 parents bf113a5 + 17d972a commit f0ab354

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

torchvision/csrc/macros.h

-10
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,3 @@
99
#else
1010
#define VISION_API
1111
#endif
12-
13-
#if (defined __cpp_inline_variables) || __cplusplus >= 201703L
14-
#define VISION_INLINE_VARIABLE inline
15-
#else
16-
#ifdef _MSC_VER
17-
#define VISION_INLINE_VARIABLE __declspec(selectany)
18-
#else
19-
#define VISION_INLINE_VARIABLE __attribute__((weak))
20-
#endif
21-
#endif

torchvision/csrc/vision.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ namespace vision {
77
VISION_API int64_t cuda_version();
88

99
namespace detail {
10-
extern "C" VISION_INLINE_VARIABLE auto _register_ops = &cuda_version;
10+
extern "C" inline auto _register_ops = &cuda_version;
1111
} // namespace detail
1212
} // namespace vision

0 commit comments

Comments
 (0)