Skip to content

Commit f7019a1

Browse files
author
Alberto Cabrera
committed
Removed any changes to see if the error appears again
Signed-off-by: Alberto Cabrera <[email protected]>
1 parent b17089d commit f7019a1

File tree

3 files changed

+1
-89
lines changed

3 files changed

+1
-89
lines changed

‎sycl/test-e2e/syclcompat/math/math_compare.cpp‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ void unordered_compare_not_equal_vec_kernel(Container *a, Container *b,
180180
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
181181
void test_unordered_compare_vec() {
182182
std::cout << __PRETTY_FUNCTION__ << std::endl;
183-
std::cerr << __PRETTY_FUNCTION__ << std::endl;
184183
using Container = ContainerT<ValueT, 2>;
185184

186185
constexpr syclcompat::dim3 grid{1};
@@ -193,31 +192,11 @@ void test_unordered_compare_vec() {
193192
// and false instead.
194193
// 1.0 == 1.0, 2.0 == NaN -> {true, true}
195194
const Container res1 = {1.0, 1.0};
196-
std::cerr << "- 1.0 == 1.0, 2.0 == NaN -> {true, true}: " << std::endl;
197-
std::cerr << "Op1: " << op1[0] << " " << op1[1] << std::endl;
198-
std::cerr << "op2: " << op2[0] << " " << op2[1] << std::endl;
199-
std::cerr << "Res: " << res1[0] << " " << res1[1] << std::endl;
200-
std::cerr << "BitSet: " << std::bitset<8 * sizeof(ValueT)>(op1[0]) << " "
201-
<< std::bitset<8 * sizeof(ValueT)>(op1[1]) << std::endl;
202-
std::cerr << "BitSet2: " << std::bitset<8 * sizeof(ValueT)>(op2[0]) << " "
203-
<< std::bitset<8 * sizeof(ValueT)>(op2[1]) << std::endl;
204-
std::cerr << "ResBitset: " << std::bitset<8 * sizeof(ValueT)>(res1[0]) << " "
205-
<< std::bitset<8 * sizeof(ValueT)>(res1[1]) << std::endl;
206195
BinaryOpTestLauncher<Container, Container>(grid, threads)
207196
.template launch_test<unordered_compare_equal_vec_kernel<Container>>(
208197
op1, op2, res1);
209198
// 1.0 != 1.0, 2.0 != NaN -> {false, true}
210199
const Container res2 = {0.0, 1.0};
211-
std::cerr << "- 1.0 != 1.0, 2.0 != NaN -> {false, true}: " << std::endl;
212-
std::cerr << "Op1: " << op1[0] << " " << op1[1] << std::endl;
213-
std::cerr << "op2: " << op2[0] << " " << op2[1] << std::endl;
214-
std::cerr << "Res: " << res2[0] << " " << res2[1] << std::endl;
215-
std::cerr << "BitSet: " << std::bitset<8 * sizeof(ValueT)>(op1[0]) << " "
216-
<< std::bitset<8 * sizeof(ValueT)>(op1[1]) << std::endl;
217-
std::cerr << "BitSet2: " << std::bitset<8 * sizeof(ValueT)>(op2[0]) << " "
218-
<< std::bitset<8 * sizeof(ValueT)>(op2[1]) << std::endl;
219-
std::cerr << "ResBitset: " << std::bitset<8 * sizeof(ValueT)>(res2[0]) << " "
220-
<< std::bitset<8 * sizeof(ValueT)>(res2[1]) << std::endl;
221200
BinaryOpTestLauncher<Container, Container>(grid, threads)
222201
.template launch_test<unordered_compare_not_equal_vec_kernel<Container>>(
223202
op1, op2, res2);
@@ -396,6 +375,5 @@ int main() {
396375
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
397376
test_unordered_compare_mask);
398377

399-
std::cerr << "If this is printed, the test was successful" << std::endl;
400378
return 0;
401379
}

‎sycl/test-e2e/syclcompat/math/math_fixt.hpp‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,6 @@ template <typename... ValueT> struct should_skip {
9090
}
9191
};
9292

93-
#define CHECK_PRINT(ResultT, RESULT, EXPECTED) \
94-
if constexpr (std::is_integral_v<ResultT>) { \
95-
std::cerr << "RESULT == EXPECTED" << std::endl; \
96-
std::cerr << RESULT << " == " << EXPECTED << std::endl; \
97-
} else if constexpr (contained_is_integral_v<ResultT>) { \
98-
for (size_t i = 0; i < RESULT.size(); i++) { \
99-
std::cerr << i << " RESULT[i] == EXPECTED[i]" << std::endl; \
100-
std::cerr << i << " " << RESULT[i] << " == " << EXPECTED[i] \
101-
<< std::endl; \
102-
} \
103-
} else if constexpr (syclcompat::is_floating_point_v<ResultT>) { \
104-
if (syclcompat::detail::isnan(RESULT)) { \
105-
std::cerr << "syclcompat::detail::isnan(EXPECTED)" << std::endl; \
106-
std::cerr << syclcompat::detail::isnan(EXPECTED) << std::endl; \
107-
} else { \
108-
std::cerr << "fabs(RESULT - EXPECTED) < ERROR_TOLERANCE" << std::endl; \
109-
std::cerr << fabs(RESULT - EXPECTED) << " < " << ERROR_TOLERANCE \
110-
<< std::endl; \
111-
} \
112-
} else if constexpr (contained_is_floating_point_v<ResultT>) { \
113-
for (size_t i = 0; i < RESULT.size(); i++) { \
114-
if (syclcompat::detail::isnan(RESULT[i])) { \
115-
std::cerr << i << " syclcompat::detail::isnan(EXPECTED[i])" \
116-
<< std::endl; \
117-
std::cerr << syclcompat::detail::isnan(EXPECTED[i]) << std::endl; \
118-
} else { \
119-
std::cerr << i << " fabs(RESULT[i] - EXPECTED[i]) < ERROR_TOLERANCE" \
120-
<< std::endl; \
121-
std::cerr << i << " " << fabs(RESULT[i] - EXPECTED[i]) << " < " \
122-
<< ERROR_TOLERANCE << std::endl; \
123-
} \
124-
} \
125-
} else { \
126-
static_assert(0, "math_fixt.hpp should not have arrived here."); \
127-
}
128-
12993
#define CHECK(ResultT, RESULT, EXPECTED) \
13094
if constexpr (std::is_integral_v<ResultT>) { \
13195
assert(RESULT == EXPECTED); \
@@ -211,10 +175,8 @@ class BinaryOpTestLauncher : OpTestLauncher {
211175
syclcompat::wait();
212176
syclcompat::memcpy<ResultT>(&res_h_, res_, data_size_);
213177

214-
// CHECK_PRINT(ResultT, res_h_, expected);
215178
CHECK(ResultT, res_h_, expected);
216179
};
217-
218180
template <auto Kernel>
219181
void launch_test(ValueT op1, ValueU op2, ResultT expected, bool need_relu) {
220182
if (skip_)
@@ -225,7 +187,6 @@ class BinaryOpTestLauncher : OpTestLauncher {
225187
syclcompat::wait();
226188
syclcompat::memcpy<ResultT>(&res_h_, res_, data_size_);
227189

228-
// CHECK_PRINT(ResultT, res_h_, expected);
229190
CHECK(ResultT, res_h_, expected);
230191
};
231192
template <auto Kernel>
@@ -243,7 +204,6 @@ class BinaryOpTestLauncher : OpTestLauncher {
243204
syclcompat::memcpy<bool>(&res_hi_h_, res_hi_, 1);
244205
syclcompat::memcpy<bool>(&res_lo_h_, res_lo_, 1);
245206

246-
// CHECK_PRINT(ResultT, res_h_, expected);
247207
CHECK(ResultT, res_h_, expected);
248208
assert(res_hi_h_ == expected_hi);
249209
assert(res_lo_h_ == expected_lo);
@@ -284,7 +244,6 @@ class UnaryOpTestLauncher : OpTestLauncher {
284244
syclcompat::wait();
285245
syclcompat::memcpy<ResultT>(&res_h_, res_, data_size_);
286246

287-
// CHECK_PRINT(ResultT, res_h_, expected);
288247
CHECK(ResultT, res_h_, expected);
289248
}
290249
};
@@ -336,7 +295,6 @@ class TernaryOpTestLauncher : OpTestLauncher {
336295
syclcompat::wait();
337296
syclcompat::memcpy<ResultT>(&res_h_, res_, data_size_);
338297

339-
// CHECK_PRINT(ResultT, res_h_, expected);
340298
CHECK(ResultT, res_h_, expected);
341299
};
342300
};

‎sycl/test-e2e/syclcompat/math/math_ops.cpp‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ template <template <typename T, int Dim> typename ContainerT, typename ValueT,
159159
typename ValueU = ValueT>
160160
void test_container_syclcompat_fmax_nan() {
161161
std::cout << __PRETTY_FUNCTION__ << std::endl;
162-
std::cerr << __PRETTY_FUNCTION__ << std::endl;
163162

164163
constexpr syclcompat::dim3 grid{1};
165164
constexpr syclcompat::dim3 threads{1};
@@ -178,31 +177,9 @@ void test_container_syclcompat_fmax_nan() {
178177

179178
const ContTU res2{static_cast<ValueTU>(10), static_cast<ValueTU>(10)};
180179

181-
std::cerr << "- First container test: " << std::endl;
182-
std::cerr << "Op4: " << op4[0] << " " << op4[1] << std::endl;
183-
std::cerr << "Op5: " << op5[0] << " " << op5[1] << std::endl;
184-
std::cerr << "Res: " << res2[0] << " " << res2[1] << std::endl;
185-
std::cerr << "BitSet: " << std::bitset<8 * sizeof(ValueTU)>(op4[0]) << " "
186-
<< std::bitset<8 * sizeof(ValueTU)>(op4[1]) << std::endl;
187-
std::cerr << "BitSet2: " << std::bitset<8 * sizeof(ValueTU)>(op5[0]) << " "
188-
<< std::bitset<8 * sizeof(ValueTU)>(op5[1]) << std::endl;
189-
std::cerr << "ResBitset: " << std::bitset<8 * sizeof(ValueTU)>(res2[0]) << " "
190-
<< std::bitset<8 * sizeof(ValueTU)>(res2[1]) << std::endl;
191-
192180
BinaryOpTestLauncher<ContT, ContU>(grid, threads)
193181
.template launch_test<fmax_nan_kernel<ContT, ContU>>(op4, op5, res2);
194182

195-
std::cerr << "Second container test: " << std::endl;
196-
std::cerr << "Op4: " << op4[0] << " " << op4[1] << std::endl;
197-
std::cerr << "Op6: " << op6[0] << " " << op6[1] << std::endl;
198-
std::cerr << "Res: " << op6_res[0] << " " << op6_res[1] << std::endl;
199-
std::cerr << "Op4: " << std::bitset<8 * sizeof(ValueTU)>(op4[0]) << " "
200-
<< std::bitset<8 * sizeof(ValueTU)>(op4[1]) << std::endl;
201-
std::cerr << "Op6: " << std::bitset<8 * sizeof(ValueTU)>(op6[0]) << " "
202-
<< std::bitset<8 * sizeof(ValueTU)>(op6[1]) << std::endl;
203-
std::cerr << "Res: " << std::bitset<8 * sizeof(ValueTU)>(op6_res[0]) << " "
204-
<< std::bitset<8 * sizeof(ValueTU)>(op6_res[1]) << std::endl;
205-
206183
BinaryOpTestLauncher<ContT, ContU>(grid, threads)
207184
.template launch_test<fmax_nan_kernel<ContT, ContU>>(op4, op6, op6_res);
208185
}
@@ -421,6 +398,5 @@ int main() {
421398
INSTANTIATE_ALL_CONTAINER_TYPES(marray_type_list, sycl::marray,
422399
test_container_clamp);
423400

424-
std::cerr << "If this is printed, the test was successful" << std::endl;
425-
return 0; // INFO: Making it fail temporarily to trigger the CI log
401+
return 0;
426402
}

0 commit comments

Comments
 (0)