10BC0 Update · pytorch/pytorch@ffc6fea · GitHub
[go: up one dir, main page]
Skip to content

Commit ffc6fea

Browse files
malfetmalfet
committed
Update
[ghstack-poisoned]
2 parents d3b7598 + 4d86177 commit ffc6fea

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

‎cmake/Dependencies.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,10 +1166,17 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
11661166

11671167
# Tensorpipe uses cuda_add_library
11681168
torch_update_find_cuda_flags()
1169+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
1170+
message(WARNING "Archived TensorPipe forces CMake compatibility mode")
1171+
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
1172+
endif()
11691173
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
11701174
# Suppress warning to unblock libnop compilation by clang-17
11711175
# See https://github.com/pytorch/pytorch/issues/151316
11721176
target_compile_options_if_supported(tensorpipe -Wno-missing-template-arg-list-after-template-kw)
1177+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
1178+
unset(CMAKE_POLICY_VERSION_MINIMUM)
1179+
endif()
11731180

11741181
list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe)
11751182
list(APPEND Caffe2_DEPENDENCY_LIBS nlohmann)

‎third_party/tensorpipe‎

‎torch/csrc/distributed/rpc/tensorpipe_agent.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88

99
#include <fmt/format.h>
1010
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated")
11+
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wextra-semi")
1112
#include <tensorpipe/tensorpipe.h>
1213
C10_DIAGNOSTIC_POP()
14+
C10_DIAGNOSTIC_POP()
1315

1416
#include <torch/csrc/distributed/rpc/agent_utils.h>
1517
#include <torch/csrc/distributed/rpc/tensorpipe_utils.h>

‎torch/csrc/distributed/rpc/tensorpipe_cuda.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
#include <c10/cuda/CUDAGuard.h>
88
#include <c10/cuda/CUDAStream.h>
99

10+
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wextra-semi")
1011
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated")
1112
#include <tensorpipe/tensorpipe.h>
1213
#include <tensorpipe/tensorpipe_cuda.h>
1314
C10_DIAGNOSTIC_POP()
15+
C10_DIAGNOSTIC_POP()
1416

1517
namespace torch::distributed::rpc {
1618
namespace {

‎torch/csrc/distributed/rpc/tensorpipe_utils.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
#include <limits>
77

88
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated")
9+
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wextra-semi")
910
#include <tensorpipe/tensorpipe.h>
1011
C10_DIAGNOSTIC_POP()
12+
C10_DIAGNOSTIC_POP()
1113

1214
namespace torch::distributed::rpc {
1315
namespace {

0 commit comments

Comments
 (0)
0