stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bytecode MEX: remove unused function parameters

mr#2067
Sébastien Villemot 2022-07-05 12:12:08 +02:00
parent b05ef5dd7f
commit 8be6f55bf6
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mex/sources/bytecode/Interpreter.cc
View File

@ -457,7 +457,7 @@ Interpreter::simulate_a_block(const vector_table_conditional_local_type &vector_
copy_n(y_save, y_size*(periods+y_kmax+y_kmin), y); copy_n(y_save, y_size*(periods+y_kmax+y_kmin), y);
u_count = u_count_saved; u_count = u_count_saved;
int prev_iter = iter; int prev_iter = iter;
Simulate_Newton_Two_Boundaries(block_num, symbol_table_endo_nbr, y_kmin, y_kmax, size, periods, cvg, minimal_solving_periods, stack_solve_algo, endo_name_length, P_endo_names, vector_table_conditional_local); Simulate_Newton_Two_Boundaries(block_num, symbol_table_endo_nbr, y_kmin, y_kmax, size, periods, cvg, minimal_solving_periods, stack_solve_algo, P_endo_names, vector_table_conditional_local);
iter++; iter++;
if (iter > prev_iter) if (iter > prev_iter)
{ {
@ -482,7 +482,7 @@ Interpreter::simulate_a_block(const vector_table_conditional_local_type &vector_
end_code = it_code; end_code = it_code;
cvg = false; cvg = false;
Simulate_Newton_Two_Boundaries(block_num, symbol_table_endo_nbr, y_kmin, y_kmax, size, periods, cvg, minimal_solving_periods, stack_solve_algo, endo_name_length, P_endo_names, vector_table_conditional_local); Simulate_Newton_Two_Boundaries(block_num, symbol_table_endo_nbr, y_kmin, y_kmax, size, periods, cvg, minimal_solving_periods, stack_solve_algo, P_endo_names, vector_table_conditional_local);
max_res = 0; max_res_idx = 0; max_res = 0; max_res_idx = 0;
} }
slowc = 1; // slowc is modified when stack_solve_algo=4, so restore it slowc = 1; // slowc is modified when stack_solve_algo=4, so restore it

39
mex/sources/bytecode/SparseMatrix.cc
View File

@ -1175,7 +1175,7 @@ dynSparseMatrix::Print_u() const
} }
void void
dynSparseMatrix::End_GE(int Size) dynSparseMatrix::End_GE()
{ {
mem_mngr.Free_All(); mem_mngr.Free_All();
mxFree(FNZE_R); mxFree(FNZE_R);
@ -1978,7 +1978,7 @@ dynSparseMatrix::golden(double ax, double bx, double cx, double tol, double solv
} }
void void
dynSparseMatrix::Solve_Matlab_Relaxation(mxArray *A_m, mxArray *b_m, unsigned int Size, double slowc_l, int it_) dynSparseMatrix::Solve_Matlab_Relaxation(mxArray *A_m, mxArray *b_m, unsigned int Size, double slowc_l)
{ {
double *b_m_d = mxGetPr(b_m); double *b_m_d = mxGetPr(b_m);
if (!b_m_d) if (!b_m_d)
@ -3014,7 +3014,7 @@ dynSparseMatrix::Solve_ByteCode_Sparse_GaussianElimination(int Size, int blck, i
slowc_save = slowc; slowc_save = slowc;
simple_bksub(it_, Size, slowc_lbx); simple_bksub(it_, Size, slowc_lbx);
End_GE(Size); End_GE();
mxFree(piv_v); mxFree(piv_v);
mxFree(pivj_v); mxFree(pivj_v);
mxFree(pivk_v); mxFree(pivk_v);
@ -3594,11 +3594,11 @@ dynSparseMatrix::Solve_ByteCode_Symbolic_Sparse_GaussianElimination(int Size, bo
ya[i] = y[i]; ya[i] = y[i];
slowc_save = slowc; slowc_save = slowc;
bksub(tbreak, last_period, Size, slowc_lbx); bksub(tbreak, last_period, Size, slowc_lbx);
End_GE(Size); End_GE();
} }
void void
dynSparseMatrix::Check_and_Correct_Previous_Iteration(int block_num, int y_size, int size, double crit_opt_old) dynSparseMatrix::Check_and_Correct_Previous_Iteration(int y_size, int size)
{ {
if (isnan(res1) || isinf(res1) || (res2 > g0 && iter > 0)) if (isnan(res1) || isinf(res1) || (res2 > g0 && iter > 0))
{ {
@ -3643,7 +3643,7 @@ dynSparseMatrix::Check_and_Correct_Previous_Iteration(int block_num, int y_size,
} }
bool bool
dynSparseMatrix::Simulate_One_Boundary(int block_num, int y_size, int y_kmin, int y_kmax, int size, bool cvg) dynSparseMatrix::Simulate_One_Boundary(int block_num, int y_size, int size)
{ {
mxArray *b_m = nullptr, *A_m = nullptr, *x0_m = nullptr; mxArray *b_m = nullptr, *A_m = nullptr, *x0_m = nullptr;
SuiteSparse_long *Ap = nullptr, *Ai = nullptr; SuiteSparse_long *Ap = nullptr, *Ai = nullptr;
@ -3785,17 +3785,16 @@ dynSparseMatrix::Simulate_One_Boundary(int block_num, int y_size, int y_kmin, in
} }
bool bool
dynSparseMatrix::solve_linear(int block_num, int y_size, int y_kmin, int y_kmax, int size, int iter) dynSparseMatrix::solve_linear(int block_num, int y_size, int size, int iter)
{ {
bool cvg = false; bool cvg = false;
double crit_opt_old = res2/2;
compute_complete(false, res1, res2, max_res, max_res_idx); compute_complete(false, res1, res2, max_res, max_res_idx);
cvg = (max_res < solve_tolf); cvg = (max_res < solve_tolf);
if (!cvg || isnan(res1) || isinf(res1)) if (!cvg || isnan(res1) || isinf(res1))
{ {
if (iter) if (iter)
Check_and_Correct_Previous_Iteration(block_num, y_size, size, crit_opt_old); Check_and_Correct_Previous_Iteration(y_size, size);
bool singular_system = Simulate_One_Boundary(block_num, y_size, y_kmin, y_kmax, size, cvg); bool singular_system = Simulate_One_Boundary(block_num, y_size, size);
if (singular_system) if (singular_system)
Singular_display(block_num, size); Singular_display(block_num, size);
} }
@ -3803,7 +3802,7 @@ dynSparseMatrix::solve_linear(int block_num, int y_size, int y_kmin, int y_kmax,
} }
void void
dynSparseMatrix::solve_non_linear(int block_num, int y_size, int y_kmin, int y_kmax, int size) dynSparseMatrix::solve_non_linear(int block_num, int y_size, int size)
{ {
max_res_idx = 0; max_res_idx = 0;
bool cvg = false; bool cvg = false;
@ -3811,7 +3810,7 @@ dynSparseMatrix::solve_non_linear(int block_num, int y_size, int y_kmin, int y_k
glambda2 = g0 = very_big; glambda2 = g0 = very_big;
while (!cvg && iter < maxit_) while (!cvg && iter < maxit_)
{ {
cvg = solve_linear(block_num, y_size, y_kmin, y_kmax, size, iter); cvg = solve_linear(block_num, y_size, size, iter);
g0 = res2; g0 = res2;
iter++; iter++;
} }
@ -3853,27 +3852,27 @@ dynSparseMatrix::Simulate_Newton_One_Boundary(bool forward)
{ {
it_ = 0; it_ = 0;
if (!is_linear) if (!is_linear)
solve_non_linear(block_num, y_size, 0, 0, size); solve_non_linear(block_num, y_size, size);
else else
solve_linear(block_num, y_size, 0, 0, size, 0); solve_linear(block_num, y_size, size, 0);
} }
else if (forward) else if (forward)
{ {
if (!is_linear) if (!is_linear)
for (it_ = y_kmin; it_ < periods+y_kmin; it_++) for (it_ = y_kmin; it_ < periods+y_kmin; it_++)
solve_non_linear(block_num, y_size, y_kmin, y_kmax, size); solve_non_linear(block_num, y_size, size);
else else
for (it_ = y_kmin; it_ < periods+y_kmin; it_++) for (it_ = y_kmin; it_ < periods+y_kmin; it_++)
solve_linear(block_num, y_size, y_kmin, y_kmax, size, 0); solve_linear(block_num, y_size, size, 0);
} }
else else
{ {
if (!is_linear) if (!is_linear)
for (it_ = periods+y_kmin-1; it_ >= y_kmin; it_--) for (it_ = periods+y_kmin-1; it_ >= y_kmin; it_--)
solve_non_linear(block_num, y_size, y_kmin, y_kmax, size); solve_non_linear(block_num, y_size, size);
else else
for (it_ = periods+y_kmin-1; it_ >= y_kmin; it_--) for (it_ = periods+y_kmin-1; it_ >= y_kmin; it_--)
solve_linear(block_num, y_size, y_kmin, y_kmax, size, 0); solve_linear(block_num, y_size, size, 0);
} }
if ((solve_algo == 6 && steady_state) if ((solve_algo == 6 && steady_state)
|| ((stack_solve_algo == 0 || stack_solve_algo == 1 || stack_solve_algo == 4 || stack_solve_algo == 6) && !steady_state)) || ((stack_solve_algo == 0 || stack_solve_algo == 1 || stack_solve_algo == 4 || stack_solve_algo == 6) && !steady_state))
@ -3918,7 +3917,7 @@ dynSparseMatrix::preconditioner_print_out(string s, int preconditioner, bool ss)
} }
void void
dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin, int y_kmax,int Size, int periods, bool cvg, int minimal_solving_periods, int stack_solve_algo, unsigned int endo_name_length, const vector<string> &P_endo_names, const vector_table_conditional_local_type &vector_table_conditional_local) dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin, int y_kmax,int Size, int periods, bool cvg, int minimal_solving_periods, int stack_solve_algo, const vector<string> &P_endo_names, const vector_table_conditional_local_type &vector_table_conditional_local)
{ {
double top = 0.5; double top = 0.5;
double bottom = 0.1; double bottom = 0.1;
@ -4119,7 +4118,7 @@ dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin
if (stack_solve_algo == 0 || stack_solve_algo == 4) if (stack_solve_algo == 0 || stack_solve_algo == 4)
Solve_LU_UMFPack(Ap, Ai, Ax, b, Size * periods, Size, slowc, true, 0, vector_table_conditional_local); Solve_LU_UMFPack(Ap, Ai, Ax, b, Size * periods, Size, slowc, true, 0, vector_table_conditional_local);
else if (stack_solve_algo == 1 || stack_solve_algo == 6) else if (stack_solve_algo == 1 || stack_solve_algo == 6)
Solve_Matlab_Relaxation(A_m, b_m, Size, slowc, 0); Solve_Matlab_Relaxation(A_m, b_m, Size, slowc);
else if (stack_solve_algo == 2) else if (stack_solve_algo == 2)
Solve_Matlab_GMRES(A_m, b_m, Size, slowc, blck, true, 0, x0_m); Solve_Matlab_GMRES(A_m, b_m, Size, slowc, blck, true, 0, x0_m);
else if (stack_solve_algo == 3) else if (stack_solve_algo == 3)

14
mex/sources/bytecode/SparseMatrix.hh
View File

@ -52,7 +52,7 @@ class dynSparseMatrix : public Evaluate
{ {
public: public:
dynSparseMatrix(int y_size_arg, int y_kmin_arg, int y_kmax_arg, bool print_it_arg, bool steady_state_arg, int periods_arg, int minimal_solving_periods_arg); dynSparseMatrix(int y_size_arg, int y_kmin_arg, int y_kmax_arg, bool print_it_arg, bool steady_state_arg, int periods_arg, int minimal_solving_periods_arg);
void Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin, int y_kmax, int Size, int periods, bool cvg, int minimal_solving_periods, int stack_solve_algo, unsigned int endo_name_length, const vector<string> &P_endo_names, const vector_table_conditional_local_type &vector_table_conditional_local); void Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin, int y_kmax, int Size, int periods, bool cvg, int minimal_solving_periods, int stack_solve_algo, const vector<string> &P_endo_names, const vector_table_conditional_local_type &vector_table_conditional_local);
void Simulate_Newton_One_Boundary(bool forward); void Simulate_Newton_One_Boundary(bool forward);
void fixe_u(double **u, int u_count_int, int max_lag_plus_max_lead_plus_1); void fixe_u(double **u, int u_count_int, int max_lag_plus_max_lead_plus_1);
void Read_SparseMatrix(const string &file_name, int Size, int periods, int y_kmin, int y_kmax, bool two_boundaries, int stack_solve_algo, int solve_algo); void Read_SparseMatrix(const string &file_name, int Size, int periods, int y_kmin, int y_kmax, bool two_boundaries, int stack_solve_algo, int solve_algo);
@ -71,12 +71,12 @@ private:
void Init_Matlab_Sparse_Simple(int Size, const map<tuple<int, int, int>, int> &IM, const mxArray *A_m, const mxArray *b_m, bool &zero_solution, const mxArray *x0_m) const; void Init_Matlab_Sparse_Simple(int Size, const map<tuple<int, int, int>, int> &IM, const mxArray *A_m, const mxArray *b_m, bool &zero_solution, const mxArray *x0_m) const;
void Init_UMFPACK_Sparse_Simple(int Size, const map<tuple<int, int, int>, int> &IM, SuiteSparse_long **Ap, SuiteSparse_long **Ai, double **Ax, double **b, bool &zero_solution, const mxArray *x0_m) const; void Init_UMFPACK_Sparse_Simple(int Size, const map<tuple<int, int, int>, int> &IM, SuiteSparse_long **Ap, SuiteSparse_long **Ai, double **Ax, double **b, bool &zero_solution, const mxArray *x0_m) const;
void Simple_Init(int Size, const map<tuple<int, int, int>, int> &IM, bool &zero_solution); void Simple_Init(int Size, const map<tuple<int, int, int>, int> &IM, bool &zero_solution);
void End_GE(int Size); void End_GE();
bool mnbrak(double *ax, double *bx, double *cx, double *fa, double *fb, double *fc); bool mnbrak(double *ax, double *bx, double *cx, double *fa, double *fb, double *fc);
bool golden(double ax, double bx, double cx, double tol, double solve_tolf, double *xmin); bool golden(double ax, double bx, double cx, double tol, double solve_tolf, double *xmin);
void Solve_ByteCode_Symbolic_Sparse_GaussianElimination(int Size, bool symbolic, int Block_number); void Solve_ByteCode_Symbolic_Sparse_GaussianElimination(int Size, bool symbolic, int Block_number);
bool Solve_ByteCode_Sparse_GaussianElimination(int Size, int blck, int it_); bool Solve_ByteCode_Sparse_GaussianElimination(int Size, int blck, int it_);
void Solve_Matlab_Relaxation(mxArray *A_m, mxArray *b_m, unsigned int Size, double slowc_l, int it_); void Solve_Matlab_Relaxation(mxArray *A_m, mxArray *b_m, unsigned int Size, double slowc_l);
void Solve_Matlab_LU_UMFPack(mxArray *A_m, mxArray *b_m, int Size, double slowc_l, bool is_two_boundaries, int it_); void Solve_Matlab_LU_UMFPack(mxArray *A_m, mxArray *b_m, int Size, double slowc_l, bool is_two_boundaries, int it_);
static void Print_UMFPack(const SuiteSparse_long *Ap, const SuiteSparse_long *Ai, const double *Ax, int n); static void Print_UMFPack(const SuiteSparse_long *Ap, const SuiteSparse_long *Ai, const double *Ax, int n);
static void Printfull_UMFPack(const SuiteSparse_long *Ap, const SuiteSparse_long *Ai, const double *Ax, const double *b, int n); static void Printfull_UMFPack(const SuiteSparse_long *Ap, const SuiteSparse_long *Ai, const double *Ax, const double *b, int n);
@ -87,10 +87,10 @@ private:
void End_Matlab_LU_UMFPack(); void End_Matlab_LU_UMFPack();
void Solve_Matlab_GMRES(mxArray *A_m, mxArray *b_m, int Size, double slowc, int block, bool is_two_boundaries, int it_, mxArray *x0_m); void Solve_Matlab_GMRES(mxArray *A_m, mxArray *b_m, int Size, double slowc, int block, bool is_two_boundaries, int it_, mxArray *x0_m);
void Solve_Matlab_BiCGStab(mxArray *A_m, mxArray *b_m, int Size, double slowc, int block, bool is_two_boundaries, int it_, mxArray *x0_m, int precond); void Solve_Matlab_BiCGStab(mxArray *A_m, mxArray *b_m, int Size, double slowc, int block, bool is_two_boundaries, int it_, mxArray *x0_m, int precond);
void Check_and_Correct_Previous_Iteration(int block_num, int y_size, int size, double crit_opt_old); void Check_and_Correct_Previous_Iteration(int y_size, int size);
bool Simulate_One_Boundary(int blck, int y_size, int y_kmin, int y_kmax, int Size, bool cvg); bool Simulate_One_Boundary(int blck, int y_size, int size);
bool solve_linear(int block_num, int y_size, int y_kmin, int y_kmax, int size, int iter); bool solve_linear(int block_num, int y_size, int size, int iter);
void solve_non_linear(int block_num, int y_size, int y_kmin, int y_kmax, int size); void solve_non_linear(int block_num, int y_size, int size);
string preconditioner_print_out(string s, int preconditioner, bool ss); string preconditioner_print_out(string s, int preconditioner, bool ss);
bool compare(int *save_op, int *save_opa, int *save_opaa, int beg_t, int periods, long nop4, int Size); bool compare(int *save_op, int *save_opa, int *save_opaa, int beg_t, int periods, long nop4, int Size);
void Insert(int r, int c, int u_index, int lag_index); void Insert(int r, int c, int u_index, int lag_index);