Skip to content

Commit 424896b

Browse files
zferguszfergus
authored
Sort includes using clang-format (#129)
* Sort includes using clang-format * Update clang-format-check.yml to version 19 * Update clang-format-check.yml * Update unordered_map_and_set.hpp
1 parent 968e72d commit 424896b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+113
-88
lines changed

‎.clang-format

+26-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,32 @@ BinPackParameters: false
88
AllowAllParametersOfDeclarationOnNextLine: true
99
AlignAfterOpenBracket: AlwaysBreak
1010
BreakBeforeBinaryOperators: NonAssignment
11-
SortIncludes: false
11+
SortIncludes: true
1212
CommentPragmas: '^@.+'
1313
BreakStringLiterals: false
1414
PackConstructorInitializers: CurrentLine
15+
# Regroup includes with a priority system
16+
IncludeBlocks: Regroup
17+
IncludeCategories:
18+
# by default, the main header of a cpp will get priority 0
19+
# regex here are sorted by search pattern, not by sort priority
20+
- Regex: "^<ipc\/[^/]*>" # this libraries
21+
Priority: 2 # internal library group
22+
SortPriority: 2
23+
CaseSensitive: true
24+
- Regex: "^<ipc\/.*\/.*>" # this libraries
25+
Priority: 2 # internal library group
26+
SortPriority: 3
27+
CaseSensitive: true
28+
- Regex: "^<(.*\\.h[px]*)|(Eigen\/.*)>"
29+
Priority: 4 # libraries (because they end in .h)
30+
SortPriority: 4
31+
CaseSensitive: false
32+
- Regex: "^<.*"
33+
Priority: 5 # system (without .h, because that is captured by the other group)
34+
SortPriority: 5
35+
CaseSensitive: false
36+
- Regex: ".*" # catch-all for internal files
37+
Priority: 1 # internal file group
38+
SortPriority: 1
39+
CaseSensitive: true

‎python/.clang-format

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BasedOnStyle: InheritParentConfig
2+
SortIncludes: false

‎python/src/utils/eigen_ext.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ void define_eigen_ext(py::module_& m)
99
{
1010
m.def(
1111
"project_to_pd",
12+
// clang-format off
1213
&project_to_pd<
1314
double, Eigen::Dynamic, Eigen::Dynamic,
1415
Eigen::ColMajor | Eigen::AutoAlign, Eigen::Dynamic, Eigen::Dynamic>,
16+
// clang-format on
1517
R"ipc_Qu8mg5v7(
1618
Matrix projection onto positive definite cone
1719
@@ -35,9 +37,11 @@ void define_eigen_ext(py::module_& m)
3537

3638
m.def(
3739
"project_to_psd",
40+
// clang-format off
3841
&project_to_psd<
3942
double, Eigen::Dynamic, Eigen::Dynamic,
4043
Eigen::ColMajor | Eigen::AutoAlign, Eigen::Dynamic, Eigen::Dynamic>,
44+
// clang-format on
4145
R"ipc_Qu8mg5v7(
4246
Matrix projection onto positive semi-definite cone
4347

‎src/ipc/broad_phase/aabb.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "aabb.hpp"
22

3-
#include <tbb/parallel_for.h>
43
#include <tbb/blocked_range.h>
4+
#include <tbb/parallel_for.h>
55

66
#include <cfenv>
77

‎src/ipc/broad_phase/broad_phase.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#include "broad_phase.hpp"
22

3+
#include <ipc/config.hpp>
34
#include <ipc/broad_phase/brute_force.hpp>
45
#include <ipc/broad_phase/bvh.hpp>
5-
#include <ipc/broad_phase/spatial_hash.hpp>
66
#include <ipc/broad_phase/hash_grid.hpp>
7+
#include <ipc/broad_phase/spatial_hash.hpp>
78
#include <ipc/broad_phase/sweep_and_prune.hpp>
89
#include <ipc/broad_phase/sweep_and_tiniest_queue.hpp>
910
#include <ipc/candidates/candidates.hpp>
1011

11-
#include <ipc/config.hpp>
12-
1312
namespace ipc {
1413

1514
void BroadPhase::build(

‎src/ipc/broad_phase/brute_force.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include <ipc/utils/merge_thread_local.hpp>
44

5+
#include <tbb/blocked_range2d.h>
56
#include <tbb/enumerable_thread_specific.h>
67
#include <tbb/parallel_for.h>
7-
#include <tbb/blocked_range2d.h>
88

99
#include <algorithm> // std::min/max
1010

‎src/ipc/broad_phase/bvh.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include <ipc/utils/merge_thread_local.hpp>
44

5-
#include <tbb/parallel_for.h>
65
#include <tbb/blocked_range.h>
76
#include <tbb/enumerable_thread_specific.h>
7+
#include <tbb/parallel_for.h>
88

99
using namespace std::placeholders;
1010

‎src/ipc/broad_phase/hash_grid.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "hash_grid.hpp"
22

33
#include <ipc/broad_phase/voxel_size_heuristic.hpp>
4-
#include <ipc/utils/merge_thread_local.hpp>
54
#include <ipc/utils/logger.hpp>
5+
#include <ipc/utils/merge_thread_local.hpp>
66

7-
#include <tbb/enumerable_thread_specific.h>
87
#include <tbb/blocked_range2d.h>
8+
#include <tbb/enumerable_thread_specific.h>
99
#include <tbb/parallel_for.h>
1010
#include <tbb/parallel_sort.h>
1111

‎src/ipc/broad_phase/spatial_hash.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
// Originally created by Minchen Li.
33
#include "spatial_hash.hpp"
44

5-
#include <ipc/ccd/aabb.hpp>
5+
#include <ipc/config.hpp>
66
#include <ipc/broad_phase/voxel_size_heuristic.hpp>
7+
#include <ipc/ccd/aabb.hpp>
78
#include <ipc/utils/merge_thread_local.hpp>
89

9-
#include <ipc/config.hpp>
10-
1110
#include <tbb/enumerable_thread_specific.h>
1211
#include <tbb/parallel_for.h>
1312
#include <tbb/parallel_sort.h>

‎src/ipc/broad_phase/spatial_hash.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#pragma once
44

55
#include <ipc/broad_phase/broad_phase.hpp>
6-
#include <ipc/utils/unordered_map_and_set.hpp>
76
#include <ipc/utils/eigen_ext.hpp>
7+
#include <ipc/utils/unordered_map_and_set.hpp>
88

99
#include <vector>
1010

‎src/ipc/broad_phase/sweep_and_tiniest_queue.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifdef IPC_TOOLKIT_WITH_CUDA
66

77
#include <ipc/broad_phase/broad_phase.hpp>
8+
89
#include <scalable_ccd/cuda/broad_phase/broad_phase.cuh>
910

1011
namespace ipc {

‎src/ipc/candidates/candidates.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#include "candidates.hpp"
22

3+
#include <ipc/config.hpp>
34
#include <ipc/ipc.hpp>
4-
#include <ipc/utils/save_obj.hpp>
55
#include <ipc/utils/eigen_ext.hpp>
6-
7-
#include <ipc/config.hpp>
6+
#include <ipc/utils/save_obj.hpp>
87

98
#include <igl/remove_unreferenced.h>
10-
#include <tbb/parallel_for.h>
119
#include <tbb/blocked_range.h>
12-
#include <shared_mutex>
10+
#include <tbb/parallel_for.h>
1311

1412
#include <fstream>
13+
#include <shared_mutex>
1514

1615
namespace ipc {
1716

‎src/ipc/candidates/candidates.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

33
#include <ipc/broad_phase/broad_phase.hpp>
4-
#include <ipc/candidates/vertex_vertex.hpp>
5-
#include <ipc/candidates/edge_vertex.hpp>
64
#include <ipc/candidates/edge_edge.hpp>
5+
#include <ipc/candidates/edge_vertex.hpp>
76
#include <ipc/candidates/face_vertex.hpp>
7+
#include <ipc/candidates/vertex_vertex.hpp>
88

99
#include <Eigen/Core>
1010

‎src/ipc/candidates/continuous_collision_candidate.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include <ipc/ccd/default_narrow_phase_ccd.hpp>
43
#include <ipc/candidates/collision_stencil.hpp>
4+
#include <ipc/ccd/default_narrow_phase_ccd.hpp>
55

6-
#include <vector>
76
#include <ostream>
7+
#include <vector>
88

99
namespace ipc {
1010

‎src/ipc/ccd/additive_ccd.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
#include "additive_ccd.hpp"
2323

24-
#include <ipc/distance/point_point.hpp>
24+
#include <ipc/distance/edge_edge.hpp>
2525
#include <ipc/distance/point_edge.hpp>
26+
#include <ipc/distance/point_point.hpp>
2627
#include <ipc/distance/point_triangle.hpp>
27-
#include <ipc/distance/edge_edge.hpp>
2828

2929
namespace ipc {
3030

‎src/ipc/ccd/inexact_ccd.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#ifdef IPC_TOOLKIT_WITH_INEXACT_CCD
44

55
#include <ipc/ccd/check_initial_distance.hpp>
6-
#include <ipc/distance/point_point.hpp>
7-
#include <ipc/distance/point_edge.hpp>
86
#include <ipc/distance/edge_edge.hpp>
7+
#include <ipc/distance/point_edge.hpp>
8+
#include <ipc/distance/point_point.hpp>
99
#include <ipc/distance/point_triangle.hpp>
1010

1111
#include <CTCD.h>

‎src/ipc/ccd/nonlinear_ccd.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "nonlinear_ccd.hpp"
22

33
#include <ipc/ccd/check_initial_distance.hpp>
4-
#include <ipc/distance/point_point.hpp>
5-
#include <ipc/distance/point_edge.hpp>
64
#include <ipc/distance/edge_edge.hpp>
5+
#include <ipc/distance/point_edge.hpp>
6+
#include <ipc/distance/point_point.hpp>
77
#include <ipc/distance/point_triangle.hpp>
88

99
#include <tight_inclusion/ccd.hpp>

‎src/ipc/ccd/nonlinear_ccd.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include <ipc/config.hpp>
4-
54
#include <ipc/ccd/tight_inclusion_ccd.hpp>
65
#ifdef IPC_TOOLKIT_WITH_FILIB
76
#include <ipc/utils/interval.hpp>

‎src/ipc/ccd/tight_inclusion_ccd.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "tight_inclusion_ccd.hpp"
22

33
#include <ipc/ccd/check_initial_distance.hpp>
4-
#include <ipc/distance/point_point.hpp>
5-
#include <ipc/distance/point_edge.hpp>
64
#include <ipc/distance/edge_edge.hpp>
5+
#include <ipc/distance/point_edge.hpp>
6+
#include <ipc/distance/point_point.hpp>
77
#include <ipc/distance/point_triangle.hpp>
88

99
#include <tight_inclusion/ccd.hpp>

‎src/ipc/collision_mesh.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "collision_mesh.hpp"
22

3-
#include <ipc/utils/unordered_map_and_set.hpp>
4-
#include <ipc/utils/logger.hpp>
3+
#include <ipc/utils/area_gradient.hpp>
54
#include <ipc/utils/eigen_ext.hpp>
65
#include <ipc/utils/local_to_global.hpp>
7-
#include <ipc/utils/area_gradient.hpp>
6+
#include <ipc/utils/logger.hpp>
7+
#include <ipc/utils/unordered_map_and_set.hpp>
88

99
namespace ipc {
1010

‎src/ipc/collisions/collisions.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#include "collisions.hpp"
22

33
#include <ipc/collisions/collisions_builder.hpp>
4-
#include <ipc/distance/point_point.hpp>
5-
#include <ipc/distance/point_line.hpp>
6-
#include <ipc/distance/point_edge.hpp>
74
#include <ipc/distance/edge_edge.hpp>
5+
#include <ipc/distance/point_edge.hpp>
6+
#include <ipc/distance/point_line.hpp>
87
#include <ipc/distance/point_plane.hpp>
8+
#include <ipc/distance/point_point.hpp>
99
#include <ipc/utils/local_to_global.hpp>
1010

11+
#include <tbb/blocked_range.h>
12+
#include <tbb/enumerable_thread_specific.h>
1113
#include <tbb/parallel_for.h>
1214
#include <tbb/parallel_reduce.h>
1315
#include <tbb/parallel_sort.h>
14-
#include <tbb/blocked_range.h>
15-
#include <tbb/enumerable_thread_specific.h>
1616

1717
#include <stdexcept> // std::out_of_range
1818

‎src/ipc/collisions/collisions.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

33
#include <ipc/collision_mesh.hpp>
4+
#include <ipc/broad_phase/broad_phase.hpp>
5+
#include <ipc/candidates/candidates.hpp>
46
#include <ipc/collisions/collision.hpp>
5-
#include <ipc/collisions/vertex_vertex.hpp>
6-
#include <ipc/collisions/edge_vertex.hpp>
77
#include <ipc/collisions/edge_edge.hpp>
8+
#include <ipc/collisions/edge_vertex.hpp>
89
#include <ipc/collisions/face_vertex.hpp>
910
#include <ipc/collisions/plane_vertex.hpp>
10-
#include <ipc/broad_phase/broad_phase.hpp>
11-
#include <ipc/candidates/candidates.hpp>
11+
#include <ipc/collisions/vertex_vertex.hpp>
1212

1313
#include <Eigen/Core>
1414

‎src/ipc/collisions/collisions_builder.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "collisions_builder.hpp"
22

33
#include <ipc/distance/distance_type.hpp>
4-
#include <ipc/distance/point_point.hpp>
5-
#include <ipc/distance/point_edge.hpp>
64
#include <ipc/distance/edge_edge.hpp>
75
#include <ipc/distance/edge_edge_mollifier.hpp>
6+
#include <ipc/distance/point_edge.hpp>
7+
#include <ipc/distance/point_point.hpp>
88
#include <ipc/distance/point_triangle.hpp>
99

1010
namespace ipc {

‎src/ipc/collisions/collisions_builder.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
#include <ipc/collision_mesh.hpp>
44
#include <ipc/collisions/collisions.hpp>
55

6-
#include <tbb/enumerable_thread_specific.h>
7-
86
#include <Eigen/Core>
7+
#include <tbb/enumerable_thread_specific.h>
98

109
namespace ipc {
1110

‎src/ipc/distance/edge_edge.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "edge_edge.hpp"
44

5-
#include <ipc/distance/point_point.hpp>
6-
#include <ipc/distance/point_line.hpp>
75
#include <ipc/distance/line_line.hpp>
6+
#include <ipc/distance/point_line.hpp>
7+
#include <ipc/distance/point_point.hpp>
88

99
#include <stdexcept> // std::invalid_argument
1010

‎src/ipc/distance/point_plane.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "point_plane.hpp"
22

33
#include <ipc/utils/eigen_ext.hpp>
4+
45
#include <Eigen/Geometry>
56

67
namespace ipc {

‎src/ipc/friction/closest_point.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "closest_point.hpp"
22

3-
#include <Eigen/Core>
43
#include <Eigen/Cholesky>
4+
#include <Eigen/Core>
55

66
namespace ipc {
77

‎src/ipc/friction/collisions/edge_edge.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "edge_edge.hpp"
22

3+
#include <ipc/distance/edge_edge.hpp>
34
#include <ipc/friction/closest_point.hpp>
45
#include <ipc/friction/relative_velocity.hpp>
56
#include <ipc/friction/tangent_basis.hpp>
6-
#include <ipc/distance/edge_edge.hpp>
77

88
namespace ipc {
99

‎src/ipc/friction/collisions/edge_edge.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <ipc/friction/collisions/friction_collision.hpp>
43
#include <ipc/candidates/edge_edge.hpp>
4+
#include <ipc/friction/collisions/friction_collision.hpp>
55
#include <ipc/utils/eigen_ext.hpp>
66

77
namespace ipc {

0 commit comments

Comments
 (0)