Skip to content

Commit

Permalink
Gcc 15 two phase (#7313)
Browse files Browse the repository at this point in the history
* Fix `-Wclass-memaccess`

* Fix for GCC 15 two-phase lookup

* GCC 15 is more aggressive about checking dependent names:
  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=r15-2117-g313afcfdabeab3

Bug: https://bugs.gentoo.org/936634
  • Loading branch information
SoapGentoo authored Jul 29, 2024
1 parent 25e683e commit 2ce89e5
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 37 deletions.
69 changes: 34 additions & 35 deletions src/math/lp/lp_settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,42 +97,41 @@ class lp_resource_limit {
};

struct statistics {
unsigned m_make_feasible;
unsigned m_total_iterations;
unsigned m_iters_with_no_cost_growing;
unsigned m_num_factorizations;
unsigned m_num_of_implied_bounds;
unsigned m_need_to_solve_inf;
unsigned m_max_cols;
unsigned m_max_rows;
unsigned m_gcd_calls;
unsigned m_gcd_conflicts;
unsigned m_cube_calls;
unsigned m_cube_success;
unsigned m_patches;
unsigned m_patches_success;
unsigned m_hnf_cutter_calls;
unsigned m_hnf_cuts;
unsigned m_nla_calls;
unsigned m_gomory_cuts;
unsigned m_nla_add_bounds;
unsigned m_nla_propagate_bounds;
unsigned m_nla_propagate_eq;
unsigned m_nla_lemmas;
unsigned m_nra_calls;
unsigned m_nla_bounds_improvements;
unsigned m_horner_calls;
unsigned m_horner_conflicts;
unsigned m_cross_nested_forms;
unsigned m_grobner_calls;
unsigned m_grobner_conflicts;
unsigned m_offset_eqs;
unsigned m_fixed_eqs;
::statistics m_st;
statistics() { reset(); }
unsigned m_make_feasible = 0;
unsigned m_total_iterations = 0;
unsigned m_iters_with_no_cost_growing = 0;
unsigned m_num_factorizations = 0;
unsigned m_num_of_implied_bounds = 0;
unsigned m_need_to_solve_inf = 0;
unsigned m_max_cols = 0;
unsigned m_max_rows = 0;
unsigned m_gcd_calls = 0;
unsigned m_gcd_conflicts = 0;
unsigned m_cube_calls = 0;
unsigned m_cube_success = 0;
unsigned m_patches = 0;
unsigned m_patches_success = 0;
unsigned m_hnf_cutter_calls = 0;
unsigned m_hnf_cuts = 0;
unsigned m_nla_calls = 0;
unsigned m_gomory_cuts = 0;
unsigned m_nla_add_bounds = 0;
unsigned m_nla_propagate_bounds = 0;
unsigned m_nla_propagate_eq = 0;
unsigned m_nla_lemmas = 0;
unsigned m_nra_calls = 0;
unsigned m_nla_bounds_improvements = 0;
unsigned m_horner_calls = 0;
unsigned m_horner_conflicts = 0;
unsigned m_cross_nested_forms = 0;
unsigned m_grobner_calls = 0;
unsigned m_grobner_conflicts = 0;
unsigned m_offset_eqs = 0;
unsigned m_fixed_eqs = 0;
::statistics m_st = {};

void reset() {
memset(this, 0, sizeof(*this));
m_st.reset();
*this = statistics{};
}
void collect_statistics(::statistics& st) const {
st.update("arith-factorizations", m_num_factorizations);
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/static_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class static_matrix
ref(static_matrix & m, unsigned row, unsigned col):m_matrix(m), m_row(row), m_col(col) {}
ref & operator=(T const & v) { m_matrix.set( m_row, m_col, v); return *this; }

ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get(v.m_row, v.m_col)); return *this; }
ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get_elem(v.m_row, v.m_col)); return *this; }

operator T () const { return m_matrix.get_elem(m_row, m_col); }
};
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/static_matrix_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static_matrix<T, X>::static_matrix(static_matrix const &A, unsigned * /* basis *
init_row_columns(m, m);
for (; m-- > 0; )
for (auto & col : A.m_columns[m])
set(col.var(), m, A.get_value_of_column_cell(col));
set(col.var(), m, A.get_column_cell(col));
}

template <typename T, typename X> void static_matrix<T, X>::clear() {
Expand Down

0 comments on commit 2ce89e5

Please sign in to comment.