Skip to content

Commit 8fd8e9e

Browse files
committed
Silenced GGCAT compilation warnings, added build_config to every
colorset builder
1 parent 887df05 commit 8fd8e9e

8 files changed

Lines changed: 35 additions & 23 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ include_directories(external/sketch/include/blaze)
4646

4747
add_custom_target(
4848
ggcat_cpp_api
49-
COMMAND make
49+
COMMAND ${CMAKE_COMMAND} -E env CARGO_ENCODED_RUSTFLAGS="-Awarnings" make
5050
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external/ggcat/crates/capi/ggcat-cpp-api
5151
)
5252
set(GGCAT_CPP_BINDINGS ${CMAKE_SOURCE_DIR}/external/ggcat/crates/capi/ggcat-cpp-api/lib/libggcat_cpp_bindings.a)

include/builders/builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct index<ColorSets>::builder {
3939
uint64_t num_unitigs = 0;
4040
uint64_t num_distinct_color_sets = 0;
4141

42-
typename ColorSets::builder builder(m_build_config.num_colors);
42+
typename ColorSets::builder builder(m_build_config.num_colors, m_build_config);
4343

4444
const uint64_t num_threads = m_build_config.num_threads;
4545
kmeans::thread_pool threads(num_threads);

include/builders/differential_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ struct index<ColorSets>::differential_builder {
253253
thread_slices.push_back(s);
254254

255255
std::vector<typename ColorSets::builder> thread_builders(thread_slices.size(),
256-
num_colors);
256+
typename ColorSets::builder(num_colors));
257257
std::vector<std::thread> threads(thread_slices.size());
258258

259259
auto encode_color_sets = [&](uint64_t thread_id) {

include/builders/meta_differential_builder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct index<ColorSets>::meta_differential_builder {
8181
thread_slices.push_back(s);
8282

8383
std::vector<differential::builder> thread_builders(thread_slices.size(),
84-
num_partition_colors);
84+
differential::builder(num_partition_colors));
8585
std::vector<std::thread> threads(thread_slices.size());
8686

8787
auto encode_color_sets = [&thread_builders, &thread_slices, &permutation,

include/color_sets/differential.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ struct differential {
66
static const index_t type = index_t::DIFF;
77

88
struct builder {
9-
builder() : m_num_total_integers(0), m_num_sets(0) {}
10-
builder(uint32_t num_colors)
11-
: m_num_total_integers(0), m_num_sets(0), m_num_colors(num_colors) {}
9+
explicit builder(const uint32_t num_colors = 0,
10+
build_configuration build_config = build_configuration())
11+
: m_num_total_integers(0)
12+
, m_num_sets(0)
13+
, m_num_colors(num_colors)
14+
, m_build_config(std::move(build_config)) {}
1215

1316
void init_color_sets_builder(uint64_t num_colors) {
1417
m_num_colors = num_colors;
@@ -165,6 +168,8 @@ struct differential {
165168
std::vector<uint64_t> m_representative_offsets, m_color_set_offsets;
166169

167170
std::vector<uint32_t> m_curr_representative;
171+
172+
build_configuration m_build_config;
168173
};
169174

170175
struct forward_iterator {

include/color_sets/hybrid.hpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,15 @@ struct hybrid {
1818
static const index_t type = index_t::HYBRID;
1919

2020
struct builder {
21-
builder() : m_num_color_sets(0) {}
22-
builder(uint64_t num_colors) { init(num_colors); }
23-
24-
// builder(build_configuration& build_config)
25-
// : m_num_colors(0)
26-
// , m_sparse_set_threshold_size(0)
27-
// , m_very_dense_set_threshold_size(0)
28-
// , m_num_color_sets(0)
29-
// , m_num_total_integers(0)
30-
// , m_build_config(build_config) {}
31-
// builder(build_configuration& build_config, const uint64_t num_colors)
32-
// : m_build_config(build_config) {
33-
// init(num_colors);
34-
// }
21+
// builder() : m_num_color_sets(0) { init(0); }
22+
// builder(uint64_t num_colors) { init(num_colors); }
23+
24+
explicit builder(const uint32_t num_colors = 0,
25+
build_configuration build_config = build_configuration())
26+
: m_build_config(std::move(build_config))
27+
{
28+
init(num_colors);
29+
}
3530

3631
void init(uint64_t num_colors) {
3732
m_num_colors = num_colors;

include/color_sets/meta.hpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ struct meta {
1717
};
1818

1919
struct builder {
20-
builder() : m_offset(0) { m_meta_color_sets_offsets.push_back(0); }
20+
explicit builder(build_configuration build_config = build_configuration())
21+
: m_offset(0)
22+
, m_build_config(std::move(build_config))
23+
{
24+
m_meta_color_sets_offsets.push_back(0);
25+
}
2126

2227
void init_meta_color_sets_builder(
2328
uint64_t num_integers_in_metacolor_sets, uint64_t num_color_sets,
@@ -87,6 +92,8 @@ struct meta {
8792
std::vector<uint64_t> m_meta_color_sets_offsets;
8893

8994
std::vector<partition_endpoint> m_partition_endpoints;
95+
96+
build_configuration m_build_config;
9097
};
9198

9299
struct forward_iterator {

include/color_sets/meta_differential.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ struct meta_differential {
1616
};
1717

1818
struct builder {
19-
builder() : m_prev_docs(0) {
19+
explicit builder(build_configuration build_config = build_configuration())
20+
: m_prev_docs(0)
21+
, m_build_config(std::move(build_config))
22+
{
2023
m_partition_sets_offsets.push_back(0);
2124
m_relative_colors_offsets.push_back(0);
2225
}
@@ -107,6 +110,8 @@ struct meta_differential {
107110
uint64_t m_num_partition_sets;
108111

109112
std::vector<partition_endpoint> m_partition_endpoints;
113+
114+
build_configuration m_build_config;
110115
};
111116

112117
struct forward_iterator {

0 commit comments

Comments
 (0)