From 3661c8e270c9aa50e5dadac106a38fe8fbb9bfad Mon Sep 17 00:00:00 2001 From: Danilo Horta Date: Wed, 17 Apr 2019 17:36:53 +0100 Subject: [PATCH] 3.1.6 rtol for macos azures, conda-forge --- glimix_core/__init__.py | 2 +- glimix_core/lmm/test/test_lmm.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/glimix_core/__init__.py b/glimix_core/__init__.py index 04caf399..6b40207c 100644 --- a/glimix_core/__init__.py +++ b/glimix_core/__init__.py @@ -6,7 +6,7 @@ from . import cov, example, ggp, glmm, gp, lik, link, lmm, mean, random from ._testit import test -__version__ = "3.1.5" +__version__ = "3.1.6" __all__ = [ "__version__", diff --git a/glimix_core/lmm/test/test_lmm.py b/glimix_core/lmm/test/test_lmm.py index a6caa4b6..3eb3748e 100644 --- a/glimix_core/lmm/test/test_lmm.py +++ b/glimix_core/lmm/test/test_lmm.py @@ -220,10 +220,10 @@ def fun(x): res = minimize(fun, [0] * c + [0, 0]) lmm.fit(verbose=False) - assert_allclose(lmm.lml(), -res.fun, rtol=1e-4, atol=1e-6) - assert_allclose(lmm.beta, res.x[:c], rtol=1e-4, atol=1e-6) - assert_allclose(lmm.v0, exp(res.x[c]), rtol=1e-4, atol=1e-6) - assert_allclose(lmm.v1, exp(res.x[c + 1]), rtol=1e-4, atol=1e-6) + assert_allclose(lmm.lml(), -res.fun, rtol=1e-3, atol=1e-6) + assert_allclose(lmm.beta, res.x[:c], rtol=1e-3, atol=1e-6) + assert_allclose(lmm.v0, exp(res.x[c]), rtol=1e-3, atol=1e-6) + assert_allclose(lmm.v1, exp(res.x[c + 1]), rtol=1e-3, atol=1e-6) lmm = LMM(y, X, QS, restricted=restricted) beta = random.randn(c) @@ -239,9 +239,9 @@ def fun(x): res = minimize(fun, [0, 0]) lmm.fit(verbose=False) - assert_allclose(lmm.lml(), -res.fun, rtol=1e-4, atol=1e-6) - assert_allclose(lmm.v0, exp(res.x[0]), rtol=1e-4, atol=1e-6) - assert_allclose(lmm.v1, exp(res.x[1]), rtol=1e-4, atol=1e-6) + assert_allclose(lmm.lml(), -res.fun, rtol=1e-3, atol=1e-6) + assert_allclose(lmm.v0, exp(res.x[0]), rtol=1e-3, atol=1e-6) + assert_allclose(lmm.v1, exp(res.x[1]), rtol=1e-3, atol=1e-6) lmm = LMM(y, X, QS, restricted=restricted) lmm.beta = random.randn(c) @@ -280,8 +280,8 @@ def fun(x): res = minimize(fun, [0] * c + [0]) lmm.fit(verbose=False) assert_allclose(lmm.lml(), -res.fun, rtol=1e-5, atol=1e-6) - assert_allclose(lmm.beta, res.x[:c], rtol=1e-4, atol=1e-6) - assert_allclose(lmm.delta, 1 / (1 + exp(-res.x[c])), rtol=1e-4, atol=1e-6) + assert_allclose(lmm.beta, res.x[:c], rtol=1e-3, atol=1e-6) + assert_allclose(lmm.delta, 1 / (1 + exp(-res.x[c])), rtol=1e-3, atol=1e-6) def _get_mvn(y, X, G):