openblas, Python package cleanup

OpenBLAS-toolfile.spec

@@ -0,0 +1,22 @@
+### RPM external OpenBLAS-toolfile 1.0
+Requires: OpenBLAS
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/OpenBLAS.xml
+<tool name="OpenBLAS" version="@TOOL_VERSION@">
+  <lib name="openblas"/>
+  <client>
+    <environment name="OPENBLAS_BASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE" default="$OPENBLAS_BASE/include"/>
+    <environment name="LIBDIR" default="$OPENBLAS_BASE/lib"/>
+    <environment name="BINDIR" default="$OPENBLAS_BASE/bin"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post

OpenBLAS.spec

@@ -0,0 +1,13 @@
+### RPM external OpenBLAS 0.2.19
+Source: https://github.com/xianyi/OpenBLAS/archive/v%{realversion}.tar.gz
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+
+make %{makeprocesses} FC=gfortran BINARY=64 
+
+%install
+make install PREFIX=%i
+

cmssw-tool-conf.spec

@@ -1,4 +1,4 @@
-### RPM cms cmssw-tool-conf 37.0
+### RPM cms cmssw-tool-conf 38.0
 ## NOCOMPILER
 # With cmsBuild, change the above version only when a new
 # tool is added
@@ -87,16 +87,12 @@ Requires: graphviz-toolfile
 Requires: valgrind-toolfile
 Requires: py2-matplotlib-toolfile
 Requires: py2-numpy-toolfile
-Requires: py2-pandas-toolfile
-Requires: py2-scipy-toolfile
 Requires: cmsswdata-toolfile
 Requires: py2-sqlalchemy-toolfile
 Requires: py2-pygithub-toolfile
 Requires: py2-dablooms-toolfile
 Requires: py2-dxr-toolfile
-Requires: py2-pysqlite-toolfile
 Requires: py2-PyYAML-toolfile
-Requires: py2-root_numpy-toolfile
 Requires: py2-h5py-toolfile
 Requires: hdf5-toolfile
 Requires: rivet-toolfile
@@ -152,11 +148,11 @@ Requires: tinyxml-toolfile
 Requires: scons-toolfile
 Requires: md5-toolfile
 Requires: madgraph5amcatnlo-toolfile
-Requires: histogrammar-toolfile
 Requires: py2-pippkgs-toolfile
 Requires: py2-pippkgs_depscipy-toolfile
 Requires: dasgoclient
-#still a work in progress Requires: py2-notebook
+Requires: OpenBLAS
+
 
 # Only for Linux platform.
 %if %islinux

photospline-toolfile.spec

@@ -20,7 +20,6 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/photospline.xml
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <use name="root_cxxdefaults"/>
   <use name="py2-matplotlib"/>
-  <use name="py2-pyfits"/>
   <use name="gsl"/>
   <use name="lapack"/>
 </tool>

py2-histogrammar.spec

@@ -0,0 +1,8 @@
+### RPM external py2-histogrammar 1.0.6
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+
+%define pip_name histogrammar
+
+## IMPORT build-with-pip
+%define PipPostBuild \
+perl -p -i -e "s|^#!.*python(.*)|#!/usr/bin/env python$1|" `grep -r -e "^#\!.*python.*" %i | cut -d: -f1`

py2-nose.spec

@@ -1,17 +1,9 @@
 ### RPM external py2-nose 1.3.7
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
-%define my_name %(echo %n | cut -f2 -d-)
-Source: https://pypi.python.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-%{realversion}.tar.gz 
-Requires: python
-BuildRequires: py2-setuptools
 
-%prep
-%setup -n %{my_name}-%{realversion}
 
-%build
-python setup.py build
+%define pip_name nose
 
-%install
-python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
-perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/nosetests-2.7 %{i}/bin/nosetests
+
+## IMPORT build-with-pip
 

py2-numpy.spec

@@ -1,7 +1,7 @@
-### RPM external py2-numpy 1.11.1
+### RPM external py2-numpy 1.12.1
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
-Source: https://pypi.python.org/packages/e0/4c/515d7c4ac424ff38cc919f7099bf293dd064ba9a600e1e3835b3edefdb18/numpy-1.11.1.tar.gz
-Requires: python py2-setuptools zlib lapack
+Source: https://github.com/numpy/numpy/releases/download/v%{realversion}/numpy-%{realversion}.tar.gz
+Requires: python py2-setuptools zlib OpenBLAS
 %prep
 %setup -n numpy-%realversion
 
@@ -13,18 +13,20 @@ case %cmsos in
 esac
 
 cat > site.cfg <<EOF
-[blas]
-include_dirs = $LAPACK_ROOT/include
-library_dirs = $LAPACK_ROOT/lib64
-blas_libs = blas
+[default]
+include_dirs = $OPENBLAS_ROOT/include
+library_dirs = $OPENBLAS_ROOT/lib
+[openblas]
+openblas_libs = openblas
+library_dirs = $OPENBLAS_ROOT/lib
 [lapack]
-include_dirs = $LAPACK_ROOT/include
-library_dirs = $LAPACK_ROOT/lib64
-lapack_libs = lapack
+lapack_libs = openblas
+library_dirs = $OPENBLAS_ROOT/lib
+[atlas]
+atlas_libs = openblas
+atlas_dirs = $OPENBLAS_ROOT/lib
 EOF
 
-export ATLAS=None
-export OPENBLAS=None
 mkdir -p %i/$PYTHON_LIB_SITE_PACKAGES
 
 python setup.py build  %{makeprocesses} --fcompiler=gnu95

py2-pandas.spec

@@ -1,21 +1,9 @@
-### RPM external py2-pandas 0.19.1
-## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES
-Source: https://pypi.python.org/packages/0b/9c/20a36af2016a9554378ebad2c69f63fd87bd0cc612eeed068fab656ec661/pandas-0.19.1.tar.gz
-Patch0: py2-pandas-0.16.0
-Requires: python
-Requires: py2-numpy
-Requires: py2-python-dateutil
-Requires: py2-pytz
-%prep
-%setup -n pandas-%{realversion}
-%patch0 -p1
+### RPM external py2-pandas 0.19.2
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 
-%build
-%install
+%define pip_name pandas
+Requires: py2-six py2-python-dateutil py2-pytz py2-numpy 
 
-mkdir -p %{i}/$PYTHON_LIB_SITE_PACKAGES
-export PYTHONPATH=%{i}/$PYTHON_LIB_SITE_PACKAGES:${PYTHONPATH}
-
-python setup.py build
-python setup.py install --prefix=%{i}
-find %{i} -name '*.egg-info' -exec rm {} \;
+## IMPORT build-with-pip
+#%define PipPostBuild \
+#perl -p -i -e "s|^#!.*python(.*)|#!/usr/bin/env python$1|" `grep -r -e "#\!.*python" %i | cut -d: -f1`