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

avoid creating the proxy in openmp path

Browse Source
This commit is contained in:
conrad
2021-09-28 16:46:45 +10:00
parent 8b21698904
commit 01f084cbb1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/op_trimat_meat.hpp
+2 -2
View File
@@ -68,7 +68,7 @@ op_trimat::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_trimat>& in)
const bool upper = (in.aux_uword_a == 0);
// allow detection of in-place operation
if(is_Mat<T1>::value)
if(is_Mat<T1>::value || (arma_config::openmp && Proxy<T1>::use_mp))
{
const unwrap<T1> U(in.m);
@@ -80,7 +80,7 @@ op_trimat::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_trimat>& in)
const bool is_alias = P.is_alias(out);
if(is_Mat<typename Proxy<T1>::stored_type>::value || (arma_config::openmp && Proxy<T1>::use_mp))
if(is_Mat<typename Proxy<T1>::stored_type>::value)
{
const quasi_unwrap<typename Proxy<T1>::stored_type> U(P.Q);