Skip to content

Commit 74986fa

Browse files
author
Raghuveer Devulapalli
committed
Formatting fix
1 parent 7a86995 commit 74986fa

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

tests/test_keyvalue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* *******************************************/
55

66
#include "avx512-64bit-keyvaluesort.hpp"
7-
#include "rand_array.h"
87
#include "cpuinfo.h"
8+
#include "rand_array.h"
99
#include <gtest/gtest.h>
1010
#include <vector>
1111

tests/test_partial_qsort.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ TYPED_TEST_P(avx512_partial_sort, test_ranges)
3030
int k = get_uniform_rand_array<int64_t>(1, arrsize, 1).front();
3131

3232
/* Sort the range and verify all the required elements match the presorted set */
33-
avx512_partial_qsort<TypeParam>(psortedarr.data(), k, psortedarr.size());
33+
avx512_partial_qsort<TypeParam>(
34+
psortedarr.data(), k, psortedarr.size());
3435
for (size_t jj = 0; jj < k; jj++) {
3536
ASSERT_EQ(sortedarr[jj], psortedarr[jj]);
3637
}

tests/test_qselect.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ TYPED_TEST_P(avx512_select, test_random)
2626
std::sort(sortedarr.begin(), sortedarr.end());
2727
for (size_t k = 0; k < arr.size(); ++k) {
2828
psortedarr = arr;
29-
avx512_qselect<TypeParam>(psortedarr.data(), k, psortedarr.size());
29+
avx512_qselect<TypeParam>(
30+
psortedarr.data(), k, psortedarr.size());
3031
/* index k is correct */
3132
ASSERT_EQ(sortedarr[k], psortedarr[k]);
3233
/* Check left partition */
3334
for (size_t jj = 0; jj < k; jj++) {
3435
ASSERT_LE(psortedarr[jj], psortedarr[k]);
3536
}
3637
/* Check right partition */
37-
for (size_t jj = k+1; jj < arr.size(); jj++) {
38+
for (size_t jj = k + 1; jj < arr.size(); jj++) {
3839
ASSERT_GE(psortedarr[jj], psortedarr[k]);
3940
}
4041
psortedarr.clear();
@@ -69,15 +70,16 @@ TYPED_TEST_P(avx512_select, test_small_range)
6970
std::sort(sortedarr.begin(), sortedarr.end());
7071
for (size_t k = 0; k < arr.size(); ++k) {
7172
psortedarr = arr;
72-
avx512_qselect<TypeParam>(psortedarr.data(), k, psortedarr.size());
73+
avx512_qselect<TypeParam>(
74+
psortedarr.data(), k, psortedarr.size());
7375
/* index k is correct */
7476
ASSERT_EQ(sortedarr[k], psortedarr[k]);
7577
/* Check left partition */
7678
for (size_t jj = 0; jj < k; jj++) {
7779
ASSERT_LE(psortedarr[jj], psortedarr[k]);
7880
}
7981
/* Check right partition */
80-
for (size_t jj = k+1; jj < arr.size(); jj++) {
82+
for (size_t jj = k + 1; jj < arr.size(); jj++) {
8183
ASSERT_GE(psortedarr[jj], psortedarr[k]);
8284
}
8385
psortedarr.clear();

tests/test_qsort.hpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ TYPED_TEST_P(avx512_sort, test_reverse)
4747
}
4848
std::vector<int64_t> arrsizes;
4949
for (int64_t ii = 0; ii < 1024; ++ii) {
50-
arrsizes.push_back((TypeParam) (ii + 1));
50+
arrsizes.push_back((TypeParam)(ii + 1));
5151
}
5252
std::vector<TypeParam> arr;
5353
std::vector<TypeParam> sortedarr;
5454
for (size_t ii = 0; ii < arrsizes.size(); ++ii) {
5555
/* reverse array */
5656
for (int jj = 0; jj < arrsizes[ii]; ++jj) {
57-
arr.push_back((TypeParam) (arrsizes[ii] - jj));
57+
arr.push_back((TypeParam)(arrsizes[ii] - jj));
5858
}
5959
sortedarr = arr;
6060
/* Sort with std::sort for comparison */
@@ -78,7 +78,7 @@ TYPED_TEST_P(avx512_sort, test_constant)
7878
}
7979
std::vector<int64_t> arrsizes;
8080
for (int64_t ii = 0; ii < 1024; ++ii) {
81-
arrsizes.push_back((TypeParam) (ii + 1));
81+
arrsizes.push_back((TypeParam)(ii + 1));
8282
}
8383
std::vector<TypeParam> arr;
8484
std::vector<TypeParam> sortedarr;
@@ -109,7 +109,7 @@ TYPED_TEST_P(avx512_sort, test_small_range)
109109
}
110110
std::vector<int64_t> arrsizes;
111111
for (int64_t ii = 0; ii < 1024; ++ii) {
112-
arrsizes.push_back((TypeParam) (ii + 1));
112+
arrsizes.push_back((TypeParam)(ii + 1));
113113
}
114114
std::vector<TypeParam> arr;
115115
std::vector<TypeParam> sortedarr;
@@ -129,4 +129,7 @@ TYPED_TEST_P(avx512_sort, test_small_range)
129129
}
130130
}
131131
REGISTER_TYPED_TEST_SUITE_P(avx512_sort,
132-
test_random, test_reverse, test_constant, test_small_range);
132+
test_random,
133+
test_reverse,
134+
test_constant,
135+
test_small_range);

