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

speed up compilation for default settings

Browse Source
This commit is contained in:
conrad
2022-02-09 00:10:38 +10:00
parent 0fdf5273ae
commit 250cad9a8d
3 changed files with 112 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_solve.hpp
+44 -2
View File
@@ -25,6 +25,48 @@
// solve_gen
template<typename T1, typename T2>
arma_warn_unused
inline
typename enable_if2< is_supported_blas_type<typename T1::elem_type>::value, const Glue<T1, T2, glue_solve_gen_default> >::result
solve
(
const Base<typename T1::elem_type,T1>& A,
const Base<typename T1::elem_type,T2>& B
)
{
arma_extra_debug_sigprint();
return Glue<T1, T2, glue_solve_gen_default>(A.get_ref(), B.get_ref());
}
template<typename T1, typename T2>
inline
typename enable_if2< is_supported_blas_type<typename T1::elem_type>::value, bool >::result
solve
(
Mat<typename T1::elem_type>& out,
const Base<typename T1::elem_type,T1>& A,
const Base<typename T1::elem_type,T2>& B
)
{
arma_extra_debug_sigprint();
const bool status = glue_solve_gen_default::apply(out, A.get_ref(), B.get_ref());
if(status == false)
{
out.soft_reset();
arma_debug_warn_level(3, "solve(): solution not found");
}
return status;
}
template<typename T1, typename T2>
arma_warn_unused
inline
@@ -33,7 +75,7 @@ solve
(
const Base<typename T1::elem_type,T1>& A,
const Base<typename T1::elem_type,T2>& B,
const solve_opts::opts& opts = solve_opts::none
const solve_opts::opts& opts
)
{
arma_extra_debug_sigprint();
@@ -51,7 +93,7 @@ solve
Mat<typename T1::elem_type>& out,
const Base<typename T1::elem_type,T1>& A,
const Base<typename T1::elem_type,T2>& B,
const solve_opts::opts& opts = solve_opts::none
const solve_opts::opts& opts
)
{
arma_extra_debug_sigprint();
include/armadillo_bits/glue_solve_bones.hpp
+20 -1
View File
@@ -22,6 +22,25 @@
class glue_solve_gen_default
{
public:
template<typename T1, typename T2>
struct traits
{
static constexpr bool is_row = false;
static constexpr bool is_col = T2::is_col;
static constexpr bool is_xvec = false;
};
template<typename T1, typename T2> inline static void apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_solve_gen_default>& X);
template<typename eT, typename T1, typename T2> inline static bool apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>& B_expr);
};
class glue_solve_gen
{
public:
@@ -36,7 +55,7 @@ class glue_solve_gen
template<typename T1, typename T2> inline static void apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_solve_gen>& X);
template<typename eT, typename T1, typename T2> inline static bool apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>& B_expr, const uword flags);
template<typename eT, typename T1, typename T2, const bool has_user_flags = true> inline static bool apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>& B_expr, const uword flags);
};
include/armadillo_bits/glue_solve_meat.hpp
+48 -11
View File
@@ -21,6 +21,40 @@
//
// glue_solve_gen_default
template<typename T1, typename T2>
inline
void
glue_solve_gen_default::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_solve_gen_default>& X)
{
arma_extra_debug_sigprint();
const bool status = glue_solve_gen_default::apply(out, X.A, X.B);
if(status == false)
{
out.soft_reset();
arma_stop_runtime_error("solve(): solution not found");
}
}
template<typename eT, typename T1, typename T2>
inline
bool
glue_solve_gen_default::apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>& B_expr)
{
arma_extra_debug_sigprint();
return glue_solve_gen::apply<eT,T1,T2,false>( out, A_expr, B_expr, uword(0));
}
//
// glue_solve_gen
@@ -43,7 +77,7 @@ glue_solve_gen::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_so
template<typename eT, typename T1, typename T2>
template<typename eT, typename T1, typename T2, const bool has_user_flags>
inline
bool
glue_solve_gen::apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>& B_expr, const uword flags)
@@ -52,16 +86,19 @@ glue_solve_gen::apply(Mat<eT>& out, const Base<eT,T1>& A_expr, const Base<eT,T2>
typedef typename get_pod_type<eT>::result T;
const bool fast = bool(flags & solve_opts::flag_fast );
const bool equilibrate = bool(flags & solve_opts::flag_equilibrate );
const bool no_approx = bool(flags & solve_opts::flag_no_approx );
const bool no_band = bool(flags & solve_opts::flag_no_band );
const bool no_sympd = bool(flags & solve_opts::flag_no_sympd );
const bool allow_ugly = bool(flags & solve_opts::flag_allow_ugly );
const bool likely_sympd = bool(flags & solve_opts::flag_likely_sympd);
const bool refine = bool(flags & solve_opts::flag_refine );
const bool no_trimat = bool(flags & solve_opts::flag_no_trimat );
const bool force_approx = bool(flags & solve_opts::flag_force_approx);
if(has_user_flags == true ) { arma_extra_debug_print("glue_solve_gen::apply(): has_user_flags == true"); }
if(has_user_flags == false) { arma_extra_debug_print("glue_solve_gen::apply(): has_user_flags == false"); }
const bool fast = has_user_flags && bool(flags & solve_opts::flag_fast );
const bool equilibrate = has_user_flags && bool(flags & solve_opts::flag_equilibrate );
const bool no_approx = has_user_flags && bool(flags & solve_opts::flag_no_approx );
const bool no_band = has_user_flags && bool(flags & solve_opts::flag_no_band );
const bool no_sympd = has_user_flags && bool(flags & solve_opts::flag_no_sympd );
const bool allow_ugly = has_user_flags && bool(flags & solve_opts::flag_allow_ugly );
const bool likely_sympd = has_user_flags && bool(flags & solve_opts::flag_likely_sympd);
const bool refine = has_user_flags && bool(flags & solve_opts::flag_refine );
const bool no_trimat = has_user_flags && bool(flags & solve_opts::flag_no_trimat );
const bool force_approx = has_user_flags && bool(flags & solve_opts::flag_force_approx);
arma_extra_debug_print("glue_solve_gen::apply(): enabled flags:");