From ffd0a998c71466c5122b2c488cd725dc4ec6f1a4 Mon Sep 17 00:00:00 2001 From: nscipione Date: Fri, 29 Nov 2024 14:40:35 +0000 Subject: [PATCH] Formatting --- ggml/src/ggml-sycl/dpct/helper.hpp | 28 ++++++++++++---------------- ggml/src/ggml-sycl/ggml-sycl.cpp | 14 ++++++-------- ggml/src/ggml-sycl/outprod.cpp | 11 +++-------- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/ggml/src/ggml-sycl/dpct/helper.hpp b/ggml/src/ggml-sycl/dpct/helper.hpp index b92411cc3..cc9304e1a 100644 --- a/ggml/src/ggml-sycl/dpct/helper.hpp +++ b/ggml/src/ggml-sycl/dpct/helper.hpp @@ -1691,12 +1691,11 @@ namespace dpct auto data_c = get_memory(c); oneapi::mkl::blas::column_major::gemm( #ifdef GGML_SYCL_NVIDIA - oneapi::mkl::backend_selector{q}, + oneapi::mkl::backend_selector{ q }, #else - q, + q, #endif - a_trans, b_trans, m, n, k, alpha_value, data_a, lda, - data_b, ldb, beta_value, data_c, ldc); + a_trans, b_trans, m, n, k, alpha_value, data_a, lda, data_b, ldb, beta_value, data_c, ldc); } template @@ -1761,16 +1760,14 @@ namespace dpct sycl::event e = oneapi::mkl::blas::column_major::gemm_batch( #ifdef GGML_SYCL_NVIDIA - oneapi::mkl::backend_selector{q}, + oneapi::mkl::backend_selector{ q }, #else - q, + q, #endif - matrix_info->transpose_info, matrix_info->transpose_info + 1, - matrix_info->size_info, matrix_info->size_info + 1, - matrix_info->size_info + 2, matrix_info->value_info, - reinterpret_cast(a), matrix_info->ld_info, - reinterpret_cast(b), matrix_info->ld_info + 1, - matrix_info->value_info + 1, reinterpret_cast(c), + matrix_info->transpose_info, matrix_info->transpose_info + 1, matrix_info->size_info, + matrix_info->size_info + 1, matrix_info->size_info + 2, matrix_info->value_info, + reinterpret_cast(a), matrix_info->ld_info, reinterpret_cast(b), + matrix_info->ld_info + 1, matrix_info->value_info + 1, reinterpret_cast(c), matrix_info->ld_info + 2, 1, &(matrix_info->groupsize_info)); q.submit([&](sycl::handler &cgh) @@ -1795,12 +1792,11 @@ namespace dpct auto data_c = get_memory(c); oneapi::mkl::blas::column_major::gemm_batch( #ifdef GGML_SYCL_NVIDIA - oneapi::mkl::backend_selector{q}, + oneapi::mkl::backend_selector{ q }, #else - q, + q, #endif - a_trans, b_trans, m, n, k, alpha_value, data_a, lda, - stride_a, data_b, ldb, stride_b, beta_value, + a_trans, b_trans, m, n, k, alpha_value, data_a, lda, stride_a, data_b, ldb, stride_b, beta_value, data_c, ldc, stride_c, batch_size); } diff --git a/ggml/src/ggml-sycl/ggml-sycl.cpp b/ggml/src/ggml-sycl/ggml-sycl.cpp index 0f97bc7ef..b5ae9781c 100644 --- a/ggml/src/ggml-sycl/ggml-sycl.cpp +++ b/ggml/src/ggml-sycl/ggml-sycl.cpp @@ -2562,15 +2562,13 @@ inline void ggml_sycl_op_mul_mat_sycl( const float beta = 0.0f; #if !GGML_SYCL_DNNL SYCL_CHECK(CHECK_TRY_ERROR(oneapi::mkl::blas::column_major::gemm( -#ifdef GGML_SYCL_NVIDIA - oneapi::mkl::backend_selector{*stream}, -#else +# ifdef GGML_SYCL_NVIDIA + oneapi::mkl::backend_selector{ *stream }, +# else *stream, -#endif - oneapi::mkl::transpose::trans, - oneapi::mkl::transpose::nontrans, row_diff, src1_ncols, ne10, - dpct::get_value(&alpha, *stream), src0_ddf_i, ne00, - src1_ddf1_i, ne10, dpct::get_value(&beta, *stream), +# endif + oneapi::mkl::transpose::trans, oneapi::mkl::transpose::nontrans, row_diff, src1_ncols, ne10, + dpct::get_value(&alpha, *stream), src0_ddf_i, ne00, src1_ddf1_i, ne10, dpct::get_value(&beta, *stream), dst_dd_i, ldc))); #else auto dnnl_stream = ctx.stream_dnnl(stream); diff --git a/ggml/src/ggml-sycl/outprod.cpp b/ggml/src/ggml-sycl/outprod.cpp index 7a2bfd445..5b3c38315 100644 --- a/ggml/src/ggml-sycl/outprod.cpp +++ b/ggml/src/ggml-sycl/outprod.cpp @@ -42,17 +42,12 @@ void ggml_sycl_op_out_prod(ggml_backend_sycl_context& ctx, const ggml_tensor* sr // Perform matrix multiplication using oneMKL GEMM oneapi::mkl::blas::column_major::gemm( #ifdef GGML_SYCL_NVIDIA - oneapi::mkl::backend_selector{*stream}, + oneapi::mkl::backend_selector{ *stream }, #else *stream, #endif - oneapi::mkl::transpose::nontrans, src1_op, - ne0, ne1, ne01, - alpha, - src0_d, ne00, - src1_d, ldb, - beta, - dst_d, ne0); + oneapi::mkl::transpose::nontrans, src1_op, ne0, ne1, ne01, alpha, src0_d, ne00, src1_d, ldb, beta, dst_d, + ne0); } catch (sycl::exception const& exc) { std::cerr << exc.what() << std::endl;