Skip to content

Commit fe6758a

Browse files
authored
Issue/444/partition bm fix (#445)
* benchmark works but gives seg fault * fixed partition BM as per issue
1 parent 393d027 commit fe6758a

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

benchmark/Partition_BM.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ static void PartitionHDRF_X(benchmark::State &state) {
1313
g.addEdge(&(*e.second));
1414
}
1515
for (auto _ : state) {
16-
auto result = g.partitionGraph(
17-
CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001);
16+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
17+
g, CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001);
1818
}
1919
}
2020
BENCHMARK(PartitionHDRF_X)
@@ -24,8 +24,9 @@ BENCHMARK(PartitionHDRF_X)
2424
static void PartitionHDRF_FromReadedCitHep(benchmark::State &state) {
2525
auto edgeSet = cit_graph_ptr->getEdgeSet();
2626
for (auto _ : state) {
27-
auto result = cit_graph_ptr->partitionGraph(
28-
CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001);
27+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
28+
*cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4,
29+
1, 0.001);
2930
}
3031
}
3132

@@ -41,8 +42,8 @@ static void PartitionEBVC_X(benchmark::State &state) {
4142
g.addEdge(&(*e.second));
4243
}
4344
for (auto _ : state) {
44-
auto result = g.partitionGraph(
45-
CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4);
45+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
46+
g, CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4);
4647
}
4748
}
4849
BENCHMARK(PartitionEBVC_X)
@@ -52,7 +53,8 @@ BENCHMARK(PartitionEBVC_X)
5253
static void PartitionEBVC_FromReadedCitHep(benchmark::State &state) {
5354
auto edgeSet = cit_graph_ptr->getEdgeSet();
5455
for (auto _ : state) {
55-
auto result = cit_graph_ptr->partitionGraph(
56+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
57+
*cit_graph_ptr,
5658
CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4);
5759
}
5860
}
@@ -69,8 +71,8 @@ static void PartitionGVC_X(benchmark::State &state) {
6971
g.addEdge(&(*e.second));
7072
}
7173
for (auto _ : state) {
72-
auto result = g.partitionGraph(
73-
CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4);
74+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
75+
g, CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4);
7476
}
7577
}
7678
BENCHMARK(PartitionGVC_X)
@@ -80,7 +82,8 @@ BENCHMARK(PartitionGVC_X)
8082
static void PartitionGVC_FromReadedCitHep(benchmark::State &state) {
8183
auto edgeSet = cit_graph_ptr->getEdgeSet();
8284
for (auto _ : state) {
83-
auto result = cit_graph_ptr->partitionGraph(
85+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
86+
*cit_graph_ptr,
8487
CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4);
8588
}
8689
}
@@ -97,8 +100,8 @@ static void PartitionEBV_X(benchmark::State &state) {
97100
g.addEdge(&(*e.second));
98101
}
99102
for (auto _ : state) {
100-
auto result = g.partitionGraph(
101-
CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, 1, 1);
103+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
104+
g, CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, 1, 1);
102105
}
103106
}
104107
BENCHMARK(PartitionEBV_X)
@@ -108,8 +111,9 @@ BENCHMARK(PartitionEBV_X)
108111
static void PartitionEBV_FromReadedCitHep(benchmark::State &state) {
109112
auto edgeSet = cit_graph_ptr->getEdgeSet();
110113
for (auto _ : state) {
111-
auto result = cit_graph_ptr->partitionGraph(
112-
CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, 1, 1);
114+
auto result = CXXGraph::Partitioning::Partitioner<int>::partitionGraph(
115+
*cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4,
116+
1, 1);
113117
}
114118
}
115119

0 commit comments

Comments
 (0)