Merge pull request #5 from cms-sw/comp_gcc493

Update comp_gcc493
cms-sw · Dec 11, 2018 · 8de8eb1 · 8de8eb1
2 parents 277a108 + 78d8abb
commit 8de8eb1
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 27 deletions.
diff --git a/acdcserver.spec b/acdcserver.spec
@@ -1,4 +1,4 @@
-### RPM cms acdcserver 1.1.13.pre5
+### RPM cms acdcserver 1.1.14.pre4
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}

diff --git a/comp.spec b/comp.spec
@@ -1,4 +1,4 @@
-### RPM cms comp HG1806f
+### RPM cms comp HG1807c
 
 # This is a meta-package to group all cms comp services
 # CMSWEB

diff --git a/couchskel.spec b/couchskel.spec
@@ -1,4 +1,4 @@
-### RPM cms couchskel 1.1.13.pre5
+### RPM cms couchskel 1.1.14.pre4
 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz
 
 # External javascripts

diff --git a/crabclient.spec b/crabclient.spec
@@ -1,12 +1,12 @@
-### RPM cms crabclient 3.3.1809
+### RPM cms crabclient 3.3.1810.rc1
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
 
 #branch 1.1.2_crab
-%define wmcver 1.1.2.crab7
+%define wmcver 1.1.16
 %define webdoc_files %{installroot}/%{pkgrel}/doc/
-%define crabserver 3.3.1710.rc1
+%define crabserver 3.3.1809.rc8
 
 
 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz

diff --git a/crabserver.spec b/crabserver.spec
@@ -1,13 +1,12 @@
-
-### RPM cms crabserver 3.3.1805.rc1
+### RPM cms crabserver 3.3.1809.rc3
 
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
 
 
 %define webdoc_files %{installroot}/%{pkgrel}/doc/
-%define wmcver 1.1.2.crab4
+%define wmcver 1.1.14.crab1
 
 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz
 Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz

diff --git a/crabtaskworker.spec b/crabtaskworker.spec
@@ -1,12 +1,12 @@
-### RPM cms crabtaskworker 3.3.1805.rc1
+### RPM cms crabtaskworker 3.3.1810.patch4
 
 
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
 
 %define webdoc_files %{installroot}/%{pkgrel}/doc/
-%define wmcver 1.1.2.crab7
+%define wmcver 1.1.17.pre3
 
 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz
 Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz

diff --git a/das.spec b/das.spec
@@ -4,7 +4,7 @@
 %define pkg0 DAS
 %define ver0 %realversion
 %define pkg1 das2go
-%define ver1 04.00.05
+%define ver1 04.01.04
 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz
 Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz
 

diff --git a/py2-memory_profiler.spec b/py2-memory_profiler.spec
@@ -0,0 +1,16 @@
+### RPM external py2-memory_profiler 0.52.0
+## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
+
+Source: https://files.pythonhosted.org/packages/23/11/50a969d32a14cdec2cfd57bee2e67fd6f83715a04361ba230dbce562b9cb/memory_profiler-%realversion.tar.gz
+Requires: python py2-psutil
+
+%prep
+%setup -n memory_profiler-%realversion
+
+%build
+python setup.py build
+
+%install
+python setup.py install --prefix=%i
+find %i -name '*.egg-info' -exec rm {} \;
+find %i -name '.package-checksum' -exec rm {} \;
diff --git a/py2-psutil.spec b/py2-psutil.spec
@@ -1,4 +1,4 @@
-### RPM external py2-psutil 3.2.1
+### RPM external py2-psutil 5.4.5
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 
 Source: https://pypi.python.org/packages/source/p/psutil/psutil-%realversion.tar.gz

diff --git a/reqmgr2.spec b/reqmgr2.spec
@@ -1,4 +1,4 @@
-### RPM cms reqmgr2 1.1.13.pre5
+### RPM cms reqmgr2 1.1.14.pre4
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
@@ -9,7 +9,7 @@ Source: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%
 #Source: git://github.com/ticoann/WMCore?obj=reqmgr2_dashboard_dep/%realversion&export=%n&output=/%n.tar.gz
 
 Requires: py2-sqlalchemy py2-httplib2 cherrypy py2-cheetah rotatelogs couchdb15 py2-sphinx py2-pycurl dbs3-client
-Requires: py2-future py2-retry py2-stomp
+Requires: py2-future py2-retry py2-stomp py2-psutil
 Requires: jemalloc
 
 %prep
@@ -24,7 +24,7 @@ python setup.py install_system -s reqmgr2 --prefix=%i
 find %i -name '*.egg-info' -exec rm {} \;
 
 mkdir -p %i/bin
-cp -pf %_builddir/%n/bin/[[:lower:]]* %i/bin
+cp -pfr %_builddir/%n/bin/[[:lower:]]* %i/bin
 
 # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
 mkdir -p %i/etc/profile.d

diff --git a/reqmgr2ms.spec b/reqmgr2ms.spec
@@ -1,9 +1,9 @@
-### RPM cms reqmgr2ms 0.0.5.pre5
+### RPM cms reqmgr2ms 0.0.6.pre4
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
 
-%define wmcorever 1.1.13.pre5
+%define wmcorever 1.1.14.pre4
 
 Source: git://github.com/dmwm/WMCore?obj=master/%wmcorever&export=%n&output=/%n.tar.gz
 Requires: cherrypy py2-pycurl jemalloc rotatelogs py2-httplib2
