From 0ab98724e261662ad10a1e61e1ec635ee59587a5 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sep 09 2013 21:48:43 +0000 Subject: Update cblas patch --- diff --git a/sklearn-unbundle-cblas.patch b/sklearn-unbundle-cblas.patch index 636cded..5f95722 100644 --- a/sklearn-unbundle-cblas.patch +++ b/sklearn-unbundle-cblas.patch @@ -1,6 +1,18 @@ -diff -ur scikit-learn-0.14.1/sklearn/linear_model/setup.py scikit-learn-0.14.1.nocblas/sklearn/linear_model/setup.py ---- scikit-learn-0.14.1/sklearn/linear_model/setup.py 2013-09-07 00:19:13.601221315 +0200 -+++ scikit-learn-0.14.1.nocblas/sklearn/linear_model/setup.py 2013-09-07 00:16:16.594815837 +0200 +diff -ur scikit-learn-0.14.1/sklearn/cluster/setup.py scikit-learn-0.14.1.cblas/sklearn/cluster/setup.py +--- scikit-learn-0.14.1/sklearn/cluster/setup.py 2013-09-09 18:16:35.817133793 +0200 ++++ scikit-learn-0.14.1.cblas/sklearn/cluster/setup.py 2013-09-09 18:16:11.869972956 +0200 +@@ -28,7 +28,7 @@ + '_k_means', + libraries=cblas_libs, + sources=['_k_means.c'], +- include_dirs=[join('..', 'src', 'cblas'), ++ include_dirs=[ + numpy.get_include(), + blas_info.pop('include_dirs', [])], + extra_compile_args=blas_info.pop('extra_compile_args', []), +diff -ur scikit-learn-0.14.1/sklearn/linear_model/setup.py scikit-learn-0.14.1.cblas/sklearn/linear_model/setup.py +--- scikit-learn-0.14.1/sklearn/linear_model/setup.py 2013-09-09 18:16:35.778133528 +0200 ++++ scikit-learn-0.14.1.cblas/sklearn/linear_model/setup.py 2013-09-09 18:11:45.084926994 +0200 @@ -20,7 +20,7 @@ config.add_extension('cd_fast', sources=['cd_fast.c'], @@ -10,9 +22,9 @@ diff -ur scikit-learn-0.14.1/sklearn/linear_model/setup.py scikit-learn-0.14.1.n numpy.get_include(), blas_info.pop('include_dirs', [])], extra_compile_args=blas_info.pop('extra_compile_args', -diff -ur scikit-learn-0.14.1/sklearn/utils/setup.py scikit-learn-0.14.1.nocblas/sklearn/utils/setup.py ---- scikit-learn-0.14.1/sklearn/utils/setup.py 2013-09-07 00:19:13.572221085 +0200 -+++ scikit-learn-0.14.1.nocblas/sklearn/utils/setup.py 2013-09-07 00:17:13.989271474 +0200 +diff -ur scikit-learn-0.14.1/sklearn/utils/setup.py scikit-learn-0.14.1.cblas/sklearn/utils/setup.py +--- scikit-learn-0.14.1/sklearn/utils/setup.py 2013-09-09 18:16:35.749133330 +0200 ++++ scikit-learn-0.14.1.cblas/sklearn/utils/setup.py 2013-09-09 18:11:45.075926918 +0200 @@ -27,7 +27,7 @@ sources=['arrayfuncs.c'], depends=[join('src', 'cholesky_delete.h')],