Skip to content

Commit b88d4ba

Browse files
authored
Fix small C++ warnings around type conversions (#520)
1 parent b70d4b4 commit b88d4ba

File tree

11 files changed

+15
-17
lines changed

11 files changed

+15
-17
lines changed

documentation/Building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cmake --build ./src/build -j3
1313

1414
Then you can run the tests:
1515

16-
```
16+
```bash
1717
cmake --build ./src/build --target check
1818
```
1919

src/include/index/flat_pq_index.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ class flat_pq_index {
200200
auto sub_begin = subspace * dimensions_ / num_subspaces_;
201201
auto sub_end = (subspace + 1) * dimensions_ / num_subspaces_;
202202

203-
auto local_sub_distance = SubDistance{sub_begin, sub_end};
204-
205203
sub_kmeans_random_init(training_set, centroids_, sub_begin, sub_end);
206204
size_t iters;
207205
double conv;

src/include/test/unit_algorithm.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ TEST_CASE("range_for_each", "[algorithm]") {
192192

193193
// Test with both a vector (b/c it's simple) and matrix (b/c it's what we use
194194
// in practice).
195-
std::vector<int> thread_used(num_vectors, 0);
195+
std::vector<size_t> thread_used(num_vectors, 0);
196196
auto thread_used_matrix = ColMajorMatrix<float>(k, num_vectors);
197197

198198
for (size_t num_threads = 1;
@@ -203,7 +203,7 @@ TEST_CASE("range_for_each", "[algorithm]") {
203203
queries,
204204
[&](auto&& vector, auto thread_index, auto index) {
205205
thread_used[index] = thread_index;
206-
for (int j = 0; j < k; ++j) {
206+
for (size_t j = 0; j < k; ++j) {
207207
thread_used_matrix[index][j] = thread_index;
208208
}
209209
});

src/include/test/unit_api_feature_vector_array.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ TEST_CASE("feature vector array with IDs open", "[api]") {
246246
}
247247

248248
TEST_CASE("MatrixWithIds constructors and destructors", "[api]") {
249-
auto rows = 3;
250-
auto cols = 7;
249+
uint64_t rows = 3;
250+
uint64_t cols = 7;
251251

252252
SECTION("copy constructor") {
253253
using DataType = int;

src/include/test/unit_ivf_pq_group.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ TEST_CASE("write constructor - create and read", "[ivf_pq_group]") {
113113

114114
{
115115
uint64_t dimensions = 10;
116-
auto num_clusters = 11;
117-
auto num_subspaces = 12;
116+
uint32_t num_clusters = 11;
117+
uint32_t num_subspaces = 12;
118118
ivf_pq_group x = ivf_pq_group<dummy_index>(
119119
ctx,
120120
tmp_uri,

src/include/test/unit_ivf_qv.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,10 @@ TEST_CASE("indices", "[ivf qv]") {
591591
(std::filesystem::temp_directory_path() / "ids").string();
592592

593593
// Create the partitioned_matrix.
594-
int num_vectors = GENERATE(37, 99, 377);
594+
size_t num_vectors = GENERATE(37, 99, 377);
595595
uint64_t dimensions = 3;
596-
int num_parts = num_vectors;
597-
int num_queries = GENERATE(1, 9, 38);
596+
size_t num_parts = num_vectors;
597+
size_t num_queries = GENERATE(1, 9, 38);
598598
std::vector<part_index_type> indices;
599599
{
600600
auto training_set = ColMajorMatrix<feature_type>(dimensions, num_vectors);

src/include/test/unit_matrix_with_ids.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ TEMPLATE_TEST_CASE(
202202
stdx::layout_left) {
203203
std::vector<MatrixWithIds<float, float, TestType>> v;
204204

205-
auto numIds = 3;
205+
size_t numIds = 3;
206206
auto A = MatrixWithIds<float, float, TestType>{
207207
{{8, 6, 7}, {5, 3, 0}, {9, 5, 0}}, {0, 1, 2}};
208208
auto aptr = A.data();

src/include/test/unit_partition.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ TEST_CASE("partition_ivf_index", "[partition]") {
8181
// auto partition_ivf_index(
8282
// auto&& centroids, auto&& query, size_t nprobe, size_t nthreads)
8383

84-
auto nprobe = GENERATE(1, 2, 3);
85-
auto nthreads = GENERATE(3);
84+
size_t nprobe = GENERATE(1, 2, 3);
85+
size_t nthreads = GENERATE(3);
8686

8787
auto&& [active_partitions, active_queries] =
8888
detail::ivf::partition_ivf_flat_index<uint32_t>(

src/include/test/unit_seeder.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ TEST_CASE("Singleton behavior", "[seeder]") {
124124

125125
// Ensure they have the same seed value
126126
auto seed = seeder1.seed();
127+
CHECK(seed.has_value());
127128
CHECK_THROWS_WITH(
128129
seeder2.seed(),
129130
Catch::Matchers::ContainsSubstring("Seed can only be used once"));

src/include/test/unit_tdb_matrix_multi_range.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ TEST_CASE("limit column_indices", "[tdb_matrix_multi_range]") {
191191
using T = float;
192192
using I = size_t;
193193
using LayoutPolicy = stdx::layout_left;
194-
using IdsType = uint8_t;
195194

196195
std::string tmp_matrix_uri =
197196
(std::filesystem::temp_directory_path() / "tmp_tdb_matrix").string();

0 commit comments

Comments
 (0)