tests/test_qsortfp16.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@ TEST(avx512_qselect_float16, test_arrsizes)
9595
std::sort(sortedarr.begin(), sortedarr.end());
9696
for (size_t k = 0; k < arr.size(); ++k) {
9797
psortedarr = arr;
98-
avx512_qselect<_Float16>(psortedarr.data(), k, psortedarr.size());
98+
avx512_qselect<_Float16>(
99+
psortedarr.data(), k, psortedarr.size());
99100
/* index k is correct */
100101
ASSERT_EQ(sortedarr[k], psortedarr[k]);
101102
/* Check left partition */
102103
for (size_t jj = 0; jj < k; jj++) {
103104
ASSERT_LE(psortedarr[jj], psortedarr[k]);
104105
}
105106
/* Check right partition */
106-
for (size_t jj = k+1; jj < arr.size(); jj++) {
107+
for (size_t jj = k + 1; jj < arr.size(); jj++) {
107108
ASSERT_GE(psortedarr[jj], psortedarr[k]);
108109
}
109110
psortedarr.clear();
@@ -142,7 +143,8 @@ TEST(avx512_partial_qsort_float16, test_ranges)
142143
int k = get_uniform_rand_array<int64_t>(1, arrsize, 1).front();
143144

144145
/* Sort the range and verify all the required elements match the presorted set */
145-
avx512_partial_qsort<_Float16>(psortedarr.data(), k, psortedarr.size());
146+
avx512_partial_qsort<_Float16>(
147+
psortedarr.data(), k, psortedarr.size());
146148
for (size_t jj = 0; jj < k; jj++) {
147149
ASSERT_EQ(sortedarr[jj], psortedarr[jj]);
148150
}

tests/test_sort.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "test_qsort.hpp"
2-
#include "test_qselect.hpp"
31
#include "test_partial_qsort.hpp"
2+
#include "test_qselect.hpp"
3+
#include "test_qsort.hpp"
44

55
using QuickSortTestTypes = testing::Types<uint16_t,
66
int16_t,
@@ -12,4 +12,6 @@ using QuickSortTestTypes = testing::Types<uint16_t,
1212
int64_t>;
1313
INSTANTIATE_TYPED_TEST_SUITE_P(TestPrefix, avx512_sort, QuickSortTestTypes);
1414
INSTANTIATE_TYPED_TEST_SUITE_P(TestPrefix, avx512_select, QuickSortTestTypes);
15-
INSTANTIATE_TYPED_TEST_SUITE_P(TestPrefix, avx512_partial_sort, QuickSortTestTypes);
15+
INSTANTIATE_TYPED_TEST_SUITE_P(TestPrefix,
16+
avx512_partial_sort,
17+
QuickSortTestTypes);

0 commit comments

Comments
 (0)