Use system LBFGSB.

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

diff --git a/scipy/optimize/setup.py b/scipy/optimize/setup.py
index 20ecb074cb657473d585db2fb4e564800e4c78c1..547e383a88ea2bce918210583349785d901c6296 100755 (executable)
--- 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 1d733b39fb39ef6426d6f41ad05f740b7c21e48a..f8767a04c8c861d616e633af13e73e91bff20250 100755 (executable)
--- 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