Skip to content

Commit b4505ef

Browse files
committed
Remove redundant 'cyipopt' availability check from multiple test cases in TestMultiexperimentBuild
1 parent d192e9a commit b4505ef

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

pyomo/contrib/doe/tests/test_greybox.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,8 @@ def test_solve_ME_optimality_condition_number(self):
13291329
@unittest.skipIf(not numpy_available, "Numpy is not available")
13301330
@unittest.skipIf(not scipy_available, "scipy is not available")
13311331
@unittest.skipIf(not pandas_available, "pandas is not available")
1332+
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
13321333
class TestMultiexperimentBuild(unittest.TestCase):
1333-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
13341334
def test_optimize_experiments_greybox_uses_aggregated_fim(self):
13351335
# Check that the multi-experiment greybox block is seeded from the
13361336
# aggregated scenario FIM and that the final solve is routed through
@@ -1365,7 +1365,6 @@ def test_optimize_experiments_greybox_uses_aggregated_fim(self):
13651365
places=7,
13661366
)
13671367

1368-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
13691368
@parameterized.expand(
13701369
[("determinant",), ("trace",), ("minimum_eigenvalue",), ("condition_number",)]
13711370
)
@@ -1402,7 +1401,6 @@ def test_optimize_experiments_greybox_outputs_match_numpy_for_supported_objectiv
14021401
places=7,
14031402
)
14041403

1405-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
14061404
def test_optimize_experiments_greybox_prior_fim_is_included_in_inputs_and_output(
14071405
self,
14081406
):
@@ -1456,7 +1454,6 @@ def test_optimize_experiments_greybox_prior_fim_is_included_in_inputs_and_output
14561454
)
14571455
)
14581456

1459-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
14601457
def test_optimize_experiments_greybox_uses_init_solver_for_square_solve_and_grey_box_solver_for_final_solve(
14611458
self,
14621459
):
@@ -1508,7 +1505,6 @@ def test_optimize_experiments_greybox_uses_init_solver_for_square_solve_and_grey
15081505
getattr(grey_box_solver, "name", str(grey_box_solver)),
15091506
)
15101507

1511-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
15121508
def test_optimize_experiments_greybox_is_reentrant_on_same_object(self):
15131509
# Re-running the same greybox DoE object should rebuild a fresh
15141510
# external block and reseed it from the current aggregated total FIM.
@@ -1564,7 +1560,6 @@ def test_optimize_experiments_greybox_is_reentrant_on_same_object(self):
15641560
places=7,
15651561
)
15661562

1567-
@unittest.skipIf(not cyipopt_available, "'cyipopt' is not available")
15681563
def test_optimize_experiments_greybox_lhs_initialization_scores_e_opt_and_me_opt(
15691564
self,
15701565
):

0 commit comments

Comments
 (0)