phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

split out handling of spop_square into separate function

Browse Source
This commit is contained in:
conrad
2025-06-28 19:16:24 +10:00
parent bd26d90563
commit ada1e18e45
1 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_accu.hpp
+49 -39
View File
@@ -1387,45 +1387,6 @@ accu(const SpOp<T1, spop_type>& expr)
if(is_vectorise) { return accu(expr.m); }
if(is_same_type<spop_type, spop_square>::yes)
{
if(is_SpSubview_col<T1>::value)
{
const SpSubview_col<eT>& svcol = reinterpret_cast<const SpSubview_col<eT>&>(expr.m);
if(svcol.n_rows == svcol.m.n_rows)
{
const SpMat<eT>& m = svcol.m;
const uword col = svcol.aux_col1;
const eT* ptr = &(m.values[ m.col_ptrs[col] ]);
return op_dot::direct_dot(svcol.n_nonzero, ptr, ptr);
}
}
const SpProxy<T1> P(expr.m);
const uword N = P.get_n_nonzero();
if(N == 0) { return eT(0); }
if(SpProxy<T1>::use_iterator == false)
{
return op_dot::direct_dot(N, P.get_values(), P.get_values());
}
else
{
typename SpProxy<T1>::const_iterator_type it = P.begin();
eT val = eT(0);
for(uword i=0; i < N; ++i) { const eT tmp = (*it); val += (tmp*tmp); ++it; }
return val;
}
}
const SpMat<eT> tmp = expr;
return accu(tmp);
@@ -1433,6 +1394,55 @@ accu(const SpOp<T1, spop_type>& expr)
template<typename T1>
arma_warn_unused
inline
typename T1::elem_type
accu(const SpOp<T1, spop_square>& expr)
{
arma_debug_sigprint();
typedef typename T1::elem_type eT;
if(is_SpSubview_col<T1>::value)
{
const SpSubview_col<eT>& svcol = reinterpret_cast<const SpSubview_col<eT>&>(expr.m);
if(svcol.n_rows == svcol.m.n_rows)
{
const SpMat<eT>& m = svcol.m;
const uword col = svcol.aux_col1;
const eT* ptr = &(m.values[ m.col_ptrs[col] ]);
return op_dot::direct_dot(svcol.n_nonzero, ptr, ptr);
}
}
const SpProxy<T1> P(expr.m);
const uword N = P.get_n_nonzero();
if(N == 0) { return eT(0); }
if(SpProxy<T1>::use_iterator == false)
{
return op_dot::direct_dot(N, P.get_values(), P.get_values());
}
else
{
typename SpProxy<T1>::const_iterator_type it = P.begin();
eT val = eT(0);
for(uword i=0; i < N; ++i) { const eT tmp = (*it); val += (tmp*tmp); ++it; }
return val;
}
}
template<typename T1, typename spop_type>
arma_warn_unused
inline