Merge pull request #2980 from davidlange6/numba

add several python analysis tools
cms-sw · Apr 25, 2017 · be8fc90 · be8fc90
2 parents 2478d75 + 4f646ee
commit be8fc90
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 2 deletions.
diff --git a/py2-histogrammar.spec b/py2-histogrammar.spec
@@ -1,4 +1,4 @@
-### RPM external py2-histogrammar 1.0.6
+### RPM external py2-histogrammar 1.0.8
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define pip_name histogrammar

diff --git a/py2-llvmlite-static.patch b/py2-llvmlite-static.patch
@@ -0,0 +1,14 @@
+diff -Naur orig/ffi/Makefile.linux llvmlite-0.15.0/ffi/Makefile.linux
+--- orig/ffi/Makefile.linux	2017-04-21 18:12:05.000000000 +0200
++++ llvmlite-0.15.0/ffi/Makefile.linux	2017-04-21 18:12:34.000000000 +0200
+@@ -18,8 +18,8 @@
+
+ $(OUTPUT): $(SRC) $(INCLUDE)
+ 	# static-libstdc++ avoids runtime dependencies on a
+-	# particular libstdc++ version.
+-	$(CXX) -static-libstdc++ -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
++	# particular libstdc++ version. (but doesnt work for us)
++	$(CXX) -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
+
+ clean:
+ 	rm -rf test $(OUTPUT)
diff --git a/py2-llvmlite.spec b/py2-llvmlite.spec
@@ -0,0 +1,12 @@
+### RPM external py2-llvmlite 0.15.0
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+Patch0: py2-llvmlite-static
+
+%define pip_name llvmlite
+Requires: py2-enum34 
+Requires: llvm
+
+%define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config && tar -xzf llvmlite-%{realversion}.tar.gz && pushd llvmlite-%{realversion} && for pch in %{patches} ; do patch -p1 < ${pch} ; done && popd && rm -f llvmlite-%{realversion}.tar.gz && tar czf llvmlite-%{realversion}.tar.gz  llvmlite-%{realversion}
+
+## IMPORT build-with-pip
+
diff --git a/py2-numba.spec b/py2-numba.spec
@@ -0,0 +1,10 @@
+### RPM external py2-numba 0.32.0
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+
+%define pip_name numba
+Requires: py2-funcsigs py2-enum34 py2-six py2-singledispatch py2-llvmlite py2-numpy 
+
+## IMPORT build-with-pip
+
+%define PipPostBuild perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/*
diff --git a/py2-pippkgs_depscipy.spec b/py2-pippkgs_depscipy.spec
@@ -2,7 +2,7 @@
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 Source: none
 
-Requires: root curl python py2-pippkgs py2-numpy py2-matplotlib
+Requires: root curl python py2-pippkgs py2-numpy py2-matplotlib xrootd
 
 %define isslc7 %(case %{cmsplatf} in (slc7_amd64*) echo 1 ;; (*) echo 0 ;; esac)
 
@@ -26,6 +26,12 @@ BuildRequires: py2-bottleneck
 BuildRequires: py2-downhill 
 BuildRequires: py2-theanets
 BuildRequires: py2-xgboost
+BuildRequires: py2-llvmlite
+BuildRequires: py2-numba
+
+#this DOES NOT depend on numpy..
+BuildRequires: py2-xrootdpyfs
+
 
 %prep
 

diff --git a/py2-xrootdpyfs.spec b/py2-xrootdpyfs.spec
@@ -0,0 +1,6 @@
+### RPM external py2-xrootdpyfs 0.1.3
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+Requires: xrootd
+
+## IMPORT build-with-pip