Added const qualifier to USM API #443

muhammad-tanvir-1211 · 2023-06-22T13:12:59Z

This PR adds the const qualifier to input containers for the USM api as required by the oneMKL specification.

include/blas_meta.h

src/interface/blas3/gemm_launcher.cpp.in

src/interface/blas1/asum.cpp.in

src/interface/blas1/axpy.cpp.in

src/interface/blas2/gemv.cpp.in

include/operations/blas2_trees.h

mehdi-goli · 2023-08-03T13:34:47Z

src/interface/blas2_interface.hpp

@@ -79,8 +79,10 @@ typename sb_handle_t::event_t _gemv_impl(
  const auto x_vector_size = is_transposed ? _M : _N;
  const auto y_vector_size = is_transposed ? _N : _M;

-  auto mA = make_matrix_view<col_major>(_mA, _M, _N, _lda);
-  auto vx = make_vector_view(_vx, _incx, x_vector_size);
+  typename MatrixViewType<container_t0, index_t, col_major>::type mA =


Seems all the changes in this file is unnecessary

The changes to MatrixViewType<..> and VectorViewType<..> are necessary because we cannot replace them with const auto. The problem is that, in the case of buffer, VectorView/MatrixView cannot be const because of the access_displacement.

mehdi-goli · 2023-08-03T13:35:33Z

src/interface/blas1_interface.hpp

@@ -188,7 +191,9 @@ template <typename sb_handle_t, typename container_0_t, typename container_1_t,
 typename sb_handle_t::event_t _asum(
    sb_handle_t &sb_handle, index_t _N, container_0_t _vx, increment_t _incx,
    container_1_t _rs, const typename sb_handle_t::event_t &_dependencies) {
-  auto vx = make_vector_view(_vx, _incx, _N);
+  using element_t = typename ValueType<container_0_t>::type;


Seems unnecessary

mehdi-goli · 2023-08-03T13:35:53Z

src/interface/blas1_interface.hpp

@@ -86,7 +87,9 @@ typename sb_handle_t::event_t _copy(
    sb_handle_t &sb_handle, index_t _N, container_0_t _vx, increment_t _incx,
    container_1_t _vy, increment_t _incy,
    const typename sb_handle_t::event_t &_dependencies) {
-  auto vx = make_vector_view(_vx, _incx, _N);
+  using element_t = typename ValueType<container_0_t>::type;


Seems unnecessary

mehdi-goli · 2023-08-03T13:39:44Z

include/operations/blas3_trees.h

@@ -306,18 +306,19 @@ make_gemm(input_t buffer_a, input_t buffer_b, output_t buffer_c,
 * @Note This kernel assumes the column-major matrices
 * @Note This kernel uses fixed size blocks of 16, but this can be changed
 */
-template <bool UnitDiag, bool Upper, int BlockSize, typename matrix_t>
+template <bool UnitDiag, bool Upper, int BlockSize, typename lhs_t,


this is the name changing. I don't think this changes related to const qualifier

This name change was required to differentiate between the input and output container types. The input in this case can be const and the output cannot be const, thus we needed separate template parameters to represent the two different types.

mehdi-goli

I have added minor comment overall looks OK. Thanks for the clean up

* Fix negative increment * Fix build with computecpp * Update dpcpp * Revert dpcpp version * Fix sync call * Add a pointer to the first element of the vector * Fixes issue with dependencies in nrm2 (#451) * Fix nrm2 * Remove cout * Fixes issue with dependencies in TBMV (#454) This PR fixes an issue with dependencies in TBMV (similar to the fix in #451)

include/interface/blas2_interface.h

muhammad-tanvir-1211 · 2023-08-11T16:08:39Z

include/operations/blas3_trees.h

@@ -306,18 +306,19 @@ make_gemm(input_t buffer_a, input_t buffer_b, output_t buffer_c,
 * @Note This kernel assumes the column-major matrices
 * @Note This kernel uses fixed size blocks of 16, but this can be changed
 */
-template <bool UnitDiag, bool Upper, int BlockSize, typename matrix_t>
+template <bool UnitDiag, bool Upper, int BlockSize, typename lhs_t,


This name change was required to differentiate between the input and output container types. The input in this case can be const and the output cannot be const, thus we needed separate template parameters to represent the two different types.

cmake/CmakeFunctionHelper.cmake

* Renamed py_gen_blas_unary.py file to py_gen_blas_ops.py

OuadiElfarouki

Looks good to me. Tested it on some devices, getting compile errors with Nvidia SM>=80 though.
/src/operations/blas3/gemm_local_joint_matrix.hpp:295:18: error: no matching conversion for functional-style cast from 'container_t' (aka 'const float *') to 'multi_ptr_' (aka 'multi_ptr<float, address_t::global_space>')
All the rest seems fine, error doesn't occur when disabling joint-matrix GEMM.

This PR adds the const qualifier to input containers for the USM api as required by the oneMKL specification. --------- Co-authored-by: Muhammad Tanvir <[email protected]> Co-authored-by: Alejandro Acosta <[email protected]>

muhammad-tanvir-1211 added the stacked PR is stacked on top of another label Jun 22, 2023

muhammad-tanvir-1211 marked this pull request as draft June 22, 2023 13:13

aacostadiaz marked this pull request as ready for review July 20, 2023 08:53

aacostadiaz requested review from mehdi-goli, pgorlani, s-Nick and OuadiElfarouki July 20, 2023 08:53

muhammad-tanvir-1211 commented Jul 26, 2023

View reviewed changes

mehdi-goli reviewed Aug 3, 2023

View reviewed changes

mehdi-goli approved these changes Aug 3, 2023

View reviewed changes

aacostadiaz force-pushed the usm_experimental branch 3 times, most recently from 07f1e84 to 37be9e4 Compare August 11, 2023 08:36

aacostadiaz and others added 2 commits August 11, 2023 13:42

Added const qualifier to USM API

a7cf3d5

aacostadiaz force-pushed the fix_const_usm branch 2 times, most recently from 0e82703 to 7d7cccd Compare August 11, 2023 16:02

muhammad-tanvir-1211 commented Aug 11, 2023

View reviewed changes

Added const qualifier to USM API

5d6d6b8

aacostadiaz force-pushed the fix_const_usm branch from 7d7cccd to 5d6d6b8 Compare August 11, 2023 16:41

muhammad-tanvir-1211 and others added 4 commits August 14, 2023 14:42

Fixed dependencies for extension operators

533c63c

Removed "unary" from "generate_blas_unary_objects" to avoid confusion

44676e5

* Renamed py_gen_blas_unary.py file to py_gen_blas_ops.py

Extended benchmarks (tpsv and extension) to support USM

2fd6ff0

Remove redundant comment

63918fd

OuadiElfarouki approved these changes Aug 17, 2023

View reviewed changes

Fix joint matrix

4fd5ac8

aacostadiaz merged commit 8babe16 into usm_experimental Aug 21, 2023
5 checks passed

muhammad-tanvir-1211 deleted the fix_const_usm branch October 23, 2023 12:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added const qualifier to USM API #443

Added const qualifier to USM API #443

muhammad-tanvir-1211 commented Jun 22, 2023

mehdi-goli Aug 3, 2023

aacostadiaz Aug 7, 2023

mehdi-goli Aug 3, 2023

mehdi-goli Aug 3, 2023

mehdi-goli Aug 3, 2023 •

edited

Loading

muhammad-tanvir-1211 Aug 11, 2023

mehdi-goli left a comment

muhammad-tanvir-1211 Aug 11, 2023

OuadiElfarouki left a comment

Added const qualifier to USM API #443

Added const qualifier to USM API #443

Conversation

muhammad-tanvir-1211 commented Jun 22, 2023

mehdi-goli Aug 3, 2023

Choose a reason for hiding this comment

aacostadiaz Aug 7, 2023

Choose a reason for hiding this comment

mehdi-goli Aug 3, 2023

Choose a reason for hiding this comment

mehdi-goli Aug 3, 2023

Choose a reason for hiding this comment

mehdi-goli Aug 3, 2023 • edited Loading

Choose a reason for hiding this comment

muhammad-tanvir-1211 Aug 11, 2023

Choose a reason for hiding this comment

mehdi-goli left a comment

Choose a reason for hiding this comment

muhammad-tanvir-1211 Aug 11, 2023

Choose a reason for hiding this comment

OuadiElfarouki left a comment

Choose a reason for hiding this comment

mehdi-goli Aug 3, 2023 •

edited

Loading