Skip to content

Commit 09d769d

Browse files
vasilytricbb-sycl
authored andcommitted
[SYCL][ESIMD] Replace using tested_types::all with tested_types::core (intel#798)
1 parent a16f91a commit 09d769d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

SYCL/ESIMD/api/functional/ctors/ctor_load_core.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,15 @@ int main(int, char **) {
216216
esimd_test::createExceptionHandler());
217217

218218
bool passed = true;
219+
<<<<<<< HEAD
219220
<<<<<<< HEAD
220221
const auto types = get_tested_types<tested_types::core>();
221222
=======
222223
const auto types = get_tested_types<tested_types::all>();
223224
>>>>>>> 1548e68f8 ([SYCL][ESIMD] Add test on simd load ctor (#769))
225+
=======
226+
const auto types = get_tested_types<tested_types::core>();
227+
>>>>>>> 3caa01663 ([SYCL][ESIMD] Replace using tested_types::all with tested_types::core (#798))
224228
const auto dims = get_all_dimensions();
225229

226230
const auto contexts = unnamed_type_pack<initializer, var_decl, rval_in_expr,

0 commit comments

Comments
 (0)