From 9cd542b347b39f016bbc210cf1a0a39d17e0b795 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Tue, 2 Apr 2019 11:25:26 +0200 Subject: [PATCH] Use system LBFGSB. Gbp-Pq: Name Use-system-LBFGSB.patch --- scipy/optimize/setup.py | 4 +++- scipy/optimize/tests/test_optimize.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scipy/optimize/setup.py b/scipy/optimize/setup.py index 20ecb074..547e383a 100755 --- a/scipy/optimize/setup.py +++ b/scipy/optimize/setup.py @@ -62,8 +62,10 @@ def configuration(parent_package='', top_path=None): pre_build_hook = None lapack = combine_dict(lapack, numpy_nodepr_api) + lapack.setdefault('libraries', []) + lapack['libraries'].append('lbfgsb') - sources = ['lbfgsb.pyf', 'lbfgsb.f', 'linpack.f', 'timer.f'] + sources = ['lbfgsb.pyf'] ext = config.add_extension('_lbfgsb', sources=[join('lbfgsb_src', x) for x in sources], diff --git a/scipy/optimize/tests/test_optimize.py b/scipy/optimize/tests/test_optimize.py index 1d733b39..f8767a04 100755 --- a/scipy/optimize/tests/test_optimize.py +++ b/scipy/optimize/tests/test_optimize.py @@ -867,7 +867,8 @@ class TestOptimizeSimple(CheckOptimize): sol = optimize.minimize(optimize.rosen, np.array([-1.2, 1.0]), method='L-BFGS-B', jac=optimize.rosen_der, options={'disp': False, 'maxls': 1}) - assert_(not sol.success) + assert_(sol.success) + assert_allclose(sol.x,[1,1],rtol=1e-5) def test_minimize_l_bfgs_b_maxfun_interruption(self): # gh-6162 -- 2.30.2