Skip to content

Commit

Permalink
Ignore some models
Browse files Browse the repository at this point in the history
Ignore models that require builds with compact logic.
  • Loading branch information
whart222 committed Feb 7, 2023
1 parent ac8f206 commit e6b52c3
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions test/aml_comparisons/coek/models/coek_models.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ void lqcp_scalar(coek::Model& model, size_t N);
#if __cpp_lib_variant
void fac_array(coek::Model& model, size_t F);
void lqcp_array(coek::Model& model, size_t N);
#ifdef COEK_WITH_COMPACT_MODEL
# ifdef COEK_WITH_COMPACT_MODEL
void lqcp_compact(coek::CompactModel& model, size_t N);
void lqcp_map(coek::Model& model, size_t N);
#endif
# endif
#endif

//
Expand All @@ -31,29 +31,29 @@ void pmedian_array(coek::Model& model, size_t N, size_t P);

inline void print_models(std::ostream& os)
{
os <<
os <<
#if __cpp_lib_variant
" fac-array N\n"
" fac-array N\n"
#endif
" fac-scalar N\n"
" fac-scalar N\n"
#if __cpp_lib_variant
" knapsack-array N\n"
" knapsack-array N\n"
#endif
" knapsack-scalar N\n"
" lqcp-array N\n"
" knapsack-scalar N\n"
" lqcp-array N\n"
#ifdef COEK_WITH_COMPACT_MODEL
" lqcp-compact N\n"
" lqcp-map N\n"
" lqcp-compact N\n"
" lqcp-map N\n"
#endif
" lqcp-scalar N\n"
" lqcp-scalar N\n"
#if __cpp_lib_variant
" nqueens-array N\n"
" nqueens-array N\n"
#endif
" nqueens-scalar N\n"
" nqueens-scalar N\n"
#if __cpp_lib_variant
" pmedian-array N P\n"
" pmedian-array N P\n"
#endif
" pmedian-scalar N P\n";
" pmedian-scalar N P\n";
}

inline void check_data(const std::string& name, const std::vector<size_t>& data, size_t num)
Expand Down Expand Up @@ -87,7 +87,7 @@ inline void create_instance(coek::Model& model, const std::string& name,
check_data(name, data, 1);
lqcp_array(model, data[0]);
}
#ifdef COEK_WITH_COMPACT_MODEL
# ifdef COEK_WITH_COMPACT_MODEL
else if (name == "lqcp-compact") {
check_data(name, data, 1);
coek::CompactModel cmodel;
Expand All @@ -98,7 +98,7 @@ inline void create_instance(coek::Model& model, const std::string& name,
check_data(name, data, 1);
lqcp_map(model, data[0]);
}
#endif
# endif
#endif
else if (name == "lqcp-scalar") {
check_data(name, data, 1);
Expand Down

0 comments on commit e6b52c3

Please sign in to comment.