@@ -21,7 +21,7 @@ python setup.py install_system -s reqmgr2ms --prefix=%i
 find %i -name '*.egg-info' -exec rm {} \;
 
 mkdir -p %i/bin
-cp -pf %_builddir/%n/bin/[[:lower:]]* %i/bin
+cp -pfr %_builddir/%n/bin/[[:lower:]]* %i/bin
 
 # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
 mkdir -p %i/etc/profile.d

diff --git a/reqmon.spec b/reqmon.spec
@@ -1,4 +1,4 @@
-### RPM cms reqmon 1.1.13.pre5
+### RPM cms reqmon 1.1.14.pre4
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 
 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz
@@ -7,7 +7,7 @@ Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/
 #Source: git://github.com/ticoann/WMCore?obj=wmstats_task_summary/%realversion&export=%n&output=/%n.tar.gz
 
 Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl dbs3-client
-Requires: py2-future py2-retry py2-stomp
+Requires: py2-future py2-retry py2-stomp py2-psutil
 Requires: jemalloc
 
 BuildRequires: py2-setuptools py2-sphinx couchskel

diff --git a/t0_reqmon.spec b/t0_reqmon.spec
@@ -1,9 +1,9 @@
-### RPM cms t0_reqmon 1.1.13.pre5
+### RPM cms t0_reqmon 1.1.14.pre4
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 
 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz
 
-Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl py2-future py2-retry
+Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl py2-future py2-retry py2-psutil
 Requires: jemalloc
 BuildRequires: py2-setuptools py2-sphinx couchskel
 

diff --git a/tfaas.spec b/tfaas.spec
@@ -0,0 +1,74 @@
+### RPM cms tfaas 01.00.05
+## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
+
+%define pkg0 TFaaS
+%define ver0 v%realversion
+Source: https://github.com/vkuznet/%pkg0/archive/%ver0.tar.gz
+Requires: autotools go rotatelogs
+
+# RPM macros documentation
+# http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html
+%prep
+#%setup -b 0 -n %n 
+%setup -D -T -b 0 -n %pkg0-%realversion
+
+%build
+BUILD_DIR=$PWD
+echo "start tfaas build: $PWD"
+mkdir -p gopath
+export GOPATH=$PWD/gopath
+go get github.com/dmwm/cmsauth
+go get github.com/vkuznet/x509proxy
+go get github.com/sirupsen/logrus
+go get github.com/shirou/gopsutil
+
+# download and insta TensorFlow libraries
+# https://www.tensorflow.org/versions/master/install/install_go
+WDIR=$PWD
+TF_LIB="libtensorflow-cpu-linux-x86_64-1.6.0.tar.gz"
+curl -k -L -O "https://storage.googleapis.com/tensorflow/libtensorflow/${TF_LIB}"
+tar xfz $TF_LIB
+export LIBRARY_PATH="${WDIR}/lib:${LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${WDIR}/lib"
+go get github.com/tensorflow/tensorflow/tensorflow/go
+go get github.com/tensorflow/tensorflow/tensorflow/go/op
+
+# install protobuf
+rm -rf protobuf
+git clone https://github.com/google/protobuf.git
+cd ${WDIR}/protobuf
+./autogen.sh
+./configure --prefix=${WDIR}
+make
+make install
+go get -u github.com/golang/protobuf/protoc-gen-go
+
+# build tfaas
+cd $WDIR/src/Go
+sed -i -e "s,TAG := \$(shell git tag | sort -r | head -n 1),TAG := {TAG},g" Makefile
+export TAG=%realversion
+sed -i -e "s,{TAG},$TAG,g" Makefile
+make
+
+%install
+echo "start tfaas install: $PWD"
+echo "build dir $BUILD_DIR"
+mkdir -p %i/bin
+mkdir -p %i/lib
+mkdir -p %i/include
+mkdir -p %i/static
+mkdir -p %i/models
+cp src/Go/tfaas %i/bin
+cp -r lib/* %i/lib/
+cp -r include/* %i/include/
+cp -r src/Go/static %i
+
+# Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
+%addDependency
+
+%post
+%{relocateConfig}etc/profile.d/dependencies-setup.*sh
+
+%files
+%{installroot}/%{pkgrel}/
+%exclude %{installroot}/%{pkgrel}/doc
diff --git a/wmagent-dev.spec b/wmagent-dev.spec
@@ -1,4 +1,4 @@
-### RPM cms wmagent-dev 1.1.13.pre5
+### RPM cms wmagent-dev 1.1.14.pre4
 
 # This is a meta-package to group development tool dependencies
 Requires: wmagent rotatelogs pystack wmcore-devtools

diff --git a/wmagent.spec b/wmagent.spec
@@ -1,4 +1,4 @@
-### RPM cms wmagent 1.1.12.patch4
+### RPM cms wmagent 1.1.14.patch4
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}

diff --git a/workqueue.spec b/workqueue.spec
@@ -1,11 +1,11 @@
-### RPM cms workqueue 1.1.13.pre5
+### RPM cms workqueue 1.1.14.pre4
 ## INITENV +PATH PATH %i/xbin
 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES}
 
 Source: git://github.com/dmwm/WMCore.git?obj=master/%{realversion}&export=%n&output=/%n.tar.gz
 Requires: python py2-httplib2 pystack rotatelogs couchdb15 yui py2-sphinx dbs3-client cherrypy py2-pycurl
-Requires: py2-future py2-retry py2-stomp
+Requires: py2-future py2-retry py2-stomp py2-psutil
 Requires: jemalloc
 
 %prep