From: Gard Spreemann <gspreemann@gmail.com>
Date: Tue, 2 Apr 2019 09:25:26 +0000 (+0200)
Subject: Use system LBFGSB.
X-Git-Tag: archive/raspbian/1.8.1-20+rpi1~1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9cd542b347b39f016bbc210cf1a0a39d17e0b795;p=scipy.git

Use system LBFGSB.


Gbp-Pq: Name Use-system-LBFGSB.patch
---

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