Skip to content

Commit cdddf43

Browse files
aartbikaartbik
authored
clang-format on sparse tests (#973)
1 parent 777bfdb commit cdddf43

File tree

5 files changed

+158
-113
lines changed

5 files changed

+158
-113
lines changed

‎test/00_sparse/Basic.cu

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
//
2121
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2222
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23-
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
25-
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26-
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
27-
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28-
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29-
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31+
// POSSIBILITY OF SUCH DAMAGE.
3132
/////////////////////////////////////////////////////////////////////////////////
3233

3334
#include "assert.h"
@@ -38,9 +39,9 @@
3839

3940
using namespace matx;
4041

41-
template <typename T> class BasicSparseTest : public ::testing::Test { };
42+
template <typename T> class BasicSparseTest : public ::testing::Test {};
4243

43-
template <typename T> class BasicSparseTestsAll : public BasicSparseTest<T> { };
44+
template <typename T> class BasicSparseTestsAll : public BasicSparseTest<T> {};
4445

4546
TYPED_TEST_SUITE(BasicSparseTestsAll, MatXAllTypesAllExecs);
4647

@@ -70,8 +71,12 @@ TYPED_TEST(BasicSparseTestsAll, MakeCOO) {
7071
vals(0) = static_cast<TestType>(10);
7172
vals(1) = static_cast<TestType>(20);
7273
vals(2) = static_cast<TestType>(30);
73-
idxi(0) = 0; idxi(1) = 0; idxi(2) = 3;
74-
idxj(0) = 3; idxj(1) = 6; idxj(2) = 7;
74+
idxi(0) = 0;
75+
idxi(1) = 0;
76+
idxi(2) = 3;
77+
idxj(0) = 3;
78+
idxj(1) = 6;
79+
idxj(2) = 7;
7580
auto A = experimental::make_tensor_coo(vals, idxi, idxj, {4, 8});
7681
ASSERT_EQ(A.Rank(), 2);
7782
ASSERT_EQ(A.Size(0), 4);
@@ -92,7 +97,8 @@ TYPED_TEST(BasicSparseTestsAll, MakeCOO) {
9297
TYPED_TEST(BasicSparseTestsAll, MakeZeroCSR) {
9398
MATX_ENTER_HANDLER();
9499
using TestType = cuda::std::tuple_element_t<0, TypeParam>;
95-
auto A = experimental::make_zero_tensor_csr<TestType, index_t, index_t>({17, 33});
100+
auto A =
101+
experimental::make_zero_tensor_csr<TestType, index_t, index_t>({17, 33});
96102
ASSERT_EQ(A.Rank(), 2);
97103
ASSERT_EQ(A.Size(0), 17);
98104
ASSERT_EQ(A.Size(1), 33);
@@ -115,8 +121,14 @@ TYPED_TEST(BasicSparseTestsAll, MakeCSR) {
115121
vals(0) = static_cast<TestType>(10);
116122
vals(1) = static_cast<TestType>(20);
117123
vals(2) = static_cast<TestType>(30);
118-
rowp(0) = 0; rowp(1) = 2; rowp(2) = 2; rowp(3) = 2; rowp(4) = 3;
119-
col(0) = 3; col(1) = 6; col(2) = 7;
124+
rowp(0) = 0;
125+
rowp(1) = 2;
126+
rowp(2) = 2;
127+
rowp(3) = 2;
128+
rowp(4) = 3;
129+
col(0) = 3;
130+
col(1) = 6;
131+
col(2) = 7;
120132
auto A = experimental::make_tensor_csr(vals, rowp, col, {4, 8});
121133
ASSERT_EQ(A.Rank(), 2);
122134
ASSERT_EQ(A.Size(0), 4);
@@ -137,7 +149,8 @@ TYPED_TEST(BasicSparseTestsAll, MakeCSR) {
137149
TYPED_TEST(BasicSparseTestsAll, MakeZeroCSC) {
138150
MATX_ENTER_HANDLER();
139151
using TestType = cuda::std::tuple_element_t<0, TypeParam>;
140-
auto A = experimental::make_zero_tensor_csc<TestType, index_t, index_t>({17, 33});
152+
auto A =
153+
experimental::make_zero_tensor_csc<TestType, index_t, index_t>({17, 33});
141154
ASSERT_EQ(A.Rank(), 2);
142155
ASSERT_EQ(A.Size(0), 17);
143156
ASSERT_EQ(A.Size(1), 33);
@@ -160,10 +173,18 @@ TYPED_TEST(BasicSparseTestsAll, MakeCSC) {
160173
vals(0) = static_cast<TestType>(10);
161174
vals(1) = static_cast<TestType>(20);
162175
vals(2) = static_cast<TestType>(30);
163-
colp(0) = 0; colp(1) = 0; colp(2) = 0;
164-
colp(3) = 0; colp(4) = 1; colp(5) = 1;
165-
colp(6) = 1; colp(7) = 2; colp(8) = 3;
166-
row(0) = 0; row(1) = 0; row(2) = 3;
176+
colp(0) = 0;
177+
colp(1) = 0;
178+
colp(2) = 0;
179+
colp(3) = 0;
180+
colp(4) = 1;
181+
colp(5) = 1;
182+
colp(6) = 1;
183+
colp(7) = 2;
184+
colp(8) = 3;
185+
row(0) = 0;
186+
row(1) = 0;
187+
row(2) = 3;
167188
auto A = experimental::make_tensor_csc(vals, colp, row, {4, 8});
168189
ASSERT_EQ(A.Rank(), 2);
169190
ASSERT_EQ(A.Size(0), 4);

‎test/00_sparse/Convert.cu

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
//
2121
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2222
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23-
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
25-
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26-
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
27-
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28-
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29-
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31+
// POSSIBILITY OF SUCH DAMAGE.
3132
/////////////////////////////////////////////////////////////////////////////////
3233

3334
#include "assert.h"
@@ -59,12 +60,11 @@ template <typename T> class ConvertSparseTest : public ::testing::Test {
5960
protected:
6061
using GTestType = cuda::std::tuple_element_t<0, T>;
6162
using GExecType = cuda::std::tuple_element_t<1, T>;
62-
void SetUp() override {
63-
CheckTestTypeSupport<GTestType>();
64-
}
63+
void SetUp() override { CheckTestTypeSupport<GTestType>(); }
6564
};
6665

67-
template <typename T> class ConvertSparseTestsAll : public ConvertSparseTest<T> { };
66+
template <typename T>
67+
class ConvertSparseTestsAll : public ConvertSparseTest<T> {};
6868

6969
TYPED_TEST_SUITE(ConvertSparseTestsAll, MatXFloatNonComplexTypesCUDAExec);
7070

@@ -102,7 +102,7 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCOO) {
102102
// Convert sparse S back to dense D.
103103
auto O = make_tensor<TestType>({m, n});
104104
(O = sparse2dense(S)).run(exec);
105-
105+
106106
// Back to cheap random-access getters only.
107107
exec.sync();
108108
for (index_t i = 0; i < m; i++) {
@@ -142,7 +142,8 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCSR) {
142142
const auto n = D.Size(1);
143143

144144
// Convert dense D to sparse S.
145-
auto S = experimental::make_zero_tensor_csr<TestType, index_t, index_t>({m, n});
145+
auto S =
146+
experimental::make_zero_tensor_csr<TestType, index_t, index_t>({m, n});
146147
(S = dense2sparse(D)).run(exec);
147148
ASSERT_EQ(S.Rank(), 2);
148149
ASSERT_EQ(S.Size(0), m);
@@ -164,7 +165,7 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCSR) {
164165
// Convert sparse S back to dense D.
165166
auto O = make_tensor<TestType>({m, n});
166167
(O = sparse2dense(S)).run(exec);
167-
168+
168169
// Back to cheap random-access getters only.
169170
exec.sync();
170171
for (index_t i = 0; i < m; i++) {
@@ -199,7 +200,8 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCSC) {
199200
const auto n = D.Size(1);
200201

201202
// Convert dense D to sparse S.
202-
auto S = experimental::make_zero_tensor_csc<TestType, index_t, index_t>({m, n});
203+
auto S =
204+
experimental::make_zero_tensor_csc<TestType, index_t, index_t>({m, n});
203205
(S = dense2sparse(D)).run(exec);
204206
ASSERT_EQ(S.Rank(), 2);
205207
ASSERT_EQ(S.Size(0), m);
@@ -221,7 +223,7 @@ TYPED_TEST(ConvertSparseTestsAll, ConvertCSC) {
221223
// Convert sparse S back to dense D.
222224
auto O = make_tensor<TestType>({m, n});
223225
(O = sparse2dense(S)).run(exec);
224-
226+
225227
// Back to cheap random-access getters only.
226228
exec.sync();
227229
for (index_t i = 0; i < m; i++) {

‎test/00_sparse/Matmul.cu

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -70,39 +70,50 @@ template <typename T> static auto makeB() {
7070
const index_t m = 8;
7171
const index_t n = 2;
7272
tensor_t<T, 2> B = make_tensor<T>({m, n});
73-
B(0, 0) = static_cast<T>(1); B(0, 1) = static_cast<T>(2);
74-
B(1, 0) = static_cast<T>(3); B(1, 1) = static_cast<T>(4);
75-
B(2, 0) = static_cast<T>(5); B(2, 1) = static_cast<T>(6);
76-
B(3, 0) = static_cast<T>(7); B(3, 1) = static_cast<T>(8);
77-
B(4, 0) = static_cast<T>(9); B(4, 1) = static_cast<T>(10);
78-
B(5, 0) = static_cast<T>(11); B(5, 1) = static_cast<T>(12);
79-
B(6, 0) = static_cast<T>(13); B(6, 1) = static_cast<T>(14);
80-
B(7, 0) = static_cast<T>(15); B(7, 1) = static_cast<T>(16);
73+
B(0, 0) = static_cast<T>(1);
74+
B(0, 1) = static_cast<T>(2);
75+
B(1, 0) = static_cast<T>(3);
76+
B(1, 1) = static_cast<T>(4);
77+
B(2, 0) = static_cast<T>(5);
78+
B(2, 1) = static_cast<T>(6);
79+
B(3, 0) = static_cast<T>(7);
80+
B(3, 1) = static_cast<T>(8);
81+
B(4, 0) = static_cast<T>(9);
82+
B(4, 1) = static_cast<T>(10);
83+
B(5, 0) = static_cast<T>(11);
84+
B(5, 1) = static_cast<T>(12);
85+
B(6, 0) = static_cast<T>(13);
86+
B(6, 1) = static_cast<T>(14);
87+
B(7, 0) = static_cast<T>(15);
88+
B(7, 1) = static_cast<T>(16);
8189
return B;
8290
}
8391

8492
template <typename T> static auto makeE() {
8593
const index_t m = 4;
8694
const index_t n = 2;
8795
tensor_t<T, 2> E = make_tensor<T>({m, n});
88-
E(0, 0) = static_cast<T>(7); E(0, 1) = static_cast<T>(10);
89-
E(1, 0) = static_cast<T>(45); E(1, 1) = static_cast<T>(48);
90-
E(2, 0) = static_cast<T>(52); E(2, 1) = static_cast<T>(56);
91-
E(3, 0) = static_cast<T>(144); E(3, 1) = static_cast<T>(162);
96+
E(0, 0) = static_cast<T>(7);
97+
E(0, 1) = static_cast<T>(10);
98+
E(1, 0) = static_cast<T>(45);
99+
E(1, 1) = static_cast<T>(48);
100+
E(2, 0) = static_cast<T>(52);
101+
E(2, 1) = static_cast<T>(56);
102+
E(3, 0) = static_cast<T>(144);
103+
E(3, 1) = static_cast<T>(162);
92104
return E;
93105
}
94106

95107
template <typename T> class MatmulSparseTest : public ::testing::Test {
96108
protected:
97109
using GTestType = cuda::std::tuple_element_t<0, T>;
98110
using GExecType = cuda::std::tuple_element_t<1, T>;
99-
void SetUp() override {
100-
CheckTestTypeSupport<GTestType>();
101-
}
111+
void SetUp() override { CheckTestTypeSupport<GTestType>(); }
102112
float thresh = 0.001f;
103113
};
104114

105-
template <typename T> class MatmulSparseTestsAll : public MatmulSparseTest<T> { };
115+
template <typename T>
116+
class MatmulSparseTestsAll : public MatmulSparseTest<T> {};
106117

107118
TYPED_TEST_SUITE(MatmulSparseTestsAll, MatXFloatNonComplexHalfTypesCUDAExec);
108119

@@ -136,9 +147,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCOO) {
136147
for (index_t j = 0; j < n; j++) {
137148
if constexpr (is_complex_v<TestType>) {
138149
ASSERT_NEAR(O(i, j).real(), E(i, j).real(), this->thresh);
139-
ASSERT_NEAR(O(i, j).imag(), E(i,j ).imag(), this->thresh);
140-
}
141-
else {
150+
ASSERT_NEAR(O(i, j).imag(), E(i, j).imag(), this->thresh);
151+
} else {
142152
ASSERT_NEAR(O(i, j), E(i, j), this->thresh);
143153
}
144154
}
@@ -154,9 +164,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCOO) {
154164
for (index_t j = 0; j < n; j++) {
155165
if constexpr (is_complex_v<TestType>) {
156166
ASSERT_NEAR(TO(j, i).real(), E(i, j).real(), this->thresh);
157-
ASSERT_NEAR(TO(j, i).imag(), E(i,j ).imag(), this->thresh);
158-
}
159-
else {
167+
ASSERT_NEAR(TO(j, i).imag(), E(i, j).imag(), this->thresh);
168+
} else {
160169
ASSERT_NEAR(TO(j, i), E(i, j), this->thresh);
161170
}
162171
}
@@ -180,7 +189,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCSR) {
180189
const auto n = B.Size(1);
181190

182191
// Convert dense A to sparse S.
183-
auto S = experimental::make_zero_tensor_csr<TestType, index_t, index_t>({m, k});
192+
auto S =
193+
experimental::make_zero_tensor_csr<TestType, index_t, index_t>({m, k});
184194
(S = dense2sparse(A)).run(exec);
185195
ASSERT_EQ(S.Nse(), 7);
186196
ASSERT_EQ(S.posSize(1), m + 1);
@@ -195,9 +205,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCSR) {
195205
for (index_t j = 0; j < n; j++) {
196206
if constexpr (is_complex_v<TestType>) {
197207
ASSERT_NEAR(O(i, j).real(), E(i, j).real(), this->thresh);
198-
ASSERT_NEAR(O(i, j).imag(), E(i,j ).imag(), this->thresh);
199-
}
200-
else {
208+
ASSERT_NEAR(O(i, j).imag(), E(i, j).imag(), this->thresh);
209+
} else {
201210
ASSERT_NEAR(O(i, j), E(i, j), this->thresh);
202211
}
203212
}
@@ -221,7 +230,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCSC) {
221230
const auto n = B.Size(1);
222231

223232
// Convert dense A to sparse S.
224-
auto S = experimental::make_zero_tensor_csc<TestType, index_t, index_t>({m, k});
233+
auto S =
234+
experimental::make_zero_tensor_csc<TestType, index_t, index_t>({m, k});
225235
(S = dense2sparse(A)).run(exec);
226236
ASSERT_EQ(S.Nse(), 7);
227237
ASSERT_EQ(S.posSize(1), k + 1);
@@ -236,9 +246,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCSC) {
236246
for (index_t j = 0; j < n; j++) {
237247
if constexpr (is_complex_v<TestType>) {
238248
ASSERT_NEAR(O(i, j).real(), E(i, j).real(), this->thresh);
239-
ASSERT_NEAR(O(i, j).imag(), E(i,j ).imag(), this->thresh);
240-
}
241-
else {
249+
ASSERT_NEAR(O(i, j).imag(), E(i, j).imag(), this->thresh);
250+
} else {
242251
ASSERT_NEAR(O(i, j), E(i, j), this->thresh);
243252
}
244253
}
@@ -256,9 +265,8 @@ TYPED_TEST(MatmulSparseTestsAll, MatmulCSC) {
256265
for (index_t j = 0; j < n; j++) {
257266
if constexpr (is_complex_v<TestType>) {
258267
ASSERT_NEAR((O(i, j) - C5).real(), E(i, j).real(), this->thresh);
259-
ASSERT_NEAR((O(i, j) - C5).imag(), E(i,j ).imag(), this->thresh);
260-
}
261-
else {
268+
ASSERT_NEAR((O(i, j) - C5).imag(), E(i, j).imag(), this->thresh);
269+
} else {
262270
ASSERT_NEAR(O(i, j) - C5, E(i, j), this->thresh);
263271
}
264272
}

0 commit comments

Comments
 (0)