From cce74c0e4995fdd70332017e170fc96e4e4482c3 Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 18 Jul 2025 14:20:01 +1000 Subject: [PATCH] use direct_dot() instead of direct_dot_generic() since the former can now detect integer types --- include/armadillo_bits/mul_gemm.hpp | 6 +++--- include/armadillo_bits/mul_gemv.hpp | 4 ++-- include/armadillo_bits/mul_syrk.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/armadillo_bits/mul_gemm.hpp b/include/armadillo_bits/mul_gemm.hpp index 025ac8a3..35431ebf 100644 --- a/include/armadillo_bits/mul_gemm.hpp +++ b/include/armadillo_bits/mul_gemm.hpp @@ -102,7 +102,7 @@ class gemm_emul_large for(uword col_B=0; col_B < B_n_cols; ++col_B) { - const eT acc = op_dot::direct_dot_generic(B_n_rows, A_rowdata, B.colptr(col_B)); + const eT acc = op_dot::direct_dot(B_n_rows, A_rowdata, B.colptr(col_B)); if( (use_alpha == false) && (use_beta == false) ) { C.at(row_A,col_B) = acc; } else if( (use_alpha == true ) && (use_beta == false) ) { C.at(row_A,col_B) = alpha*acc; } @@ -122,7 +122,7 @@ class gemm_emul_large for(uword col_B=0; col_B < B_n_cols; ++col_B) { - const eT acc = op_dot::direct_dot_generic(B_n_rows, A_coldata, B.colptr(col_B)); + const eT acc = op_dot::direct_dot(B_n_rows, A_coldata, B.colptr(col_B)); if( (use_alpha == false) && (use_beta == false) ) { C.at(col_A,col_B) = acc; } else if( (use_alpha == true ) && (use_beta == false) ) { C.at(col_A,col_B) = alpha*acc; } @@ -158,7 +158,7 @@ class gemm_emul_large for(uword col_A=0; col_A < A_n_cols; ++col_A) { - const eT acc = op_dot::direct_dot_generic(A_n_rows, B_rowdata, A.colptr(col_A)); + const eT acc = op_dot::direct_dot(A_n_rows, B_rowdata, A.colptr(col_A)); if( (use_alpha == false) && (use_beta == false) ) { C.at(col_A,row_B) = acc; } else if( (use_alpha == true ) && (use_beta == false) ) { C.at(col_A,row_B) = alpha*acc; } diff --git a/include/armadillo_bits/mul_gemv.hpp b/include/armadillo_bits/mul_gemv.hpp index 4a3ea31e..b6bd3d60 100644 --- a/include/armadillo_bits/mul_gemv.hpp +++ b/include/armadillo_bits/mul_gemv.hpp @@ -233,7 +233,7 @@ class gemv_emul { if(A_n_rows == 1) { - const eT acc = op_dot::direct_dot_generic(A_n_cols, A.memptr(), x); + const eT acc = op_dot::direct_dot(A_n_cols, A.memptr(), x); if( (use_alpha == false) && (use_beta == false) ) { y[0] = acc; } else if( (use_alpha == true ) && (use_beta == false) ) { y[0] = alpha*acc; } @@ -269,7 +269,7 @@ class gemv_emul // acc += A_coldata[row] * x[row]; // } - const eT acc = op_dot::direct_dot_generic(A_n_rows, A.colptr(col), x); + const eT acc = op_dot::direct_dot(A_n_rows, A.colptr(col), x); if( (use_alpha == false) && (use_beta == false) ) { y[col] = acc; } else if( (use_alpha == true ) && (use_beta == false) ) { y[col] = alpha*acc; } diff --git a/include/armadillo_bits/mul_syrk.hpp b/include/armadillo_bits/mul_syrk.hpp index 0792306e..dc22183b 100644 --- a/include/armadillo_bits/mul_syrk.hpp +++ b/include/armadillo_bits/mul_syrk.hpp @@ -233,7 +233,7 @@ class syrk_emul for(uword k=col_A; k < A_n_cols; ++k) { - const eT acc = op_dot::direct_dot_generic(A_n_rows, A_coldata, A.colptr(k)); + const eT acc = op_dot::direct_dot(A_n_rows, A_coldata, A.colptr(k)); if( (use_alpha == false) && (use_beta == false) ) {