Skip to content

Commit b9ceb6b

Browse files
wujingyuewujingyue
authored
Convert local includes in multidevice tests to quote style (#5745)
- Convert local includes in multidevice tests to quote style - Reorder include blocks to match Google C++ include ordering - Add blank lines between third-party include groups and drop unused torch include
1 parent a19cc32 commit b9ceb6b

18 files changed

+172
-172
lines changed

‎tests/cpp/multidevice.cpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,28 @@
55
* SPDX-License-Identifier: BSD-3-Clause
66
*/
77
// clang-format on
8+
#include "tests/cpp/multidevice.h"
9+
810
#include <sys/types.h>
911
#include <unistd.h>
1012
#include <mutex>
1113

1214
#ifdef NVFUSER_DISTRIBUTED
1315
#include <torch/csrc/distributed/c10d/debug.h>
1416
#else
15-
#include <multidevice/c10d_mock.h>
17+
#include "multidevice/c10d_mock.h"
1618
#endif
1719
#include <torch/cuda.h>
1820

19-
#include <fusion_segmenter.h>
20-
#include <ir/all_nodes.h>
21-
#include <ir/iostream.h>
22-
#include <multidevice/execution_utils.h>
23-
#include <multidevice/utils.h>
24-
#include <ops/all_ops.h>
25-
#include <options.h>
26-
#include <runtime/allocations.h>
27-
#include <tests/cpp/multidevice.h>
28-
#include <tests/cpp/validator.h>
21+
#include "fusion_segmenter.h"
22+
#include "ir/all_nodes.h"
23+
#include "ir/iostream.h"
24+
#include "multidevice/execution_utils.h"
25+
#include "multidevice/utils.h"
26+
#include "ops/all_ops.h"
27+
#include "options.h"
28+
#include "runtime/allocations.h"
29+
#include "tests/cpp/validator.h"
2930

3031
namespace nvfuser {
3132

‎tests/cpp/multidevice.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
// clang-format on
88
#pragma once
99

10-
#include <multidevice/communication.h>
11-
#include <multidevice/communicator.h>
12-
#include <multidevice/execution_utils.h>
13-
#include <multidevice/executor.h>
14-
#include <multidevice/utils.h>
15-
#include <tests/cpp/utils.h>
10+
#include "multidevice/communication.h"
11+
#include "multidevice/communicator.h"
12+
#include "multidevice/execution_utils.h"
13+
#include "multidevice/executor.h"
14+
#include "multidevice/utils.h"
15+
#include "tests/cpp/utils.h"
1616

1717
namespace nvfuser {
1818

‎tests/cpp/multidevice_transformer.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
* SPDX-License-Identifier: BSD-3-Clause
66
*/
77
// clang-format on
8+
#include "tests/cpp/multidevice_transformer.h"
9+
810
#include <unordered_set>
911
#include <vector>
1012

11-
#include <fusion.h>
12-
#include <ir/utils.h>
13-
#include <multidevice/utils.h>
14-
#include <ops/all_ops.h>
15-
#include <scheduler/utils.h>
16-
#include <tests/cpp/multidevice.h>
17-
#include <tests/cpp/multidevice_transformer.h>
13+
#include "fusion.h"
14+
#include "ir/utils.h"
15+
#include "multidevice/utils.h"
16+
#include "ops/all_ops.h"
17+
#include "scheduler/utils.h"
18+
#include "tests/cpp/multidevice.h"
1819

1920
namespace nvfuser {
2021
namespace {

‎tests/cpp/multidevice_transformer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <cstdint>
99
#include <vector>
1010

11-
#include <runtime/fusion_executor_cache.h>
11+
#include "runtime/fusion_executor_cache.h"
1212

1313
namespace nvfuser {
1414

‎tests/cpp/test_multidevice_communications.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
* SPDX-License-Identifier: BSD-3-Clause
66
*/
77
// clang-format on
8+
#include <cuda.h>
9+
810
#include <gtest/gtest.h>
911

10-
#include <cuda.h>
11-
#include <cuda_utils.h>
12-
#include <driver_api.h>
13-
#include <fusion.h>
14-
#include <ir/builder.h>
15-
#include <multidevice/communication.h>
16-
#include <multidevice/communicator.h>
17-
#include <multidevice/cuda_p2p.h>
18-
#include <tests/cpp/multidevice.h>
19-
#include <tests/cpp/validator.h>
20-
21-
#include <ops/all_ops.h>
22-
#include <ops/arith.h>
23-
#include <ops/utils.h>
12+
#include "cuda_utils.h"
13+
#include "driver_api.h"
14+
#include "fusion.h"
15+
#include "ir/builder.h"
16+
#include "multidevice/communication.h"
17+
#include "multidevice/communicator.h"
18+
#include "multidevice/cuda_p2p.h"
19+
#include "ops/all_ops.h"
20+
#include "ops/arith.h"
21+
#include "ops/utils.h"
22+
#include "tests/cpp/multidevice.h"
23+
#include "tests/cpp/validator.h"
2424

2525
namespace nvfuser {
2626

‎tests/cpp/test_multidevice_communicator.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <gmock/gmock-matchers.h>
1212
#include <gtest/gtest.h>
1313

14-
#include <multidevice/communicator.h>
15-
#include <tests/cpp/multidevice.h>
14+
#include "multidevice/communicator.h"
15+
#include "tests/cpp/multidevice.h"
1616

1717
namespace std {
1818
namespace chrono {

‎tests/cpp/test_multidevice_host_ir.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
// clang-format on
88
#include <torch/torch.h>
99

10-
#include <fusion.h>
11-
#include <host_ir/container.h>
12-
#include <host_ir/evaluator.h>
13-
#include <host_ir/pass/stream_parallel_type.h>
14-
#include <ir/all_nodes.h>
15-
#include <ops/all_ops.h>
16-
#include <preseg_passes/reorder_sharded_axis.h>
17-
#include <tests/cpp/multidevice.h>
10+
#include "fusion.h"
11+
#include "host_ir/container.h"
12+
#include "host_ir/evaluator.h"
13+
#include "host_ir/pass/stream_parallel_type.h"
14+
#include "ir/all_nodes.h"
15+
#include "ops/all_ops.h"
16+
#include "preseg_passes/reorder_sharded_axis.h"
17+
#include "tests/cpp/multidevice.h"
1818

1919
namespace nvfuser {
2020

‎tests/cpp/test_multidevice_host_ir_overlap.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#include <c10/cuda/CUDAStream.h>
1010
#include <c10/util/ArrayRef.h>
1111

12-
#include <fusion.h>
13-
#include <host_ir/container.h>
14-
#include <host_ir/evaluator.h>
15-
#include <host_ir/ir.h>
16-
#include <ir/utils.h>
17-
#include <multidevice/cuda_p2p.h>
18-
#include <ops/all_ops.h>
19-
#include <tests/cpp/multidevice.h>
12+
#include "fusion.h"
13+
#include "host_ir/container.h"
14+
#include "host_ir/evaluator.h"
15+
#include "host_ir/ir.h"
16+
#include "ir/utils.h"
17+
#include "multidevice/cuda_p2p.h"
18+
#include "ops/all_ops.h"
19+
#include "tests/cpp/multidevice.h"
2020

2121
namespace nvfuser {
2222

‎tests/cpp/test_multidevice_ipc.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
*/
77
// clang-format on
88
#include <cuda.h>
9-
#include <fusion.h>
10-
#include <host_ir/container.h>
11-
#include <host_ir/evaluator.h>
12-
#include <ir/all_nodes.h>
13-
#include <multidevice/ipc_utils.h>
14-
#include <multidevice/utils.h>
15-
#include <ops/all_ops.h>
16-
#include <tests/cpp/multidevice.h>
9+
10+
#include "fusion.h"
11+
#include "host_ir/container.h"
12+
#include "host_ir/evaluator.h"
13+
#include "ir/all_nodes.h"
14+
#include "multidevice/ipc_utils.h"
15+
#include "multidevice/utils.h"
16+
#include "ops/all_ops.h"
17+
#include "tests/cpp/multidevice.h"
1718

1819
namespace nvfuser {
1920

‎tests/cpp/test_multidevice_lower_communication.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
* SPDX-License-Identifier: BSD-3-Clause
66
*/
77
// clang-format on
8-
9-
#include <cuda_utils.h>
10-
#include <driver_api.h>
118
#include <gmock/gmock-matchers.h>
129
#include <gtest/gtest.h>
1310

14-
#include <multidevice/execution_utils.h>
15-
#include <ops/all_ops.h>
16-
#include <optimization_pass.h>
17-
#include <preseg_passes/mark_aliases_prepare.h>
18-
#include <runtime/communication_executor.h>
19-
#include <runtime/fusion_executor_cache.h>
20-
#include <tests/cpp/multidevice.h>
21-
#include <tests/cpp/validator.h>
11+
#include "cuda_utils.h"
12+
#include "driver_api.h"
13+
#include "multidevice/execution_utils.h"
14+
#include "ops/all_ops.h"
15+
#include "optimization_pass.h"
16+
#include "preseg_passes/mark_aliases_prepare.h"
17+
#include "runtime/communication_executor.h"
18+
#include "runtime/fusion_executor_cache.h"
19+
#include "tests/cpp/multidevice.h"
20+
#include "tests/cpp/validator.h"
2221

2322
namespace nvfuser {
2423

0 commit comments

Comments
 (0)