From 89a919c898ffc19b901bf17f65864f63264e0c73 Mon Sep 17 00:00:00 2001 From: sbalint98 Date: Mon, 22 Mar 2021 14:00:29 +0100 Subject: [PATCH 1/5] [tests][modernize]Make the tests compile with hipSYCL *Changed e.get_cl_code to e.what *Fixed namespace sycl:: to cl::sycl *Gave explict type to exception_handler --- tests/unit_tests/blas/batch/axpy_batch_usm.cpp | 6 +++--- tests/unit_tests/blas/batch/gemm_batch_stride.cpp | 6 +++--- .../unit_tests/blas/batch/gemm_batch_stride_usm.cpp | 6 +++--- tests/unit_tests/blas/batch/gemm_batch_usm.cpp | 6 +++--- tests/unit_tests/blas/batch/trsm_batch_stride.cpp | 6 +++--- tests/unit_tests/blas/extensions/gemm_bias.cpp | 6 +++--- tests/unit_tests/blas/extensions/gemmt.cpp | 6 +++--- tests/unit_tests/blas/extensions/gemmt_usm.cpp | 6 +++--- .../blas/include/reference_blas_templates.hpp | 8 ++++---- tests/unit_tests/blas/include/test_common.hpp | 6 ++++-- tests/unit_tests/blas/level1/asum.cpp | 6 +++--- tests/unit_tests/blas/level1/asum_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/axpy.cpp | 6 +++--- tests/unit_tests/blas/level1/axpy_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/copy.cpp | 6 +++--- tests/unit_tests/blas/level1/copy_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/dot.cpp | 6 +++--- tests/unit_tests/blas/level1/dot_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/dotc.cpp | 6 +++--- tests/unit_tests/blas/level1/dotc_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/dotu.cpp | 6 +++--- tests/unit_tests/blas/level1/dotu_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/iamax.cpp | 6 +++--- tests/unit_tests/blas/level1/iamax_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/iamin.cpp | 6 +++--- tests/unit_tests/blas/level1/iamin_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/nrm2.cpp | 6 +++--- tests/unit_tests/blas/level1/nrm2_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/rot.cpp | 6 +++--- tests/unit_tests/blas/level1/rot_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/rotg.cpp | 6 +++--- tests/unit_tests/blas/level1/rotg_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/rotm.cpp | 6 +++--- tests/unit_tests/blas/level1/rotm_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/rotmg.cpp | 6 +++--- tests/unit_tests/blas/level1/rotmg_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/scal.cpp | 6 +++--- tests/unit_tests/blas/level1/scal_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/sdsdot.cpp | 6 +++--- tests/unit_tests/blas/level1/sdsdot_usm.cpp | 6 +++--- tests/unit_tests/blas/level1/swap.cpp | 6 +++--- tests/unit_tests/blas/level1/swap_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/gbmv.cpp | 6 +++--- tests/unit_tests/blas/level2/gbmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/gemv.cpp | 6 +++--- tests/unit_tests/blas/level2/gemv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/ger.cpp | 6 +++--- tests/unit_tests/blas/level2/ger_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/gerc.cpp | 6 +++--- tests/unit_tests/blas/level2/gerc_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/geru.cpp | 6 +++--- tests/unit_tests/blas/level2/geru_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/hbmv.cpp | 6 +++--- tests/unit_tests/blas/level2/hbmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/hemv.cpp | 6 +++--- tests/unit_tests/blas/level2/hemv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/her.cpp | 6 +++--- tests/unit_tests/blas/level2/her2.cpp | 6 +++--- tests/unit_tests/blas/level2/her2_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/her_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/hpmv.cpp | 6 +++--- tests/unit_tests/blas/level2/hpmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/hpr.cpp | 6 +++--- tests/unit_tests/blas/level2/hpr2.cpp | 6 +++--- tests/unit_tests/blas/level2/hpr2_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/hpr_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/sbmv.cpp | 6 +++--- tests/unit_tests/blas/level2/sbmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/spmv.cpp | 6 +++--- tests/unit_tests/blas/level2/spmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/spr.cpp | 6 +++--- tests/unit_tests/blas/level2/spr2.cpp | 6 +++--- tests/unit_tests/blas/level2/spr2_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/spr_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/symv.cpp | 6 +++--- tests/unit_tests/blas/level2/symv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/syr.cpp | 6 +++--- tests/unit_tests/blas/level2/syr2.cpp | 6 +++--- tests/unit_tests/blas/level2/syr2_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/syr_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/tbmv.cpp | 6 +++--- tests/unit_tests/blas/level2/tbmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/tbsv.cpp | 6 +++--- tests/unit_tests/blas/level2/tbsv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/tpmv.cpp | 6 +++--- tests/unit_tests/blas/level2/tpmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/tpsv.cpp | 6 +++--- tests/unit_tests/blas/level2/tpsv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/trmv.cpp | 6 +++--- tests/unit_tests/blas/level2/trmv_usm.cpp | 6 +++--- tests/unit_tests/blas/level2/trsv.cpp | 6 +++--- tests/unit_tests/blas/level2/trsv_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/gemm.cpp | 10 +++++----- tests/unit_tests/blas/level3/gemm_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/hemm.cpp | 6 +++--- tests/unit_tests/blas/level3/hemm_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/her2k.cpp | 6 +++--- tests/unit_tests/blas/level3/her2k_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/herk.cpp | 6 +++--- tests/unit_tests/blas/level3/herk_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/symm.cpp | 6 +++--- tests/unit_tests/blas/level3/symm_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/syr2k.cpp | 6 +++--- tests/unit_tests/blas/level3/syr2k_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/syrk.cpp | 6 +++--- tests/unit_tests/blas/level3/syrk_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/trmm.cpp | 6 +++--- tests/unit_tests/blas/level3/trmm_usm.cpp | 6 +++--- tests/unit_tests/blas/level3/trsm.cpp | 6 +++--- tests/unit_tests/blas/level3/trsm_usm.cpp | 6 +++--- tests/unit_tests/main_test.cpp | 4 ++++ tests/unit_tests/rng/include/engines_api_tests.hpp | 4 ++-- tests/unit_tests/rng/include/rng_test_common.hpp | 6 +++--- tests/unit_tests/rng/include/skip_ahead_test.hpp | 4 ++-- .../rng/include/statistics_check_test.hpp | 13 +++++++------ 115 files changed, 352 insertions(+), 345 deletions(-) diff --git a/tests/unit_tests/blas/batch/axpy_batch_usm.cpp b/tests/unit_tests/blas/batch/axpy_batch_usm.cpp index fa5e3c97d..6aafb5433 100644 --- a/tests/unit_tests/blas/batch/axpy_batch_usm.cpp +++ b/tests/unit_tests/blas/batch/axpy_batch_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during AXPY_BATCH:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -186,7 +186,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during AXPY_BATCH:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/batch/gemm_batch_stride.cpp b/tests/unit_tests/blas/batch/gemm_batch_stride.cpp index c33b24621..db4356b0c 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_stride.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_stride.cpp @@ -128,7 +128,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { // Call DPC++ GEMM_BATCH_STRIDE. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -136,7 +136,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GEMM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -181,7 +181,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GEMM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp b/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp index 30b5b7561..7b131cf31 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GEMM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -208,7 +208,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GEMM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/batch/gemm_batch_usm.cpp b/tests/unit_tests/blas/batch/gemm_batch_usm.cpp index 12029ac47..c184f7c66 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_usm.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GEMM_BATCH:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -263,7 +263,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GEMM_BATCH:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/batch/trsm_batch_stride.cpp b/tests/unit_tests/blas/batch/trsm_batch_stride.cpp index ea9087113..ca8db6306 100644 --- a/tests/unit_tests/blas/batch/trsm_batch_stride.cpp +++ b/tests/unit_tests/blas/batch/trsm_batch_stride.cpp @@ -121,7 +121,7 @@ int test(device *dev, oneapi::mkl::layout layout) { // Call DPC++ TRSM_BATCH_STRIDE. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -129,7 +129,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during TRSM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -173,7 +173,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during TRSM_BATCH_STRIDE:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/extensions/gemm_bias.cpp b/tests/unit_tests/blas/extensions/gemm_bias.cpp index cabb6facd..2eae7988a 100644 --- a/tests/unit_tests/blas/extensions/gemm_bias.cpp +++ b/tests/unit_tests/blas/extensions/gemm_bias.cpp @@ -88,7 +88,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMM_BIAS. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -96,7 +96,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during GEMM_BIAS:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -142,7 +142,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during GEMM_BIAS:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/extensions/gemmt.cpp b/tests/unit_tests/blas/extensions/gemmt.cpp index 177175096..d999d6f1a 100644 --- a/tests/unit_tests/blas/extensions/gemmt.cpp +++ b/tests/unit_tests/blas/extensions/gemmt.cpp @@ -68,7 +68,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ GEMMT. // Catch asynchronous exceptions - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -76,7 +76,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during GEMMT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -121,7 +121,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during GEMMT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/extensions/gemmt_usm.cpp b/tests/unit_tests/blas/extensions/gemmt_usm.cpp index c8bf57395..7a34789fd 100644 --- a/tests/unit_tests/blas/extensions/gemmt_usm.cpp +++ b/tests/unit_tests/blas/extensions/gemmt_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::transpose transb, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during GEMMT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during GEMMT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/include/reference_blas_templates.hpp b/tests/unit_tests/blas/include/reference_blas_templates.hpp index d7fba80c1..af358fab4 100644 --- a/tests/unit_tests/blas/include/reference_blas_templates.hpp +++ b/tests/unit_tests/blas/include/reference_blas_templates.hpp @@ -224,7 +224,7 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fp *alpha, const fp *a, const int *lda, const fp *b, const int *ldb, const fp *beta, fp *c, const int *ldc); - +#ifdef NOT_HIPSYCL template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const half *alpha, const half *a, const int *lda, @@ -255,7 +255,7 @@ void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, c oneapi::mkl::aligned_free(bf); oneapi::mkl::aligned_free(cf); } - +#endif template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const float *alpha, const float *a, const int *lda, @@ -291,7 +291,7 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fpc *alpha, const fpa *a, const int *lda, const fpa *b, const int *ldb, const fpc *beta, fpc *c, const int *ldc); - +#ifdef NOT_HIPSYCL template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const float *alpha, const half *a, const int *lda, @@ -314,7 +314,7 @@ void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, c oneapi::mkl::aligned_free(af); oneapi::mkl::aligned_free(bf); } - +#endif template static void symm(CBLAS_LAYOUT layout, CBLAS_SIDE left_right, CBLAS_UPLO uplo, const int *m, const int *n, const fp *alpha, const fp *a, const int *lda, const fp *b, diff --git a/tests/unit_tests/blas/include/test_common.hpp b/tests/unit_tests/blas/include/test_common.hpp index 7e16e2e4d..815155ab4 100644 --- a/tests/unit_tests/blas/include/test_common.hpp +++ b/tests/unit_tests/blas/include/test_common.hpp @@ -29,12 +29,14 @@ #include namespace std { +#ifdef NOT_HIPSYCL static cl::sycl::half abs(cl::sycl::half v) { if (v < cl::sycl::half(0)) return -v; else return v; } +#endif } // namespace std // Complex helpers. @@ -140,12 +142,12 @@ template <> uint8_t rand_scalar() { return std::rand() % 128; } - +#ifdef NOT_HIPSYCL template <> half rand_scalar() { return half(std::rand() % 32000) / half(32000) - half(0.5); } - +#endif template static fp rand_scalar(int mag) { fp tmp = fp(mag) + fp(std::rand()) / fp(RAND_MAX) - fp(0.5); diff --git a/tests/unit_tests/blas/level1/asum.cpp b/tests/unit_tests/blas/level1/asum.cpp index 28c515794..1e6c30754 100644 --- a/tests/unit_tests/blas/level1/asum.cpp +++ b/tests/unit_tests/blas/level1/asum.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { // Call DPC++ ASUM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -65,7 +65,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during ASUM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -103,7 +103,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during ASUM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/asum_usm.cpp b/tests/unit_tests/blas/level1/asum_usm.cpp index 0f48ef012..24da8603c 100644 --- a/tests/unit_tests/blas/level1/asum_usm.cpp +++ b/tests/unit_tests/blas/level1/asum_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during ASUM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during ASUM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/axpy.cpp b/tests/unit_tests/blas/level1/axpy.cpp index 7e587849a..fd407b52c 100644 --- a/tests/unit_tests/blas/level1/axpy.cpp +++ b/tests/unit_tests/blas/level1/axpy.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp // Call DPC++ AXPY. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -68,7 +68,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during AXPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -108,7 +108,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during AXPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/axpy_usm.cpp b/tests/unit_tests/blas/level1/axpy_usm.cpp index f01773a34..c391fc455 100644 --- a/tests/unit_tests/blas/level1/axpy_usm.cpp +++ b/tests/unit_tests/blas/level1/axpy_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp alpha) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during AXPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during AXPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/copy.cpp b/tests/unit_tests/blas/level1/copy.cpp index d2bcacc15..7f6c4f71e 100644 --- a/tests/unit_tests/blas/level1/copy.cpp +++ b/tests/unit_tests/blas/level1/copy.cpp @@ -59,7 +59,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ COPY. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -67,7 +67,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during COPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -106,7 +106,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during COPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/copy_usm.cpp b/tests/unit_tests/blas/level1/copy_usm.cpp index c1ed247a6..de9182981 100644 --- a/tests/unit_tests/blas/level1/copy_usm.cpp +++ b/tests/unit_tests/blas/level1/copy_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during COPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during COPY:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/dot.cpp b/tests/unit_tests/blas/level1/dot.cpp index bac1ad4fe..23152db8d 100644 --- a/tests/unit_tests/blas/level1/dot.cpp +++ b/tests/unit_tests/blas/level1/dot.cpp @@ -58,7 +58,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOT. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during DOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -107,7 +107,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during DOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/dot_usm.cpp b/tests/unit_tests/blas/level1/dot_usm.cpp index e6d363342..a706f5c87 100644 --- a/tests/unit_tests/blas/level1/dot_usm.cpp +++ b/tests/unit_tests/blas/level1/dot_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during DOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during DOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/dotc.cpp b/tests/unit_tests/blas/level1/dotc.cpp index 2f41872d2..1b720ecb1 100644 --- a/tests/unit_tests/blas/level1/dotc.cpp +++ b/tests/unit_tests/blas/level1/dotc.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOTC. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -68,7 +68,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during DOTC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -109,7 +109,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during DOTC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/dotc_usm.cpp b/tests/unit_tests/blas/level1/dotc_usm.cpp index 2e652dd64..239e67818 100644 --- a/tests/unit_tests/blas/level1/dotc_usm.cpp +++ b/tests/unit_tests/blas/level1/dotc_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during DOTC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during DOTC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/dotu.cpp b/tests/unit_tests/blas/level1/dotu.cpp index 0eed06e76..8c502e5f4 100644 --- a/tests/unit_tests/blas/level1/dotu.cpp +++ b/tests/unit_tests/blas/level1/dotu.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOTU. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -68,7 +68,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during DOTU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -109,7 +109,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during DOTU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/dotu_usm.cpp b/tests/unit_tests/blas/level1/dotu_usm.cpp index 55869c19e..e3f32f94d 100644 --- a/tests/unit_tests/blas/level1/dotu_usm.cpp +++ b/tests/unit_tests/blas/level1/dotu_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during DOTU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during DOTU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/iamax.cpp b/tests/unit_tests/blas/level1/iamax.cpp index 607a5d787..0332930a5 100644 --- a/tests/unit_tests/blas/level1/iamax.cpp +++ b/tests/unit_tests/blas/level1/iamax.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ IAMAX. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -65,7 +65,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during IAMAX:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -104,7 +104,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during IAMAX:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/iamax_usm.cpp b/tests/unit_tests/blas/level1/iamax_usm.cpp index d1a4f205b..10d52e851 100644 --- a/tests/unit_tests/blas/level1/iamax_usm.cpp +++ b/tests/unit_tests/blas/level1/iamax_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during IAMAX:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during IAMAX:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/iamin.cpp b/tests/unit_tests/blas/level1/iamin.cpp index d925d0345..23de659f8 100644 --- a/tests/unit_tests/blas/level1/iamin.cpp +++ b/tests/unit_tests/blas/level1/iamin.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ IAMIN. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -65,7 +65,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during IAMIN:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -104,7 +104,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during IAMIN:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/iamin_usm.cpp b/tests/unit_tests/blas/level1/iamin_usm.cpp index e2d9ab0fb..1b8c15217 100644 --- a/tests/unit_tests/blas/level1/iamin_usm.cpp +++ b/tests/unit_tests/blas/level1/iamin_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during IAMIN:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during IAMIN:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/nrm2.cpp b/tests/unit_tests/blas/level1/nrm2.cpp index cad7fe628..4c03f7e25 100644 --- a/tests/unit_tests/blas/level1/nrm2.cpp +++ b/tests/unit_tests/blas/level1/nrm2.cpp @@ -58,7 +58,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ NRM2. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during NRM2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -104,7 +104,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during NRM2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/nrm2_usm.cpp b/tests/unit_tests/blas/level1/nrm2_usm.cpp index 64361c9b5..b2631344a 100644 --- a/tests/unit_tests/blas/level1/nrm2_usm.cpp +++ b/tests/unit_tests/blas/level1/nrm2_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during NRM2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during NRM2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/rot.cpp b/tests/unit_tests/blas/level1/rot.cpp index dcceb2e4d..02c3ab2df 100644 --- a/tests/unit_tests/blas/level1/rot.cpp +++ b/tests/unit_tests/blas/level1/rot.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ // Call DPC++ ROT. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -69,7 +69,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -109,7 +109,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rot_usm.cpp b/tests/unit_tests/blas/level1/rot_usm.cpp index c22c6bdce..8aa66b1e6 100644 --- a/tests/unit_tests/blas/level1/rot_usm.cpp +++ b/tests/unit_tests/blas/level1/rot_usm.cpp @@ -45,7 +45,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_scalar c, fp_scalar s) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -53,7 +53,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rotg.cpp b/tests/unit_tests/blas/level1/rotg.cpp index 0521a7b22..c8412ef68 100644 --- a/tests/unit_tests/blas/level1/rotg.cpp +++ b/tests/unit_tests/blas/level1/rotg.cpp @@ -65,7 +65,7 @@ int test(device *dev, oneapi::mkl::layout layout) { // Call DPC++ ROTG. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -73,7 +73,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROTG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -115,7 +115,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROTG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rotg_usm.cpp b/tests/unit_tests/blas/level1/rotg_usm.cpp index 21c473584..0870fd554 100644 --- a/tests/unit_tests/blas/level1/rotg_usm.cpp +++ b/tests/unit_tests/blas/level1/rotg_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROTG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -124,7 +124,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROTG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rotm.cpp b/tests/unit_tests/blas/level1/rotm.cpp index 2b54c985a..73b59ab6c 100644 --- a/tests/unit_tests/blas/level1/rotm.cpp +++ b/tests/unit_tests/blas/level1/rotm.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp // Call DPC++ ROTM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROTM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROTM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rotm_usm.cpp b/tests/unit_tests/blas/level1/rotm_usm.cpp index 9f4cf7d0b..156117bc1 100644 --- a/tests/unit_tests/blas/level1/rotm_usm.cpp +++ b/tests/unit_tests/blas/level1/rotm_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp flag) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROTM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -114,7 +114,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROTM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/rotmg.cpp b/tests/unit_tests/blas/level1/rotmg.cpp index 2f3149ff3..286b51b11 100644 --- a/tests/unit_tests/blas/level1/rotmg.cpp +++ b/tests/unit_tests/blas/level1/rotmg.cpp @@ -63,7 +63,7 @@ int test(device* dev, oneapi::mkl::layout layout) { // Call DPC++ ROTMG. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during ROTMG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device* dev, oneapi::mkl::layout layout) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during ROTMG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/rotmg_usm.cpp b/tests/unit_tests/blas/level1/rotmg_usm.cpp index 06bea1d8b..082106724 100644 --- a/tests/unit_tests/blas/level1/rotmg_usm.cpp +++ b/tests/unit_tests/blas/level1/rotmg_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during ROTMG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device *dev, oneapi::mkl::layout layout) { catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during ROTMG:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/scal.cpp b/tests/unit_tests/blas/level1/scal.cpp index 098fbf245..e8c2dfb62 100644 --- a/tests/unit_tests/blas/level1/scal.cpp +++ b/tests/unit_tests/blas/level1/scal.cpp @@ -60,7 +60,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp // Call DPC++ SCAL. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -68,7 +68,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SCAL:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -105,7 +105,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SCAL:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/scal_usm.cpp b/tests/unit_tests/blas/level1/scal_usm.cpp index 4e0380822..c42c9de89 100644 --- a/tests/unit_tests/blas/level1/scal_usm.cpp +++ b/tests/unit_tests/blas/level1/scal_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alpha) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SCAL:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SCAL:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/sdsdot.cpp b/tests/unit_tests/blas/level1/sdsdot.cpp index 13f526ac5..048610363 100644 --- a/tests/unit_tests/blas/level1/sdsdot.cpp +++ b/tests/unit_tests/blas/level1/sdsdot.cpp @@ -58,7 +58,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo // Call DPC++ SDSDOT. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -66,7 +66,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SDSDOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -107,7 +107,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SDSDOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/sdsdot_usm.cpp b/tests/unit_tests/blas/level1/sdsdot_usm.cpp index a6c69b9d2..15e3e61ec 100644 --- a/tests/unit_tests/blas/level1/sdsdot_usm.cpp +++ b/tests/unit_tests/blas/level1/sdsdot_usm.cpp @@ -43,7 +43,7 @@ namespace { int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, float alpha) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -51,7 +51,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SDSDOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SDSDOT:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level1/swap.cpp b/tests/unit_tests/blas/level1/swap.cpp index bc156a11c..d8fce8a37 100644 --- a/tests/unit_tests/blas/level1/swap.cpp +++ b/tests/unit_tests/blas/level1/swap.cpp @@ -59,7 +59,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ SWAP. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -67,7 +67,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SWAP:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -106,7 +106,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SWAP:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level1/swap_usm.cpp b/tests/unit_tests/blas/level1/swap_usm.cpp index d7300789c..d8d65b8f9 100644 --- a/tests/unit_tests/blas/level1/swap_usm.cpp +++ b/tests/unit_tests/blas/level1/swap_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -52,7 +52,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SWAP:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -111,7 +111,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SWAP:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/gbmv.cpp b/tests/unit_tests/blas/level2/gbmv.cpp index 66fd8e87e..e14f89594 100644 --- a/tests/unit_tests/blas/level2/gbmv.cpp +++ b/tests/unit_tests/blas/level2/gbmv.cpp @@ -68,7 +68,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GBMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -76,7 +76,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/gbmv_usm.cpp b/tests/unit_tests/blas/level2/gbmv_usm.cpp index 09efc9421..0c8b8aa9b 100644 --- a/tests/unit_tests/blas/level2/gbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/gbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, int m, int n, int kl, int ku, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/gemv.cpp b/tests/unit_tests/blas/level2/gemv.cpp index 259a1cf31..109640535 100644 --- a/tests/unit_tests/blas/level2/gemv.cpp +++ b/tests/unit_tests/blas/level2/gemv.cpp @@ -67,7 +67,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -75,7 +75,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -116,7 +116,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/gemv_usm.cpp b/tests/unit_tests/blas/level2/gemv_usm.cpp index 202292e8a..8f6218c6b 100644 --- a/tests/unit_tests/blas/level2/gemv_usm.cpp +++ b/tests/unit_tests/blas/level2/gemv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, int m, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -122,7 +122,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/ger.cpp b/tests/unit_tests/blas/level2/ger.cpp index 5b241487d..b84342713 100644 --- a/tests/unit_tests/blas/level2/ger.cpp +++ b/tests/unit_tests/blas/level2/ger.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GER. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/ger_usm.cpp b/tests/unit_tests/blas/level2/ger_usm.cpp index 0cb3e0399..493cbcd74 100644 --- a/tests/unit_tests/blas/level2/ger_usm.cpp +++ b/tests/unit_tests/blas/level2/ger_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -117,7 +117,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/gerc.cpp b/tests/unit_tests/blas/level2/gerc.cpp index c0ca89f39..b2fd84816 100644 --- a/tests/unit_tests/blas/level2/gerc.cpp +++ b/tests/unit_tests/blas/level2/gerc.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GERC. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GERC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GERC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/gerc_usm.cpp b/tests/unit_tests/blas/level2/gerc_usm.cpp index 6ccea36e3..f481751ee 100644 --- a/tests/unit_tests/blas/level2/gerc_usm.cpp +++ b/tests/unit_tests/blas/level2/gerc_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GERC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -117,7 +117,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GERC:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/geru.cpp b/tests/unit_tests/blas/level2/geru.cpp index fe3fdb2a2..dda714e0d 100644 --- a/tests/unit_tests/blas/level2/geru.cpp +++ b/tests/unit_tests/blas/level2/geru.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GERU. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GERU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GERU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/geru_usm.cpp b/tests/unit_tests/blas/level2/geru_usm.cpp index bbce56657..1b9833a40 100644 --- a/tests/unit_tests/blas/level2/geru_usm.cpp +++ b/tests/unit_tests/blas/level2/geru_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during GERU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -117,7 +117,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during GERU:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hbmv.cpp b/tests/unit_tests/blas/level2/hbmv.cpp index 74b1112b6..14a4ba430 100644 --- a/tests/unit_tests/blas/level2/hbmv.cpp +++ b/tests/unit_tests/blas/level2/hbmv.cpp @@ -65,7 +65,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HBMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -73,7 +73,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -116,7 +116,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hbmv_usm.cpp b/tests/unit_tests/blas/level2/hbmv_usm.cpp index 0917f5f76..72ae25445 100644 --- a/tests/unit_tests/blas/level2/hbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/hbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, int k, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -121,7 +121,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hemv.cpp b/tests/unit_tests/blas/level2/hemv.cpp index 51081ab43..08ef1c3da 100644 --- a/tests/unit_tests/blas/level2/hemv.cpp +++ b/tests/unit_tests/blas/level2/hemv.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HEMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hemv_usm.cpp b/tests/unit_tests/blas/level2/hemv_usm.cpp index 68e9baa2e..b6c2ad341 100644 --- a/tests/unit_tests/blas/level2/hemv_usm.cpp +++ b/tests/unit_tests/blas/level2/hemv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HEMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/her.cpp b/tests/unit_tests/blas/level2/her.cpp index aff7825d3..4ec98332b 100644 --- a/tests/unit_tests/blas/level2/her.cpp +++ b/tests/unit_tests/blas/level2/her.cpp @@ -62,7 +62,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/her2.cpp b/tests/unit_tests/blas/level2/her2.cpp index 92573dd13..022f5ea04 100644 --- a/tests/unit_tests/blas/level2/her2.cpp +++ b/tests/unit_tests/blas/level2/her2.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER2. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HER2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HER2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/her2_usm.cpp b/tests/unit_tests/blas/level2/her2_usm.cpp index fd2241726..4e811e570 100644 --- a/tests/unit_tests/blas/level2/her2_usm.cpp +++ b/tests/unit_tests/blas/level2/her2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HER2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HER2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/her_usm.cpp b/tests/unit_tests/blas/level2/her_usm.cpp index 90b424416..f600333fa 100644 --- a/tests/unit_tests/blas/level2/her_usm.cpp +++ b/tests/unit_tests/blas/level2/her_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp_scalar alpha, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -114,7 +114,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HER:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpmv.cpp b/tests/unit_tests/blas/level2/hpmv.cpp index b5fc31132..acb6495f1 100644 --- a/tests/unit_tests/blas/level2/hpmv.cpp +++ b/tests/unit_tests/blas/level2/hpmv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpmv_usm.cpp b/tests/unit_tests/blas/level2/hpmv_usm.cpp index 3c742e1fa..c5531e502 100644 --- a/tests/unit_tests/blas/level2/hpmv_usm.cpp +++ b/tests/unit_tests/blas/level2/hpmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpr.cpp b/tests/unit_tests/blas/level2/hpr.cpp index 32e62ec11..2eb83eb81 100644 --- a/tests/unit_tests/blas/level2/hpr.cpp +++ b/tests/unit_tests/blas/level2/hpr.cpp @@ -62,7 +62,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPR. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpr2.cpp b/tests/unit_tests/blas/level2/hpr2.cpp index fdefb156f..21c0d6a20 100644 --- a/tests/unit_tests/blas/level2/hpr2.cpp +++ b/tests/unit_tests/blas/level2/hpr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPR2. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpr2_usm.cpp b/tests/unit_tests/blas/level2/hpr2_usm.cpp index a7e448b27..0b80d01ed 100644 --- a/tests/unit_tests/blas/level2/hpr2_usm.cpp +++ b/tests/unit_tests/blas/level2/hpr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -118,7 +118,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/hpr_usm.cpp b/tests/unit_tests/blas/level2/hpr_usm.cpp index a9ad806d1..3ce87f45e 100644 --- a/tests/unit_tests/blas/level2/hpr_usm.cpp +++ b/tests/unit_tests/blas/level2/hpr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp_scalar alpha, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during HPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -114,7 +114,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during HPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/sbmv.cpp b/tests/unit_tests/blas/level2/sbmv.cpp index 543124899..8335f162e 100644 --- a/tests/unit_tests/blas/level2/sbmv.cpp +++ b/tests/unit_tests/blas/level2/sbmv.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SBMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -114,7 +114,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/sbmv_usm.cpp b/tests/unit_tests/blas/level2/sbmv_usm.cpp index 8470d66b5..17e31a265 100644 --- a/tests/unit_tests/blas/level2/sbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/sbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, int k, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spmv.cpp b/tests/unit_tests/blas/level2/spmv.cpp index 852a1145b..1d0402161 100644 --- a/tests/unit_tests/blas/level2/spmv.cpp +++ b/tests/unit_tests/blas/level2/spmv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spmv_usm.cpp b/tests/unit_tests/blas/level2/spmv_usm.cpp index 29b339ce9..0f5b38d94 100644 --- a/tests/unit_tests/blas/level2/spmv_usm.cpp +++ b/tests/unit_tests/blas/level2/spmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spr.cpp b/tests/unit_tests/blas/level2/spr.cpp index 0925280b1..88864b378 100644 --- a/tests/unit_tests/blas/level2/spr.cpp +++ b/tests/unit_tests/blas/level2/spr.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPR. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -69,7 +69,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -109,7 +109,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spr2.cpp b/tests/unit_tests/blas/level2/spr2.cpp index 89bd6d908..799a0b01b 100644 --- a/tests/unit_tests/blas/level2/spr2.cpp +++ b/tests/unit_tests/blas/level2/spr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPR2. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spr2_usm.cpp b/tests/unit_tests/blas/level2/spr2_usm.cpp index 4a7159fb0..bb0931a06 100644 --- a/tests/unit_tests/blas/level2/spr2_usm.cpp +++ b/tests/unit_tests/blas/level2/spr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -118,7 +118,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/spr_usm.cpp b/tests/unit_tests/blas/level2/spr_usm.cpp index fa21ada94..f9b3f4055 100644 --- a/tests/unit_tests/blas/level2/spr_usm.cpp +++ b/tests/unit_tests/blas/level2/spr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SPR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/symv.cpp b/tests/unit_tests/blas/level2/symv.cpp index ed96c4e10..54c1380c3 100644 --- a/tests/unit_tests/blas/level2/symv.cpp +++ b/tests/unit_tests/blas/level2/symv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/symv_usm.cpp b/tests/unit_tests/blas/level2/symv_usm.cpp index 142ca682b..c9e26f2ff 100644 --- a/tests/unit_tests/blas/level2/symv_usm.cpp +++ b/tests/unit_tests/blas/level2/symv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/syr.cpp b/tests/unit_tests/blas/level2/syr.cpp index d56d011b1..2b0b1967d 100644 --- a/tests/unit_tests/blas/level2/syr.cpp +++ b/tests/unit_tests/blas/level2/syr.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -69,7 +69,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -109,7 +109,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/syr2.cpp b/tests/unit_tests/blas/level2/syr2.cpp index 7a1618ab2..4aa69335e 100644 --- a/tests/unit_tests/blas/level2/syr2.cpp +++ b/tests/unit_tests/blas/level2/syr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR2. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -71,7 +71,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/syr2_usm.cpp b/tests/unit_tests/blas/level2/syr2_usm.cpp index 89312b8a5..95a4f0d2f 100644 --- a/tests/unit_tests/blas/level2/syr2_usm.cpp +++ b/tests/unit_tests/blas/level2/syr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYR2:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/syr_usm.cpp b/tests/unit_tests/blas/level2/syr_usm.cpp index a647aa8d9..35739430a 100644 --- a/tests/unit_tests/blas/level2/syr_usm.cpp +++ b/tests/unit_tests/blas/level2/syr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught asynchronous SYCL exception during SYR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const &e) { std::cout << "Caught synchronous SYCL exception during SYR:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented &e) { diff --git a/tests/unit_tests/blas/level2/tbmv.cpp b/tests/unit_tests/blas/level2/tbmv.cpp index 9dc07be8c..65bd8acbf 100644 --- a/tests/unit_tests/blas/level2/tbmv.cpp +++ b/tests/unit_tests/blas/level2/tbmv.cpp @@ -64,7 +64,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TBMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tbmv_usm.cpp b/tests/unit_tests/blas/level2/tbmv_usm.cpp index 0388d17ec..44dbe839c 100644 --- a/tests/unit_tests/blas/level2/tbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/tbmv_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int k, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tbsv.cpp b/tests/unit_tests/blas/level2/tbsv.cpp index 8869592db..4ffa63b23 100644 --- a/tests/unit_tests/blas/level2/tbsv.cpp +++ b/tests/unit_tests/blas/level2/tbsv.cpp @@ -64,7 +64,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TBSV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -72,7 +72,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TBSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -112,7 +112,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tbsv_usm.cpp b/tests/unit_tests/blas/level2/tbsv_usm.cpp index 26a151bb4..daca518b2 100644 --- a/tests/unit_tests/blas/level2/tbsv_usm.cpp +++ b/tests/unit_tests/blas/level2/tbsv_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int k, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TBSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -120,7 +120,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tpmv.cpp b/tests/unit_tests/blas/level2/tpmv.cpp index fc4c054a8..0113cc3dc 100644 --- a/tests/unit_tests/blas/level2/tpmv.cpp +++ b/tests/unit_tests/blas/level2/tpmv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TPMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tpmv_usm.cpp b/tests/unit_tests/blas/level2/tpmv_usm.cpp index 874364772..611564798 100644 --- a/tests/unit_tests/blas/level2/tpmv_usm.cpp +++ b/tests/unit_tests/blas/level2/tpmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TPMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -116,7 +116,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TBMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tpsv.cpp b/tests/unit_tests/blas/level2/tpsv.cpp index c72e5bf20..b23a33948 100644 --- a/tests/unit_tests/blas/level2/tpsv.cpp +++ b/tests/unit_tests/blas/level2/tpsv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TPSV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TPSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TPSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/tpsv_usm.cpp b/tests/unit_tests/blas/level2/tpsv_usm.cpp index a3f7e9cca..6e5998149 100644 --- a/tests/unit_tests/blas/level2/tpsv_usm.cpp +++ b/tests/unit_tests/blas/level2/tpsv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TPSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -116,7 +116,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TPSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/trmv.cpp b/tests/unit_tests/blas/level2/trmv.cpp index 30ec9f134..3f0e406d1 100644 --- a/tests/unit_tests/blas/level2/trmv.cpp +++ b/tests/unit_tests/blas/level2/trmv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TRMV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/trmv_usm.cpp b/tests/unit_tests/blas/level2/trmv_usm.cpp index 1d85230b1..8cacb698a 100644 --- a/tests/unit_tests/blas/level2/trmv_usm.cpp +++ b/tests/unit_tests/blas/level2/trmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -118,7 +118,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRMV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/trsv.cpp b/tests/unit_tests/blas/level2/trsv.cpp index 4fd3e628c..ace33fdc7 100644 --- a/tests/unit_tests/blas/level2/trsv.cpp +++ b/tests/unit_tests/blas/level2/trsv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TRSV. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -110,7 +110,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level2/trsv_usm.cpp b/tests/unit_tests/blas/level2/trsv_usm.cpp index 385f78e95..a5f527465 100644 --- a/tests/unit_tests/blas/level2/trsv_usm.cpp +++ b/tests/unit_tests/blas/level2/trsv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx, int lda) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -118,7 +118,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRSV:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/gemm.cpp b/tests/unit_tests/blas/level3/gemm.cpp index 2766660c1..9cc34dd66 100644 --- a/tests/unit_tests/blas/level3/gemm.cpp +++ b/tests/unit_tests/blas/level3/gemm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -79,7 +79,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during GEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -124,7 +124,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during GEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { @@ -144,7 +144,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, class GemmTests : public ::testing::TestWithParam> {}; - +#ifdef NOT_HIPSYCL TEST_P(GemmTests, HalfHalfFloatPrecision) { float alpha(2.0); float beta(3.0); @@ -178,7 +178,7 @@ TEST_P(GemmTests, RealHalfPrecision) { std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::trans, oneapi::mkl::transpose::trans, 79, 83, 91, 103, 105, 106, alpha, beta))); } - +#endif TEST_P(GemmTests, RealSinglePrecision) { float alpha(2.0); float beta(3.0); diff --git a/tests/unit_tests/blas/level3/gemm_usm.cpp b/tests/unit_tests/blas/level3/gemm_usm.cpp index 96990c4ae..15b23fa34 100644 --- a/tests/unit_tests/blas/level3/gemm_usm.cpp +++ b/tests/unit_tests/blas/level3/gemm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, oneapi::mkl::transpose transb, int m, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during GEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during GEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/hemm.cpp b/tests/unit_tests/blas/level3/hemm.cpp index c76259965..9093e0263 100644 --- a/tests/unit_tests/blas/level3/hemm.cpp +++ b/tests/unit_tests/blas/level3/hemm.cpp @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ HEMM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -78,7 +78,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/hemm_usm.cpp b/tests/unit_tests/blas/level3/hemm_usm.cpp index 75781fbc1..b185df6a2 100644 --- a/tests/unit_tests/blas/level3/hemm_usm.cpp +++ b/tests/unit_tests/blas/level3/hemm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, int m, int n, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -124,7 +124,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HEMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/her2k.cpp b/tests/unit_tests/blas/level3/her2k.cpp index 96e3750d8..184e367d2 100644 --- a/tests/unit_tests/blas/level3/her2k.cpp +++ b/tests/unit_tests/blas/level3/her2k.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER2K. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -79,7 +79,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HER2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -124,7 +124,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HER2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/her2k_usm.cpp b/tests/unit_tests/blas/level3/her2k_usm.cpp index 9062fa82f..4f958a691 100644 --- a/tests/unit_tests/blas/level3/her2k_usm.cpp +++ b/tests/unit_tests/blas/level3/her2k_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldb, int ldc, fp alpha, fp_scalar beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HER2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -126,7 +126,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HER2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/herk.cpp b/tests/unit_tests/blas/level3/herk.cpp index 87bda30e4..ad3102567 100644 --- a/tests/unit_tests/blas/level3/herk.cpp +++ b/tests/unit_tests/blas/level3/herk.cpp @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HERK. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -74,7 +74,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HERK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -114,7 +114,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HERK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/herk_usm.cpp b/tests/unit_tests/blas/level3/herk_usm.cpp index 7dd993b2e..7dd4878ac 100644 --- a/tests/unit_tests/blas/level3/herk_usm.cpp +++ b/tests/unit_tests/blas/level3/herk_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldc, fp_scalar alpha, fp_scalar beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during HERK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -121,7 +121,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during HERK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/symm.cpp b/tests/unit_tests/blas/level3/symm.cpp index 0af15a290..a64f8ed33 100644 --- a/tests/unit_tests/blas/level3/symm.cpp +++ b/tests/unit_tests/blas/level3/symm.cpp @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ SYMM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -78,7 +78,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/symm_usm.cpp b/tests/unit_tests/blas/level3/symm_usm.cpp index b6bcc1871..142ee5923 100644 --- a/tests/unit_tests/blas/level3/symm_usm.cpp +++ b/tests/unit_tests/blas/level3/symm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, int m, int n, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -124,7 +124,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/syr2k.cpp b/tests/unit_tests/blas/level3/syr2k.cpp index 41e38637e..5d4915656 100644 --- a/tests/unit_tests/blas/level3/syr2k.cpp +++ b/tests/unit_tests/blas/level3/syr2k.cpp @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR2K. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -74,7 +74,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYR2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYR2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/syr2k_usm.cpp b/tests/unit_tests/blas/level3/syr2k_usm.cpp index 8826878ed..f058549a1 100644 --- a/tests/unit_tests/blas/level3/syr2k_usm.cpp +++ b/tests/unit_tests/blas/level3/syr2k_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYR2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -121,7 +121,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYR2K:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/syrk.cpp b/tests/unit_tests/blas/level3/syrk.cpp index dd805db4c..be1d0637e 100644 --- a/tests/unit_tests/blas/level3/syrk.cpp +++ b/tests/unit_tests/blas/level3/syrk.cpp @@ -65,7 +65,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYRK. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -73,7 +73,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYRK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -113,7 +113,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYRK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/syrk_usm.cpp b/tests/unit_tests/blas/level3/syrk_usm.cpp index 2f7635e6b..435eaaf9e 100644 --- a/tests/unit_tests/blas/level3/syrk_usm.cpp +++ b/tests/unit_tests/blas/level3/syrk_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -54,7 +54,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during SYRK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -119,7 +119,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during SYRK:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/trmm.cpp b/tests/unit_tests/blas/level3/trmm.cpp index b82af0055..966f4fb98 100644 --- a/tests/unit_tests/blas/level3/trmm.cpp +++ b/tests/unit_tests/blas/level3/trmm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ TRMM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -79,7 +79,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/trmm_usm.cpp b/tests/unit_tests/blas/level3/trmm_usm.cpp index 510eb0e29..443b71274 100644 --- a/tests/unit_tests/blas/level3/trmm_usm.cpp +++ b/tests/unit_tests/blas/level3/trmm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int m, int n, int lda, int ldb, fp alpha) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -126,7 +126,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRMM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/trsm.cpp b/tests/unit_tests/blas/level3/trsm.cpp index 48dba025d..ae6255718 100644 --- a/tests/unit_tests/blas/level3/trsm.cpp +++ b/tests/unit_tests/blas/level3/trsm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ TRSM. // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -79,7 +79,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRSM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -123,7 +123,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRSM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/blas/level3/trsm_usm.cpp b/tests/unit_tests/blas/level3/trsm_usm.cpp index b50679f73..f00d40d2f 100644 --- a/tests/unit_tests/blas/level3/trsm_usm.cpp +++ b/tests/unit_tests/blas/level3/trsm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int m, int n, int lda, int ldb, fp alpha) { // Catch asynchronous exceptions. - auto exception_handler = [](exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); @@ -55,7 +55,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught asynchronous SYCL exception during TRSM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; @@ -126,7 +126,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, catch (exception const& e) { std::cout << "Caught synchronous SYCL exception during TRSM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { diff --git a/tests/unit_tests/main_test.cpp b/tests/unit_tests/main_test.cpp index 0d6b97ee6..3b864ef2d 100644 --- a/tests/unit_tests/main_test.cpp +++ b/tests/unit_tests/main_test.cpp @@ -107,7 +107,11 @@ int main(int argc, char** argv) { if (dev.is_gpu() && vendor_id == NVIDIA_ID) continue; #endif +#ifdef __HIPSYCL__ + if (dev.is_accelerator()) +#else if (!dev.is_accelerator()) +#endif local_devices.push_back(dev); } } diff --git a/tests/unit_tests/rng/include/engines_api_tests.hpp b/tests/unit_tests/rng/include/engines_api_tests.hpp index 5bc24bcbd..feec38fec 100644 --- a/tests/unit_tests/rng/include/engines_api_tests.hpp +++ b/tests/unit_tests/rng/include/engines_api_tests.hpp @@ -67,7 +67,7 @@ class engines_constructors_test { catch (cl::sycl::exception const& e) { std::cout << "SYCL exception during generation" << std::endl << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; status = test_failed; return; } @@ -123,7 +123,7 @@ class engines_copy_test { catch (cl::sycl::exception const& e) { std::cout << "SYCL exception during generation" << std::endl << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; status = test_failed; return; } diff --git a/tests/unit_tests/rng/include/rng_test_common.hpp b/tests/unit_tests/rng/include/rng_test_common.hpp index 40a27b8f3..65acf3452 100644 --- a/tests/unit_tests/rng/include/rng_test_common.hpp +++ b/tests/unit_tests/rng/include/rng_test_common.hpp @@ -79,15 +79,15 @@ class rng_test { // method to call any tests, switch between rt and ct template int operator()(cl::sycl::device* dev, Args... args) { - auto exception_handler = [](sycl::exception_list exceptions) { + cl::sycl::async_handler exception_handler = [](cl::sycl::exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); } - catch (sycl::exception const& e) { + catch (cl::sycl::exception const& e) { std::cout << "Caught asynchronous SYCL exception during ASUM:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } } }; diff --git a/tests/unit_tests/rng/include/skip_ahead_test.hpp b/tests/unit_tests/rng/include/skip_ahead_test.hpp index e4d881353..a9e2f81a4 100644 --- a/tests/unit_tests/rng/include/skip_ahead_test.hpp +++ b/tests/unit_tests/rng/include/skip_ahead_test.hpp @@ -76,7 +76,7 @@ class skip_ahead_test { catch (cl::sycl::exception const& e) { std::cout << "SYCL exception during generation" << std::endl << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; status = test_failed; return; } @@ -123,7 +123,7 @@ class skip_ahead_ex_test { catch (cl::sycl::exception const& e) { std::cout << "SYCL exception during generation" << std::endl << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; status = test_failed; return; } diff --git a/tests/unit_tests/rng/include/statistics_check_test.hpp b/tests/unit_tests/rng/include/statistics_check_test.hpp index a044fda78..e0c7911ba 100644 --- a/tests/unit_tests/rng/include/statistics_check_test.hpp +++ b/tests/unit_tests/rng/include/statistics_check_test.hpp @@ -44,6 +44,7 @@ #define POISSON_ARGS 0.5 +using namespace cl; template class statistics_test { public: @@ -54,16 +55,16 @@ class statistics_test { std::vector r(n_gen); try { - sycl::buffer r_buffer(r.data(), r.size()); + cl::sycl::buffer r_buffer(r.data(), r.size()); Engine engine(queue, SEED); Distr distr(args...); oneapi::mkl::rng::generate(distr, engine, n_gen, r_buffer); } - catch (sycl::exception const& e) { + catch (cl::sycl::exception const& e) { std::cout << "Caught synchronous SYCL exception during generation:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { status = test_skipped; @@ -87,9 +88,9 @@ class statistics_usm_test { using Type = typename Distr::result_type; #ifdef CALL_RT_API - auto ua = sycl::usm_allocator(queue); + auto ua = cl::sycl::usm_allocator(queue); #else - auto ua = sycl::usm_allocator(queue.get_queue()); + auto ua = cl::sycl::usm_allocator(queue.get_queue()); #endif std::vector r(n_gen, ua); @@ -102,7 +103,7 @@ class statistics_usm_test { catch (sycl::exception const& e) { std::cout << "Caught synchronous SYCL exception during generation:\n" << e.what() << std::endl - << "OpenCL status: " << e.get_cl_code() << std::endl; + << "OpenCL status: " << e.what() << std::endl; } catch (const oneapi::mkl::unimplemented& e) { status = test_skipped; From 241e5c0348a75fff860b29060d8e39c054173587 Mon Sep 17 00:00:00 2001 From: sbalint98 Date: Fri, 21 May 2021 22:08:33 +0200 Subject: [PATCH 2/5] [tests] replace NOT_HIPSYCL with ENABLE_HALF_ROUTINES --- tests/unit_tests/blas/include/reference_blas_templates.hpp | 4 ++-- tests/unit_tests/blas/include/test_common.hpp | 5 +++-- tests/unit_tests/blas/level3/gemm.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/unit_tests/blas/include/reference_blas_templates.hpp b/tests/unit_tests/blas/include/reference_blas_templates.hpp index af358fab4..f493e3f25 100644 --- a/tests/unit_tests/blas/include/reference_blas_templates.hpp +++ b/tests/unit_tests/blas/include/reference_blas_templates.hpp @@ -224,7 +224,7 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fp *alpha, const fp *a, const int *lda, const fp *b, const int *ldb, const fp *beta, fp *c, const int *ldc); -#ifdef NOT_HIPSYCL +#ifdef ENABLE_HALF_ROUTINES template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const half *alpha, const half *a, const int *lda, @@ -291,7 +291,7 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fpc *alpha, const fpa *a, const int *lda, const fpa *b, const int *ldb, const fpc *beta, fpc *c, const int *ldc); -#ifdef NOT_HIPSYCL +#ifdef ENABLE_HALF_ROUTINES template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const float *alpha, const half *a, const int *lda, diff --git a/tests/unit_tests/blas/include/test_common.hpp b/tests/unit_tests/blas/include/test_common.hpp index 815155ab4..a6743d542 100644 --- a/tests/unit_tests/blas/include/test_common.hpp +++ b/tests/unit_tests/blas/include/test_common.hpp @@ -27,9 +27,10 @@ #include #include +#include "oneapi/mkl/detail/config.hpp" namespace std { -#ifdef NOT_HIPSYCL +#ifdef ENABLE_HALF_ROUTINES static cl::sycl::half abs(cl::sycl::half v) { if (v < cl::sycl::half(0)) return -v; @@ -142,7 +143,7 @@ template <> uint8_t rand_scalar() { return std::rand() % 128; } -#ifdef NOT_HIPSYCL +#ifdef ENABLE_HALF_ROUTINES template <> half rand_scalar() { return half(std::rand() % 32000) / half(32000) - half(0.5); diff --git a/tests/unit_tests/blas/level3/gemm.cpp b/tests/unit_tests/blas/level3/gemm.cpp index 9cc34dd66..c413a3368 100644 --- a/tests/unit_tests/blas/level3/gemm.cpp +++ b/tests/unit_tests/blas/level3/gemm.cpp @@ -144,7 +144,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, class GemmTests : public ::testing::TestWithParam> {}; -#ifdef NOT_HIPSYCL +#ifdef ENABLE_HALF_ROUTINES TEST_P(GemmTests, HalfHalfFloatPrecision) { float alpha(2.0); float beta(3.0); From 7ee59821b8e65c25c1ebde261f2ed82b9f5cedfc Mon Sep 17 00:00:00 2001 From: sbalint98 Date: Mon, 31 May 2021 14:28:56 +0200 Subject: [PATCH 3/5] [tests][rng] Remove superfluous cl:: qualifications from rng tests --- tests/unit_tests/rng/include/statistics_check_test.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit_tests/rng/include/statistics_check_test.hpp b/tests/unit_tests/rng/include/statistics_check_test.hpp index e0c7911ba..1f564cb77 100644 --- a/tests/unit_tests/rng/include/statistics_check_test.hpp +++ b/tests/unit_tests/rng/include/statistics_check_test.hpp @@ -55,13 +55,13 @@ class statistics_test { std::vector r(n_gen); try { - cl::sycl::buffer r_buffer(r.data(), r.size()); + sycl::buffer r_buffer(r.data(), r.size()); Engine engine(queue, SEED); Distr distr(args...); oneapi::mkl::rng::generate(distr, engine, n_gen, r_buffer); } - catch (cl::sycl::exception const& e) { + catch (sycl::exception const& e) { std::cout << "Caught synchronous SYCL exception during generation:\n" << e.what() << std::endl << "OpenCL status: " << e.what() << std::endl; @@ -88,9 +88,9 @@ class statistics_usm_test { using Type = typename Distr::result_type; #ifdef CALL_RT_API - auto ua = cl::sycl::usm_allocator(queue); + auto ua = sycl::usm_allocator(queue); #else - auto ua = cl::sycl::usm_allocator(queue.get_queue()); + auto ua = sycl::usm_allocator(queue.get_queue()); #endif std::vector r(n_gen, ua); From 009e6991b62d3fa6461474675a4f6f5d73afbfbc Mon Sep 17 00:00:00 2001 From: sbalint98 Date: Mon, 31 May 2021 14:31:52 +0200 Subject: [PATCH 4/5] [tests] use auto instead of cl::sycl::async_handler in tests --- tests/unit_tests/blas/batch/axpy_batch_usm.cpp | 2 +- tests/unit_tests/blas/batch/gemm_batch_stride.cpp | 2 +- tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp | 2 +- tests/unit_tests/blas/batch/gemm_batch_usm.cpp | 2 +- tests/unit_tests/blas/batch/trsm_batch_stride.cpp | 2 +- tests/unit_tests/blas/extensions/gemm_bias.cpp | 2 +- tests/unit_tests/blas/extensions/gemmt.cpp | 2 +- tests/unit_tests/blas/extensions/gemmt_usm.cpp | 2 +- tests/unit_tests/blas/level1/asum.cpp | 2 +- tests/unit_tests/blas/level1/asum_usm.cpp | 2 +- tests/unit_tests/blas/level1/axpy.cpp | 2 +- tests/unit_tests/blas/level1/axpy_usm.cpp | 2 +- tests/unit_tests/blas/level1/copy.cpp | 2 +- tests/unit_tests/blas/level1/copy_usm.cpp | 2 +- tests/unit_tests/blas/level1/dot.cpp | 2 +- tests/unit_tests/blas/level1/dot_usm.cpp | 2 +- tests/unit_tests/blas/level1/dotc.cpp | 2 +- tests/unit_tests/blas/level1/dotc_usm.cpp | 2 +- tests/unit_tests/blas/level1/dotu.cpp | 2 +- tests/unit_tests/blas/level1/dotu_usm.cpp | 2 +- tests/unit_tests/blas/level1/iamax.cpp | 2 +- tests/unit_tests/blas/level1/iamax_usm.cpp | 2 +- tests/unit_tests/blas/level1/iamin.cpp | 2 +- tests/unit_tests/blas/level1/iamin_usm.cpp | 2 +- tests/unit_tests/blas/level1/nrm2.cpp | 2 +- tests/unit_tests/blas/level1/nrm2_usm.cpp | 2 +- tests/unit_tests/blas/level1/rot.cpp | 2 +- tests/unit_tests/blas/level1/rot_usm.cpp | 2 +- tests/unit_tests/blas/level1/rotg.cpp | 2 +- tests/unit_tests/blas/level1/rotg_usm.cpp | 2 +- tests/unit_tests/blas/level1/rotm.cpp | 2 +- tests/unit_tests/blas/level1/rotm_usm.cpp | 2 +- tests/unit_tests/blas/level1/rotmg.cpp | 2 +- tests/unit_tests/blas/level1/rotmg_usm.cpp | 2 +- tests/unit_tests/blas/level1/scal.cpp | 2 +- tests/unit_tests/blas/level1/scal_usm.cpp | 2 +- tests/unit_tests/blas/level1/sdsdot.cpp | 2 +- tests/unit_tests/blas/level1/sdsdot_usm.cpp | 2 +- tests/unit_tests/blas/level1/swap.cpp | 2 +- tests/unit_tests/blas/level1/swap_usm.cpp | 2 +- tests/unit_tests/blas/level2/gbmv.cpp | 2 +- tests/unit_tests/blas/level2/gbmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/gemv.cpp | 2 +- tests/unit_tests/blas/level2/gemv_usm.cpp | 2 +- tests/unit_tests/blas/level2/ger.cpp | 2 +- tests/unit_tests/blas/level2/ger_usm.cpp | 2 +- tests/unit_tests/blas/level2/gerc.cpp | 2 +- tests/unit_tests/blas/level2/gerc_usm.cpp | 2 +- tests/unit_tests/blas/level2/geru.cpp | 2 +- tests/unit_tests/blas/level2/geru_usm.cpp | 2 +- tests/unit_tests/blas/level2/hbmv.cpp | 2 +- tests/unit_tests/blas/level2/hbmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/hemv.cpp | 2 +- tests/unit_tests/blas/level2/hemv_usm.cpp | 2 +- tests/unit_tests/blas/level2/her.cpp | 2 +- tests/unit_tests/blas/level2/her2.cpp | 2 +- tests/unit_tests/blas/level2/her2_usm.cpp | 2 +- tests/unit_tests/blas/level2/her_usm.cpp | 2 +- tests/unit_tests/blas/level2/hpmv.cpp | 2 +- tests/unit_tests/blas/level2/hpmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/hpr.cpp | 2 +- tests/unit_tests/blas/level2/hpr2.cpp | 2 +- tests/unit_tests/blas/level2/hpr2_usm.cpp | 2 +- tests/unit_tests/blas/level2/hpr_usm.cpp | 2 +- tests/unit_tests/blas/level2/sbmv.cpp | 2 +- tests/unit_tests/blas/level2/sbmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/spmv.cpp | 2 +- tests/unit_tests/blas/level2/spmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/spr.cpp | 2 +- tests/unit_tests/blas/level2/spr2.cpp | 2 +- tests/unit_tests/blas/level2/spr2_usm.cpp | 2 +- tests/unit_tests/blas/level2/spr_usm.cpp | 2 +- tests/unit_tests/blas/level2/symv.cpp | 2 +- tests/unit_tests/blas/level2/symv_usm.cpp | 2 +- tests/unit_tests/blas/level2/syr.cpp | 2 +- tests/unit_tests/blas/level2/syr2.cpp | 2 +- tests/unit_tests/blas/level2/syr2_usm.cpp | 2 +- tests/unit_tests/blas/level2/syr_usm.cpp | 2 +- tests/unit_tests/blas/level2/tbmv.cpp | 2 +- tests/unit_tests/blas/level2/tbmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/tbsv.cpp | 2 +- tests/unit_tests/blas/level2/tbsv_usm.cpp | 2 +- tests/unit_tests/blas/level2/tpmv.cpp | 2 +- tests/unit_tests/blas/level2/tpmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/tpsv.cpp | 2 +- tests/unit_tests/blas/level2/tpsv_usm.cpp | 2 +- tests/unit_tests/blas/level2/trmv.cpp | 2 +- tests/unit_tests/blas/level2/trmv_usm.cpp | 2 +- tests/unit_tests/blas/level2/trsv.cpp | 2 +- tests/unit_tests/blas/level2/trsv_usm.cpp | 2 +- tests/unit_tests/blas/level3/gemm.cpp | 2 +- tests/unit_tests/blas/level3/gemm_usm.cpp | 2 +- tests/unit_tests/blas/level3/hemm.cpp | 2 +- tests/unit_tests/blas/level3/hemm_usm.cpp | 2 +- tests/unit_tests/blas/level3/her2k.cpp | 2 +- tests/unit_tests/blas/level3/her2k_usm.cpp | 2 +- tests/unit_tests/blas/level3/herk.cpp | 2 +- tests/unit_tests/blas/level3/herk_usm.cpp | 2 +- tests/unit_tests/blas/level3/symm.cpp | 2 +- tests/unit_tests/blas/level3/symm_usm.cpp | 2 +- tests/unit_tests/blas/level3/syr2k.cpp | 2 +- tests/unit_tests/blas/level3/syr2k_usm.cpp | 2 +- tests/unit_tests/blas/level3/syrk.cpp | 2 +- tests/unit_tests/blas/level3/syrk_usm.cpp | 2 +- tests/unit_tests/blas/level3/trmm.cpp | 2 +- tests/unit_tests/blas/level3/trmm_usm.cpp | 2 +- tests/unit_tests/blas/level3/trsm.cpp | 2 +- tests/unit_tests/blas/level3/trsm_usm.cpp | 2 +- tests/unit_tests/rng/include/rng_test_common.hpp | 2 +- 109 files changed, 109 insertions(+), 109 deletions(-) diff --git a/tests/unit_tests/blas/batch/axpy_batch_usm.cpp b/tests/unit_tests/blas/batch/axpy_batch_usm.cpp index 6aafb5433..94e460a15 100644 --- a/tests/unit_tests/blas/batch/axpy_batch_usm.cpp +++ b/tests/unit_tests/blas/batch/axpy_batch_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/batch/gemm_batch_stride.cpp b/tests/unit_tests/blas/batch/gemm_batch_stride.cpp index db4356b0c..f9d5141bd 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_stride.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_stride.cpp @@ -128,7 +128,7 @@ int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { // Call DPC++ GEMM_BATCH_STRIDE. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp b/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp index 7b131cf31..713aeca03 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_stride_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t batch_size) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/batch/gemm_batch_usm.cpp b/tests/unit_tests/blas/batch/gemm_batch_usm.cpp index c184f7c66..ff3fd84d8 100644 --- a/tests/unit_tests/blas/batch/gemm_batch_usm.cpp +++ b/tests/unit_tests/blas/batch/gemm_batch_usm.cpp @@ -46,7 +46,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int64_t group_count) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/batch/trsm_batch_stride.cpp b/tests/unit_tests/blas/batch/trsm_batch_stride.cpp index ca8db6306..850653c1e 100644 --- a/tests/unit_tests/blas/batch/trsm_batch_stride.cpp +++ b/tests/unit_tests/blas/batch/trsm_batch_stride.cpp @@ -121,7 +121,7 @@ int test(device *dev, oneapi::mkl::layout layout) { // Call DPC++ TRSM_BATCH_STRIDE. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/extensions/gemm_bias.cpp b/tests/unit_tests/blas/extensions/gemm_bias.cpp index 2eae7988a..1587a2a6d 100644 --- a/tests/unit_tests/blas/extensions/gemm_bias.cpp +++ b/tests/unit_tests/blas/extensions/gemm_bias.cpp @@ -88,7 +88,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMM_BIAS. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/extensions/gemmt.cpp b/tests/unit_tests/blas/extensions/gemmt.cpp index d999d6f1a..9c23c93b2 100644 --- a/tests/unit_tests/blas/extensions/gemmt.cpp +++ b/tests/unit_tests/blas/extensions/gemmt.cpp @@ -68,7 +68,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ GEMMT. // Catch asynchronous exceptions - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/extensions/gemmt_usm.cpp b/tests/unit_tests/blas/extensions/gemmt_usm.cpp index 7a34789fd..9e9739fa8 100644 --- a/tests/unit_tests/blas/extensions/gemmt_usm.cpp +++ b/tests/unit_tests/blas/extensions/gemmt_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::transpose transb, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/asum.cpp b/tests/unit_tests/blas/level1/asum.cpp index 1e6c30754..47fab616d 100644 --- a/tests/unit_tests/blas/level1/asum.cpp +++ b/tests/unit_tests/blas/level1/asum.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { // Call DPC++ ASUM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/asum_usm.cpp b/tests/unit_tests/blas/level1/asum_usm.cpp index 24da8603c..73b64e66d 100644 --- a/tests/unit_tests/blas/level1/asum_usm.cpp +++ b/tests/unit_tests/blas/level1/asum_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int64_t N, int64_t incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/axpy.cpp b/tests/unit_tests/blas/level1/axpy.cpp index fd407b52c..d49945fd8 100644 --- a/tests/unit_tests/blas/level1/axpy.cpp +++ b/tests/unit_tests/blas/level1/axpy.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp // Call DPC++ AXPY. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/axpy_usm.cpp b/tests/unit_tests/blas/level1/axpy_usm.cpp index c391fc455..b41cc8709 100644 --- a/tests/unit_tests/blas/level1/axpy_usm.cpp +++ b/tests/unit_tests/blas/level1/axpy_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp alpha) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/copy.cpp b/tests/unit_tests/blas/level1/copy.cpp index 7f6c4f71e..757c6c103 100644 --- a/tests/unit_tests/blas/level1/copy.cpp +++ b/tests/unit_tests/blas/level1/copy.cpp @@ -59,7 +59,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ COPY. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/copy_usm.cpp b/tests/unit_tests/blas/level1/copy_usm.cpp index de9182981..1092ae9fb 100644 --- a/tests/unit_tests/blas/level1/copy_usm.cpp +++ b/tests/unit_tests/blas/level1/copy_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dot.cpp b/tests/unit_tests/blas/level1/dot.cpp index 23152db8d..35ad1b173 100644 --- a/tests/unit_tests/blas/level1/dot.cpp +++ b/tests/unit_tests/blas/level1/dot.cpp @@ -58,7 +58,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOT. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dot_usm.cpp b/tests/unit_tests/blas/level1/dot_usm.cpp index a706f5c87..f028deabf 100644 --- a/tests/unit_tests/blas/level1/dot_usm.cpp +++ b/tests/unit_tests/blas/level1/dot_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dotc.cpp b/tests/unit_tests/blas/level1/dotc.cpp index 1b720ecb1..cec10ec1e 100644 --- a/tests/unit_tests/blas/level1/dotc.cpp +++ b/tests/unit_tests/blas/level1/dotc.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOTC. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dotc_usm.cpp b/tests/unit_tests/blas/level1/dotc_usm.cpp index 239e67818..e93d5c42f 100644 --- a/tests/unit_tests/blas/level1/dotc_usm.cpp +++ b/tests/unit_tests/blas/level1/dotc_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dotu.cpp b/tests/unit_tests/blas/level1/dotu.cpp index 8c502e5f4..e422be01a 100644 --- a/tests/unit_tests/blas/level1/dotu.cpp +++ b/tests/unit_tests/blas/level1/dotu.cpp @@ -60,7 +60,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ DOTU. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/dotu_usm.cpp b/tests/unit_tests/blas/level1/dotu_usm.cpp index e3f32f94d..614d08c03 100644 --- a/tests/unit_tests/blas/level1/dotu_usm.cpp +++ b/tests/unit_tests/blas/level1/dotu_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/iamax.cpp b/tests/unit_tests/blas/level1/iamax.cpp index 0332930a5..6e5f3cf64 100644 --- a/tests/unit_tests/blas/level1/iamax.cpp +++ b/tests/unit_tests/blas/level1/iamax.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ IAMAX. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/iamax_usm.cpp b/tests/unit_tests/blas/level1/iamax_usm.cpp index 10d52e851..866854bc8 100644 --- a/tests/unit_tests/blas/level1/iamax_usm.cpp +++ b/tests/unit_tests/blas/level1/iamax_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/iamin.cpp b/tests/unit_tests/blas/level1/iamin.cpp index 23de659f8..81e2f1469 100644 --- a/tests/unit_tests/blas/level1/iamin.cpp +++ b/tests/unit_tests/blas/level1/iamin.cpp @@ -57,7 +57,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ IAMIN. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/iamin_usm.cpp b/tests/unit_tests/blas/level1/iamin_usm.cpp index 1b8c15217..3494b0c7f 100644 --- a/tests/unit_tests/blas/level1/iamin_usm.cpp +++ b/tests/unit_tests/blas/level1/iamin_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/nrm2.cpp b/tests/unit_tests/blas/level1/nrm2.cpp index 4c03f7e25..75a28b393 100644 --- a/tests/unit_tests/blas/level1/nrm2.cpp +++ b/tests/unit_tests/blas/level1/nrm2.cpp @@ -58,7 +58,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Call DPC++ NRM2. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/nrm2_usm.cpp b/tests/unit_tests/blas/level1/nrm2_usm.cpp index b2631344a..2ad828db3 100644 --- a/tests/unit_tests/blas/level1/nrm2_usm.cpp +++ b/tests/unit_tests/blas/level1/nrm2_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rot.cpp b/tests/unit_tests/blas/level1/rot.cpp index 02c3ab2df..192b7d1bd 100644 --- a/tests/unit_tests/blas/level1/rot.cpp +++ b/tests/unit_tests/blas/level1/rot.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_ // Call DPC++ ROT. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rot_usm.cpp b/tests/unit_tests/blas/level1/rot_usm.cpp index 8aa66b1e6..1c511f812 100644 --- a/tests/unit_tests/blas/level1/rot_usm.cpp +++ b/tests/unit_tests/blas/level1/rot_usm.cpp @@ -45,7 +45,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp_scalar c, fp_scalar s) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotg.cpp b/tests/unit_tests/blas/level1/rotg.cpp index c8412ef68..0ba86050e 100644 --- a/tests/unit_tests/blas/level1/rotg.cpp +++ b/tests/unit_tests/blas/level1/rotg.cpp @@ -65,7 +65,7 @@ int test(device *dev, oneapi::mkl::layout layout) { // Call DPC++ ROTG. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotg_usm.cpp b/tests/unit_tests/blas/level1/rotg_usm.cpp index 0870fd554..c2a092d7f 100644 --- a/tests/unit_tests/blas/level1/rotg_usm.cpp +++ b/tests/unit_tests/blas/level1/rotg_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotm.cpp b/tests/unit_tests/blas/level1/rotm.cpp index 73b59ab6c..fe2a70063 100644 --- a/tests/unit_tests/blas/level1/rotm.cpp +++ b/tests/unit_tests/blas/level1/rotm.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp // Call DPC++ ROTM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotm_usm.cpp b/tests/unit_tests/blas/level1/rotm_usm.cpp index 156117bc1..17097a5df 100644 --- a/tests/unit_tests/blas/level1/rotm_usm.cpp +++ b/tests/unit_tests/blas/level1/rotm_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, fp flag) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotmg.cpp b/tests/unit_tests/blas/level1/rotmg.cpp index 286b51b11..b01912a65 100644 --- a/tests/unit_tests/blas/level1/rotmg.cpp +++ b/tests/unit_tests/blas/level1/rotmg.cpp @@ -63,7 +63,7 @@ int test(device* dev, oneapi::mkl::layout layout) { // Call DPC++ ROTMG. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/rotmg_usm.cpp b/tests/unit_tests/blas/level1/rotmg_usm.cpp index 082106724..df62be75f 100644 --- a/tests/unit_tests/blas/level1/rotmg_usm.cpp +++ b/tests/unit_tests/blas/level1/rotmg_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device *dev, oneapi::mkl::layout layout) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/scal.cpp b/tests/unit_tests/blas/level1/scal.cpp index e8c2dfb62..dc72a9296 100644 --- a/tests/unit_tests/blas/level1/scal.cpp +++ b/tests/unit_tests/blas/level1/scal.cpp @@ -60,7 +60,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alp // Call DPC++ SCAL. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/scal_usm.cpp b/tests/unit_tests/blas/level1/scal_usm.cpp index c42c9de89..c06f7618c 100644 --- a/tests/unit_tests/blas/level1/scal_usm.cpp +++ b/tests/unit_tests/blas/level1/scal_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, fp_scalar alpha) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/sdsdot.cpp b/tests/unit_tests/blas/level1/sdsdot.cpp index 048610363..559534abf 100644 --- a/tests/unit_tests/blas/level1/sdsdot.cpp +++ b/tests/unit_tests/blas/level1/sdsdot.cpp @@ -58,7 +58,7 @@ int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, flo // Call DPC++ SDSDOT. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/sdsdot_usm.cpp b/tests/unit_tests/blas/level1/sdsdot_usm.cpp index 15e3e61ec..a39c91604 100644 --- a/tests/unit_tests/blas/level1/sdsdot_usm.cpp +++ b/tests/unit_tests/blas/level1/sdsdot_usm.cpp @@ -43,7 +43,7 @@ namespace { int test(device *dev, oneapi::mkl::layout layout, int N, int incx, int incy, float alpha) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/swap.cpp b/tests/unit_tests/blas/level1/swap.cpp index d8fce8a37..1557479d6 100644 --- a/tests/unit_tests/blas/level1/swap.cpp +++ b/tests/unit_tests/blas/level1/swap.cpp @@ -59,7 +59,7 @@ int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Call DPC++ SWAP. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level1/swap_usm.cpp b/tests/unit_tests/blas/level1/swap_usm.cpp index d8d65b8f9..1f2f16cc3 100644 --- a/tests/unit_tests/blas/level1/swap_usm.cpp +++ b/tests/unit_tests/blas/level1/swap_usm.cpp @@ -44,7 +44,7 @@ namespace { template int test(device* dev, oneapi::mkl::layout layout, int N, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gbmv.cpp b/tests/unit_tests/blas/level2/gbmv.cpp index e14f89594..e5aff222a 100644 --- a/tests/unit_tests/blas/level2/gbmv.cpp +++ b/tests/unit_tests/blas/level2/gbmv.cpp @@ -68,7 +68,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GBMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gbmv_usm.cpp b/tests/unit_tests/blas/level2/gbmv_usm.cpp index 0c8b8aa9b..a7423d8ca 100644 --- a/tests/unit_tests/blas/level2/gbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/gbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, int m, int n, int kl, int ku, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gemv.cpp b/tests/unit_tests/blas/level2/gemv.cpp index 109640535..3859c06c9 100644 --- a/tests/unit_tests/blas/level2/gemv.cpp +++ b/tests/unit_tests/blas/level2/gemv.cpp @@ -67,7 +67,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gemv_usm.cpp b/tests/unit_tests/blas/level2/gemv_usm.cpp index 8f6218c6b..dd85f70cb 100644 --- a/tests/unit_tests/blas/level2/gemv_usm.cpp +++ b/tests/unit_tests/blas/level2/gemv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, int m, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/ger.cpp b/tests/unit_tests/blas/level2/ger.cpp index b84342713..f2ffd861a 100644 --- a/tests/unit_tests/blas/level2/ger.cpp +++ b/tests/unit_tests/blas/level2/ger.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GER. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/ger_usm.cpp b/tests/unit_tests/blas/level2/ger_usm.cpp index 493cbcd74..bb864e648 100644 --- a/tests/unit_tests/blas/level2/ger_usm.cpp +++ b/tests/unit_tests/blas/level2/ger_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gerc.cpp b/tests/unit_tests/blas/level2/gerc.cpp index b2fd84816..e2bb1d198 100644 --- a/tests/unit_tests/blas/level2/gerc.cpp +++ b/tests/unit_tests/blas/level2/gerc.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GERC. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/gerc_usm.cpp b/tests/unit_tests/blas/level2/gerc_usm.cpp index f481751ee..e44b33a89 100644 --- a/tests/unit_tests/blas/level2/gerc_usm.cpp +++ b/tests/unit_tests/blas/level2/gerc_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/geru.cpp b/tests/unit_tests/blas/level2/geru.cpp index dda714e0d..1dbfc8016 100644 --- a/tests/unit_tests/blas/level2/geru.cpp +++ b/tests/unit_tests/blas/level2/geru.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int in // Call DPC++ GERU. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/geru_usm.cpp b/tests/unit_tests/blas/level2/geru_usm.cpp index 1b9833a40..564111111 100644 --- a/tests/unit_tests/blas/level2/geru_usm.cpp +++ b/tests/unit_tests/blas/level2/geru_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, int m, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hbmv.cpp b/tests/unit_tests/blas/level2/hbmv.cpp index 14a4ba430..f73dad462 100644 --- a/tests/unit_tests/blas/level2/hbmv.cpp +++ b/tests/unit_tests/blas/level2/hbmv.cpp @@ -65,7 +65,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HBMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hbmv_usm.cpp b/tests/unit_tests/blas/level2/hbmv_usm.cpp index 72ae25445..7bf779421 100644 --- a/tests/unit_tests/blas/level2/hbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/hbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, int k, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hemv.cpp b/tests/unit_tests/blas/level2/hemv.cpp index 08ef1c3da..139a8795f 100644 --- a/tests/unit_tests/blas/level2/hemv.cpp +++ b/tests/unit_tests/blas/level2/hemv.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HEMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hemv_usm.cpp b/tests/unit_tests/blas/level2/hemv_usm.cpp index b6c2ad341..364efef7b 100644 --- a/tests/unit_tests/blas/level2/hemv_usm.cpp +++ b/tests/unit_tests/blas/level2/hemv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/her.cpp b/tests/unit_tests/blas/level2/her.cpp index 4ec98332b..a51d698ff 100644 --- a/tests/unit_tests/blas/level2/her.cpp +++ b/tests/unit_tests/blas/level2/her.cpp @@ -62,7 +62,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/her2.cpp b/tests/unit_tests/blas/level2/her2.cpp index 022f5ea04..cbcf060e0 100644 --- a/tests/unit_tests/blas/level2/her2.cpp +++ b/tests/unit_tests/blas/level2/her2.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER2. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/her2_usm.cpp b/tests/unit_tests/blas/level2/her2_usm.cpp index 4e811e570..ff1a135f3 100644 --- a/tests/unit_tests/blas/level2/her2_usm.cpp +++ b/tests/unit_tests/blas/level2/her2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/her_usm.cpp b/tests/unit_tests/blas/level2/her_usm.cpp index f600333fa..9e0bc391a 100644 --- a/tests/unit_tests/blas/level2/her_usm.cpp +++ b/tests/unit_tests/blas/level2/her_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp_scalar alpha, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpmv.cpp b/tests/unit_tests/blas/level2/hpmv.cpp index acb6495f1..f23d9006c 100644 --- a/tests/unit_tests/blas/level2/hpmv.cpp +++ b/tests/unit_tests/blas/level2/hpmv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpmv_usm.cpp b/tests/unit_tests/blas/level2/hpmv_usm.cpp index c5531e502..e117c7e67 100644 --- a/tests/unit_tests/blas/level2/hpmv_usm.cpp +++ b/tests/unit_tests/blas/level2/hpmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpr.cpp b/tests/unit_tests/blas/level2/hpr.cpp index 2eb83eb81..0abaeb24c 100644 --- a/tests/unit_tests/blas/level2/hpr.cpp +++ b/tests/unit_tests/blas/level2/hpr.cpp @@ -62,7 +62,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPR. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpr2.cpp b/tests/unit_tests/blas/level2/hpr2.cpp index 21c0d6a20..bb863406d 100644 --- a/tests/unit_tests/blas/level2/hpr2.cpp +++ b/tests/unit_tests/blas/level2/hpr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HPR2. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpr2_usm.cpp b/tests/unit_tests/blas/level2/hpr2_usm.cpp index 0b80d01ed..99f0ab049 100644 --- a/tests/unit_tests/blas/level2/hpr2_usm.cpp +++ b/tests/unit_tests/blas/level2/hpr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/hpr_usm.cpp b/tests/unit_tests/blas/level2/hpr_usm.cpp index 3ce87f45e..3441bcc44 100644 --- a/tests/unit_tests/blas/level2/hpr_usm.cpp +++ b/tests/unit_tests/blas/level2/hpr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp_scalar alpha, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/sbmv.cpp b/tests/unit_tests/blas/level2/sbmv.cpp index 8335f162e..d32a3f0b2 100644 --- a/tests/unit_tests/blas/level2/sbmv.cpp +++ b/tests/unit_tests/blas/level2/sbmv.cpp @@ -64,7 +64,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SBMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/sbmv_usm.cpp b/tests/unit_tests/blas/level2/sbmv_usm.cpp index 17e31a265..93d08e97b 100644 --- a/tests/unit_tests/blas/level2/sbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/sbmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, int k, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spmv.cpp b/tests/unit_tests/blas/level2/spmv.cpp index 1d0402161..93780fa8e 100644 --- a/tests/unit_tests/blas/level2/spmv.cpp +++ b/tests/unit_tests/blas/level2/spmv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spmv_usm.cpp b/tests/unit_tests/blas/level2/spmv_usm.cpp index 0f5b38d94..69e5efadb 100644 --- a/tests/unit_tests/blas/level2/spmv_usm.cpp +++ b/tests/unit_tests/blas/level2/spmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spr.cpp b/tests/unit_tests/blas/level2/spr.cpp index 88864b378..1f090b36f 100644 --- a/tests/unit_tests/blas/level2/spr.cpp +++ b/tests/unit_tests/blas/level2/spr.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPR. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spr2.cpp b/tests/unit_tests/blas/level2/spr2.cpp index 799a0b01b..16b890eb1 100644 --- a/tests/unit_tests/blas/level2/spr2.cpp +++ b/tests/unit_tests/blas/level2/spr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SPR2. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spr2_usm.cpp b/tests/unit_tests/blas/level2/spr2_usm.cpp index bb0931a06..da2ce4804 100644 --- a/tests/unit_tests/blas/level2/spr2_usm.cpp +++ b/tests/unit_tests/blas/level2/spr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/spr_usm.cpp b/tests/unit_tests/blas/level2/spr_usm.cpp index f9b3f4055..c65ec12cc 100644 --- a/tests/unit_tests/blas/level2/spr_usm.cpp +++ b/tests/unit_tests/blas/level2/spr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/symv.cpp b/tests/unit_tests/blas/level2/symv.cpp index 54c1380c3..5fe693513 100644 --- a/tests/unit_tests/blas/level2/symv.cpp +++ b/tests/unit_tests/blas/level2/symv.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/symv_usm.cpp b/tests/unit_tests/blas/level2/symv_usm.cpp index c9e26f2ff..4ed2e4047 100644 --- a/tests/unit_tests/blas/level2/symv_usm.cpp +++ b/tests/unit_tests/blas/level2/symv_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, fp beta, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/syr.cpp b/tests/unit_tests/blas/level2/syr.cpp index 2b0b1967d..95c4e73db 100644 --- a/tests/unit_tests/blas/level2/syr.cpp +++ b/tests/unit_tests/blas/level2/syr.cpp @@ -61,7 +61,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/syr2.cpp b/tests/unit_tests/blas/level2/syr2.cpp index 4aa69335e..5491f1dd0 100644 --- a/tests/unit_tests/blas/level2/syr2.cpp +++ b/tests/unit_tests/blas/level2/syr2.cpp @@ -63,7 +63,7 @@ int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR2. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/syr2_usm.cpp b/tests/unit_tests/blas/level2/syr2_usm.cpp index 95a4f0d2f..bce6688bf 100644 --- a/tests/unit_tests/blas/level2/syr2_usm.cpp +++ b/tests/unit_tests/blas/level2/syr2_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int incy, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/syr_usm.cpp b/tests/unit_tests/blas/level2/syr_usm.cpp index 35739430a..f210bbc94 100644 --- a/tests/unit_tests/blas/level2/syr_usm.cpp +++ b/tests/unit_tests/blas/level2/syr_usm.cpp @@ -46,7 +46,7 @@ template int test(device *dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, int n, fp alpha, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const &e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tbmv.cpp b/tests/unit_tests/blas/level2/tbmv.cpp index 65bd8acbf..36305dc18 100644 --- a/tests/unit_tests/blas/level2/tbmv.cpp +++ b/tests/unit_tests/blas/level2/tbmv.cpp @@ -64,7 +64,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TBMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tbmv_usm.cpp b/tests/unit_tests/blas/level2/tbmv_usm.cpp index 44dbe839c..9c1c0b8a4 100644 --- a/tests/unit_tests/blas/level2/tbmv_usm.cpp +++ b/tests/unit_tests/blas/level2/tbmv_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int k, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tbsv.cpp b/tests/unit_tests/blas/level2/tbsv.cpp index 4ffa63b23..1d33c8b94 100644 --- a/tests/unit_tests/blas/level2/tbsv.cpp +++ b/tests/unit_tests/blas/level2/tbsv.cpp @@ -64,7 +64,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TBSV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tbsv_usm.cpp b/tests/unit_tests/blas/level2/tbsv_usm.cpp index daca518b2..56f237791 100644 --- a/tests/unit_tests/blas/level2/tbsv_usm.cpp +++ b/tests/unit_tests/blas/level2/tbsv_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int k, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tpmv.cpp b/tests/unit_tests/blas/level2/tpmv.cpp index 0113cc3dc..04022bbec 100644 --- a/tests/unit_tests/blas/level2/tpmv.cpp +++ b/tests/unit_tests/blas/level2/tpmv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TPMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tpmv_usm.cpp b/tests/unit_tests/blas/level2/tpmv_usm.cpp index 611564798..3de690ae6 100644 --- a/tests/unit_tests/blas/level2/tpmv_usm.cpp +++ b/tests/unit_tests/blas/level2/tpmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tpsv.cpp b/tests/unit_tests/blas/level2/tpsv.cpp index b23a33948..e88052a47 100644 --- a/tests/unit_tests/blas/level2/tpsv.cpp +++ b/tests/unit_tests/blas/level2/tpsv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TPSV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/tpsv_usm.cpp b/tests/unit_tests/blas/level2/tpsv_usm.cpp index 6e5998149..c1f6febbf 100644 --- a/tests/unit_tests/blas/level2/tpsv_usm.cpp +++ b/tests/unit_tests/blas/level2/tpsv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/trmv.cpp b/tests/unit_tests/blas/level2/trmv.cpp index 3f0e406d1..512693577 100644 --- a/tests/unit_tests/blas/level2/trmv.cpp +++ b/tests/unit_tests/blas/level2/trmv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TRMV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/trmv_usm.cpp b/tests/unit_tests/blas/level2/trmv_usm.cpp index 8cacb698a..84d91136a 100644 --- a/tests/unit_tests/blas/level2/trmv_usm.cpp +++ b/tests/unit_tests/blas/level2/trmv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/trsv.cpp b/tests/unit_tests/blas/level2/trsv.cpp index ace33fdc7..77e8c5f29 100644 --- a/tests/unit_tests/blas/level2/trsv.cpp +++ b/tests/unit_tests/blas/level2/trsv.cpp @@ -62,7 +62,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ TRSV. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level2/trsv_usm.cpp b/tests/unit_tests/blas/level2/trsv_usm.cpp index a5f527465..52af03f38 100644 --- a/tests/unit_tests/blas/level2/trsv_usm.cpp +++ b/tests/unit_tests/blas/level2/trsv_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int n, int incx, int lda) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/gemm.cpp b/tests/unit_tests/blas/level3/gemm.cpp index c413a3368..97fd90755 100644 --- a/tests/unit_tests/blas/level3/gemm.cpp +++ b/tests/unit_tests/blas/level3/gemm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, // Call DPC++ GEMM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/gemm_usm.cpp b/tests/unit_tests/blas/level3/gemm_usm.cpp index 15b23fa34..c8633206b 100644 --- a/tests/unit_tests/blas/level3/gemm_usm.cpp +++ b/tests/unit_tests/blas/level3/gemm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, oneapi::mkl::transpose transb, int m, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/hemm.cpp b/tests/unit_tests/blas/level3/hemm.cpp index 9093e0263..19220b51d 100644 --- a/tests/unit_tests/blas/level3/hemm.cpp +++ b/tests/unit_tests/blas/level3/hemm.cpp @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ HEMM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/hemm_usm.cpp b/tests/unit_tests/blas/level3/hemm_usm.cpp index b185df6a2..c8864bfdf 100644 --- a/tests/unit_tests/blas/level3/hemm_usm.cpp +++ b/tests/unit_tests/blas/level3/hemm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, int m, int n, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/her2k.cpp b/tests/unit_tests/blas/level3/her2k.cpp index 184e367d2..39447776b 100644 --- a/tests/unit_tests/blas/level3/her2k.cpp +++ b/tests/unit_tests/blas/level3/her2k.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HER2K. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/her2k_usm.cpp b/tests/unit_tests/blas/level3/her2k_usm.cpp index 4f958a691..05cd4ed7f 100644 --- a/tests/unit_tests/blas/level3/her2k_usm.cpp +++ b/tests/unit_tests/blas/level3/her2k_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldb, int ldc, fp alpha, fp_scalar beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/herk.cpp b/tests/unit_tests/blas/level3/herk.cpp index ad3102567..89a4a3475 100644 --- a/tests/unit_tests/blas/level3/herk.cpp +++ b/tests/unit_tests/blas/level3/herk.cpp @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ HERK. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/herk_usm.cpp b/tests/unit_tests/blas/level3/herk_usm.cpp index 7dd4878ac..5525c5190 100644 --- a/tests/unit_tests/blas/level3/herk_usm.cpp +++ b/tests/unit_tests/blas/level3/herk_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldc, fp_scalar alpha, fp_scalar beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/symm.cpp b/tests/unit_tests/blas/level3/symm.cpp index a64f8ed33..2922c3934 100644 --- a/tests/unit_tests/blas/level3/symm.cpp +++ b/tests/unit_tests/blas/level3/symm.cpp @@ -70,7 +70,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ SYMM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/symm_usm.cpp b/tests/unit_tests/blas/level3/symm_usm.cpp index 142ee5923..bd7395495 100644 --- a/tests/unit_tests/blas/level3/symm_usm.cpp +++ b/tests/unit_tests/blas/level3/symm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, int m, int n, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/syr2k.cpp b/tests/unit_tests/blas/level3/syr2k.cpp index 5d4915656..386c75ba4 100644 --- a/tests/unit_tests/blas/level3/syr2k.cpp +++ b/tests/unit_tests/blas/level3/syr2k.cpp @@ -66,7 +66,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYR2K. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/syr2k_usm.cpp b/tests/unit_tests/blas/level3/syr2k_usm.cpp index f058549a1..795a739c9 100644 --- a/tests/unit_tests/blas/level3/syr2k_usm.cpp +++ b/tests/unit_tests/blas/level3/syr2k_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldb, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/syrk.cpp b/tests/unit_tests/blas/level3/syrk.cpp index be1d0637e..ad59971e4 100644 --- a/tests/unit_tests/blas/level3/syrk.cpp +++ b/tests/unit_tests/blas/level3/syrk.cpp @@ -65,7 +65,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, // Call DPC++ SYRK. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/syrk_usm.cpp b/tests/unit_tests/blas/level3/syrk_usm.cpp index 435eaaf9e..2b1581c9c 100644 --- a/tests/unit_tests/blas/level3/syrk_usm.cpp +++ b/tests/unit_tests/blas/level3/syrk_usm.cpp @@ -46,7 +46,7 @@ template int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose trans, int n, int k, int lda, int ldc, fp alpha, fp beta) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/trmm.cpp b/tests/unit_tests/blas/level3/trmm.cpp index 966f4fb98..a4d8054b9 100644 --- a/tests/unit_tests/blas/level3/trmm.cpp +++ b/tests/unit_tests/blas/level3/trmm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ TRMM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/trmm_usm.cpp b/tests/unit_tests/blas/level3/trmm_usm.cpp index 443b71274..abddc9760 100644 --- a/tests/unit_tests/blas/level3/trmm_usm.cpp +++ b/tests/unit_tests/blas/level3/trmm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int m, int n, int lda, int ldb, fp alpha) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/trsm.cpp b/tests/unit_tests/blas/level3/trsm.cpp index ae6255718..aaca244b5 100644 --- a/tests/unit_tests/blas/level3/trsm.cpp +++ b/tests/unit_tests/blas/level3/trsm.cpp @@ -71,7 +71,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, // Call DPC++ TRSM. // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/blas/level3/trsm_usm.cpp b/tests/unit_tests/blas/level3/trsm_usm.cpp index f00d40d2f..4ad22178f 100644 --- a/tests/unit_tests/blas/level3/trsm_usm.cpp +++ b/tests/unit_tests/blas/level3/trsm_usm.cpp @@ -47,7 +47,7 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::side left_right, oneapi::mkl::uplo upper_lower, oneapi::mkl::transpose transa, oneapi::mkl::diag unit_nonunit, int m, int n, int lda, int ldb, fp alpha) { // Catch asynchronous exceptions. - cl::sycl::async_handler exception_handler = [](exception_list exceptions) { + auto exception_handler = [](exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); diff --git a/tests/unit_tests/rng/include/rng_test_common.hpp b/tests/unit_tests/rng/include/rng_test_common.hpp index 65acf3452..13a2c1466 100644 --- a/tests/unit_tests/rng/include/rng_test_common.hpp +++ b/tests/unit_tests/rng/include/rng_test_common.hpp @@ -79,7 +79,7 @@ class rng_test { // method to call any tests, switch between rt and ct template int operator()(cl::sycl::device* dev, Args... args) { - cl::sycl::async_handler exception_handler = [](cl::sycl::exception_list exceptions) { + auto exception_handler = [](cl::sycl::exception_list exceptions) { for (std::exception_ptr const& e : exceptions) { try { std::rethrow_exception(e); From 7c03871911995ec3dd35a9ea0af6cfe37af81906 Mon Sep 17 00:00:00 2001 From: sbalint98 Date: Wed, 2 Jun 2021 18:48:50 +0200 Subject: [PATCH 5/5] Remove useses of ifdefs from the tests --- .../blas/include/reference_blas_templates.hpp | 12 ++++------ tests/unit_tests/blas/include/test_common.hpp | 12 +++++----- tests/unit_tests/blas/level3/gemm.cpp | 22 +++++++++---------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/tests/unit_tests/blas/include/reference_blas_templates.hpp b/tests/unit_tests/blas/include/reference_blas_templates.hpp index f493e3f25..c543f94b7 100644 --- a/tests/unit_tests/blas/include/reference_blas_templates.hpp +++ b/tests/unit_tests/blas/include/reference_blas_templates.hpp @@ -224,11 +224,10 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fp *alpha, const fp *a, const int *lda, const fp *b, const int *ldb, const fp *beta, fp *c, const int *ldc); -#ifdef ENABLE_HALF_ROUTINES template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, - const int *n, const int *k, const half *alpha, const half *a, const int *lda, - const half *b, const int *ldb, const half *beta, half *c, const int *ldc) { + const int *n, const int *k, const cl::sycl::half *alpha, const cl::sycl::half *a, const int *lda, + const cl::sycl::half *b, const int *ldb, const cl::sycl::half *beta, cl::sycl::half *c, const int *ldc) { // Not supported in NETLIB. SGEMM is used as reference. int sizea, sizeb, sizec; const float alphaf = *alpha; @@ -255,7 +254,6 @@ void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, c oneapi::mkl::aligned_free(bf); oneapi::mkl::aligned_free(cf); } -#endif template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const float *alpha, const float *a, const int *lda, @@ -291,11 +289,10 @@ template static void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, const int *n, const int *k, const fpc *alpha, const fpa *a, const int *lda, const fpa *b, const int *ldb, const fpc *beta, fpc *c, const int *ldc); -#ifdef ENABLE_HALF_ROUTINES template <> void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, const int *m, - const int *n, const int *k, const float *alpha, const half *a, const int *lda, - const half *b, const int *ldb, const float *beta, float *c, const int *ldc) { + const int *n, const int *k, const float *alpha, const cl::sycl::half *a, const int *lda, + const cl::sycl::half *b, const int *ldb, const float *beta, float *c, const int *ldc) { // Not supported in NETLIB. SGEMM is used as reference. int sizea, sizeb; if (layout == CblasColMajor) { @@ -314,7 +311,6 @@ void gemm(CBLAS_LAYOUT layout, CBLAS_TRANSPOSE transa, CBLAS_TRANSPOSE transb, c oneapi::mkl::aligned_free(af); oneapi::mkl::aligned_free(bf); } -#endif template static void symm(CBLAS_LAYOUT layout, CBLAS_SIDE left_right, CBLAS_UPLO uplo, const int *m, const int *n, const fp *alpha, const fp *a, const int *lda, const fp *b, diff --git a/tests/unit_tests/blas/include/test_common.hpp b/tests/unit_tests/blas/include/test_common.hpp index a6743d542..3125e3834 100644 --- a/tests/unit_tests/blas/include/test_common.hpp +++ b/tests/unit_tests/blas/include/test_common.hpp @@ -30,14 +30,14 @@ #include "oneapi/mkl/detail/config.hpp" namespace std { -#ifdef ENABLE_HALF_ROUTINES +//#ifdef ENABLE_HALF_ROUTINES static cl::sycl::half abs(cl::sycl::half v) { if (v < cl::sycl::half(0)) return -v; else return v; } -#endif +//#endif } // namespace std // Complex helpers. @@ -143,12 +143,12 @@ template <> uint8_t rand_scalar() { return std::rand() % 128; } -#ifdef ENABLE_HALF_ROUTINES +//#ifdef ENABLE_HALF_ROUTINES template <> -half rand_scalar() { - return half(std::rand() % 32000) / half(32000) - half(0.5); +cl::sycl::half rand_scalar() { + return cl::sycl::half(std::rand() % 32000) / cl::sycl::half(32000) - cl::sycl::half(0.5); } -#endif +//#endif template static fp rand_scalar(int mag) { fp tmp = fp(mag) + fp(std::rand()) / fp(RAND_MAX) - fp(0.5); diff --git a/tests/unit_tests/blas/level3/gemm.cpp b/tests/unit_tests/blas/level3/gemm.cpp index 97fd90755..54efd9201 100644 --- a/tests/unit_tests/blas/level3/gemm.cpp +++ b/tests/unit_tests/blas/level3/gemm.cpp @@ -144,41 +144,39 @@ int test(device* dev, oneapi::mkl::layout layout, oneapi::mkl::transpose transa, class GemmTests : public ::testing::TestWithParam> {}; -#ifdef ENABLE_HALF_ROUTINES TEST_P(GemmTests, HalfHalfFloatPrecision) { float alpha(2.0); float beta(3.0); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::nontrans, oneapi::mkl::transpose::nontrans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::nontrans, oneapi::mkl::transpose::trans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::trans, oneapi::mkl::transpose::nontrans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::trans, oneapi::mkl::transpose::trans, 79, 83, 91, 103, 105, 106, alpha, beta))); } TEST_P(GemmTests, RealHalfPrecision) { - half alpha(2.0); - half beta(3.0); - EXPECT_TRUEORSKIP((test( + cl::sycl::half alpha(2.0); + cl::sycl::half beta(3.0); + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::nontrans, oneapi::mkl::transpose::nontrans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::nontrans, oneapi::mkl::transpose::trans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::trans, oneapi::mkl::transpose::nontrans, 79, 83, 91, 103, 105, 106, alpha, beta))); - EXPECT_TRUEORSKIP((test( + EXPECT_TRUEORSKIP((test( std::get<0>(GetParam()), std::get<1>(GetParam()), oneapi::mkl::transpose::trans, oneapi::mkl::transpose::trans, 79, 83, 91, 103, 105, 106, alpha, beta))); } -#endif TEST_P(GemmTests, RealSinglePrecision) { float alpha(2.0); float beta(3.0);