Skip to content

Commit

Permalink
Unflakify test_make_nonlinear_constraints (pytorch#2606)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: pytorch#2606

The equality checks occasionally fail in OSS CI (e.g., https://github.com/pytorch/botorch/actions/runs/11616160498/job/32348449332). Using `assertAllClose` should resolve it.

Reviewed By: susanxia1006

Differential Revision: D65286067

fbshipit-source-id: e368b85e75414ad6e45e9abacf754ca73a3d858e
  • Loading branch information
saitcakmak authored and facebook-github-bot committed Oct 31, 2024
1 parent d734190 commit 9ebead4
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions test/optim/test_parameter_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ def f_np_wrapper(x: npt.NDArray, f: Callable):
all(set(c.keys()) == {"fun", "jac", "type"} for c in constraints)
)
self.assertTrue(all(c["type"] == "ineq" for c in constraints))
self.assertEqual(constraints[0]["fun"](x), 4.0 - x[:d].sum())
self.assertEqual(constraints[1]["fun"](x), 4.0 - x[d : 2 * d].sum())
self.assertAllClose(constraints[0]["fun"](x), 4.0 - x[:d].sum())
self.assertAllClose(constraints[1]["fun"](x), 4.0 - x[d : 2 * d].sum())
jac_exp = np.zeros(shapeX.numel())
jac_exp[:4] = -1
self.assertTrue(np.allclose(constraints[0]["jac"](x), jac_exp))
self.assertAllClose(constraints[0]["jac"](x), jac_exp)
jac_exp = np.zeros(shapeX.numel())
jac_exp[4:8] = -1
self.assertTrue(np.allclose(constraints[1]["jac"](x), jac_exp))
self.assertAllClose(constraints[1]["jac"](x), jac_exp)
# inter
constraints = _make_nonlinear_constraints(
f_np_wrapper=f_np_wrapper, nlc=nlc, is_intrapoint=False, shapeX=shapeX
Expand All @@ -100,16 +100,14 @@ def f_np_wrapper(x: npt.NDArray, f: Callable):
all(set(c.keys()) == {"fun", "jac", "type"} for c in constraints)
)
self.assertTrue(all(c["type"] == "ineq" for c in constraints))
self.assertTrue(np.allclose(constraints[0]["fun"](x), 4.0 - x[: q * d].sum()))
self.assertTrue(
np.allclose(constraints[1]["fun"](x), 4.0 - x[q * d : 2 * q * d].sum())
)
self.assertAllClose(constraints[0]["fun"](x), 4.0 - x[: q * d].sum())
self.assertAllClose(constraints[1]["fun"](x), 4.0 - x[q * d : 2 * q * d].sum())
jac_exp = np.zeros(shapeX.numel())
jac_exp[: q * d] = -1.0
self.assertTrue(np.allclose(constraints[0]["jac"](x), jac_exp))
self.assertAllClose(constraints[0]["jac"](x), jac_exp)
jac_exp = np.zeros(shapeX.numel())
jac_exp[q * d : 2 * q * d] = -1.0
self.assertTrue(np.allclose(constraints[1]["jac"](x), jac_exp))
self.assertAllClose(constraints[1]["jac"](x), jac_exp)

def test_make_scipy_nonlinear_inequality_constraints(self):
def nlc(x):
Expand Down

0 comments on commit 9ebead4

Please sign in to comment.