diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec index 818fd63..f6cb641 100644 --- a/python-scikit-learn.spec +++ b/python-scikit-learn.spec @@ -16,6 +16,7 @@ License: BSD URL: http://scikit-learn.org/ Source0: https://pypi.python.org/packages/source/s/scikit-learn/%{upname}-%{version}.tar.gz Patch0: sklearn-unbundle-joblib.patch +Patch1: sklearn-unbundle-cblas.patch BuildRequires: python2-devel BuildRequires: numpy scipy python-nose python-matplotlib BuildRequires: python-six python-joblib @@ -52,8 +53,13 @@ efficient, accessible to everybody, and reusable in various contexts. %prep %setup -n %{upname}-%{version} -q %patch0 -p1 +%patch1 -p1 +echo "[ALL]" > site.cfg +echo "verbosity = 0" >> site.cfg + rm -rf sklearn/externals/joblib +rm -rf sklearn/src/cblas rm -rf *egg-info chmod -x examples/plot_rbm_logistic_classification.py diff --git a/sklearn-unbundle-cblas.patch b/sklearn-unbundle-cblas.patch new file mode 100644 index 0000000..636cded --- /dev/null +++ b/sklearn-unbundle-cblas.patch @@ -0,0 +1,24 @@ +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 +@@ -20,7 +20,7 @@ + + config.add_extension('cd_fast', sources=['cd_fast.c'], + libraries=cblas_libs, +- 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/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 +@@ -27,7 +27,7 @@ + sources=['arrayfuncs.c'], + depends=[join('src', 'cholesky_delete.h')], + libraries=cblas_libs, +- include_dirs=[join('..', 'src', 'cblas'), ++ include_dirs=[ + numpy.get_include(), + blas_info.pop('include_dirs', [])], + extra_compile_args=blas_info.pop('extra_compile_args',