From e9f9b2929666e9673288264ec5583c3eb13ba80d Mon Sep 17 00:00:00 2001 From: SiewYan Date: Thu, 28 Mar 2019 16:00:07 +0100 Subject: [PATCH 1/6] updating sherpa2.2.6 and openloops2.0.0 --- openloops.spec | 25 ++++++++++++++----------- sherpa.spec | 6 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/openloops.spec b/openloops.spec index 709dc1f7171..9fff2c61569 100644 --- a/openloops.spec +++ b/openloops.spec @@ -1,33 +1,36 @@ -### RPM external openloops 2.0.b -%define tag 0f0826bd718dc28dcc8a457acb59de678b011b96 +### RPM external openloops 2.0.0 +%define tag a0fd88934c5c5b83f66fa4791c07f7872ec00a13 %define branch cms/v%{realversion} %define github_user cms-externals -Source: git+https://github.com/%github_user/openloops.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz +#Source: git+https://github.com/%github_user/openloops.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz +Source: http://www.hepforge.org/archive/openloops/OpenLoops-2.0.0.tar.gz BuildRequires: python scons -Patch0: openloops-1.2.3-cpp-use-undef +#Patch0: openloops-1.2.3-cpp-use-undef %define keep_archives true %prep -%setup -n %{n}-%{realversion} +%setup -n OpenLoops-%{realversion} #%patch0 -p1 %build cat << \EOF >> openloops.cfg [OpenLoops] fortran_compiler = gfortran -gfortran_f90_flags = -ffixed-line-length-0 -ffree-line-length-0 -O0 +gfortran_f90_flags = -ffixed-line-length-0 -ffree-line-length-0 +generic_optimisation = -O2 +born_optimisation = -O2 loop_optimisation = -O0 -generic_optimisation = -O0 -born_optimisation = -O0 +link_optimisation = -O2 EOF ./openloops update --processes generator=0 %install -mkdir %i/{lib,proclib} +#mkdir %i/{lib,proclib} +mkdir %i/lib cp lib/*.so %i/lib -cp proclib/*.so %i/proclib -cp proclib/*.info %i/proclib +#cp proclib/*.so %i/proclib +#cp proclib/*.info %i/proclib diff --git a/sherpa.spec b/sherpa.spec index 76e0d39db50..c7f6032f8a2 100644 --- a/sherpa.spec +++ b/sherpa.spec @@ -1,8 +1,8 @@ -### RPM external sherpa 2.2.5 +### RPM external sherpa 2.2.6 %define tag 600078cc741021be898f15563235cf6c809ca5ff %define branch cms/v%realversion %define github_user cms-externals -Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz +Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-2.2.6.tar.gz Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons python openmpi BuildRequires: mcfm swig @@ -16,7 +16,7 @@ Requires: openloops %endif # islinux %prep -%setup -q -n %{n}-%{realversion} +%setup -q -n SHERPA-MC-%{realversion} autoreconf -i --force From ba288384fad6b0a03259b931866e3c40f50c9bb3 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 28 Mar 2019 15:07:15 +0100 Subject: [PATCH 2/6] Change openloops source --- openloops.spec | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/openloops.spec b/openloops.spec index 9fff2c61569..3a3157cb7bf 100644 --- a/openloops.spec +++ b/openloops.spec @@ -1,19 +1,16 @@ ### RPM external openloops 2.0.0 -%define tag a0fd88934c5c5b83f66fa4791c07f7872ec00a13 +%define tag 944f9f27fc68d2a14d6df9f877ab49258028c7e6 %define branch cms/v%{realversion} %define github_user cms-externals -#Source: git+https://github.com/%github_user/openloops.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz -Source: http://www.hepforge.org/archive/openloops/OpenLoops-2.0.0.tar.gz -BuildRequires: python scons +Source: git+https://github.com/%github_user/openloops.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz -#Patch0: openloops-1.2.3-cpp-use-undef +BuildRequires: python scons %define keep_archives true %prep -%setup -n OpenLoops-%{realversion} -#%patch0 -p1 +%setup -n %{n}-%{realversion} %build cat << \EOF >> openloops.cfg @@ -29,8 +26,5 @@ EOF ./openloops update --processes generator=0 %install -#mkdir %i/{lib,proclib} mkdir %i/lib cp lib/*.so %i/lib -#cp proclib/*.so %i/proclib -#cp proclib/*.info %i/proclib From adb18e825d619c768a6b30bcb8783a42644c185a Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 29 Mar 2019 17:02:09 +0100 Subject: [PATCH 3/6] Change sherpa source --- sherpa.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sherpa.spec b/sherpa.spec index c7f6032f8a2..b252bfea32a 100644 --- a/sherpa.spec +++ b/sherpa.spec @@ -1,8 +1,8 @@ ### RPM external sherpa 2.2.6 -%define tag 600078cc741021be898f15563235cf6c809ca5ff +%define tag ea0b6f6f50f77d2f7479ba81d0715e23b69eabee %define branch cms/v%realversion %define github_user cms-externals -Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-2.2.6.tar.gz +Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons python openmpi BuildRequires: mcfm swig @@ -16,7 +16,7 @@ Requires: openloops %endif # islinux %prep -%setup -q -n SHERPA-MC-%{realversion} +%setup -q -n %{n}-%{realversion} autoreconf -i --force From 77a9e8c325b9f888d9afbfe02f62a45e6f88eefd Mon Sep 17 00:00:00 2001 From: SiewYan Date: Tue, 9 Apr 2019 14:13:10 +0200 Subject: [PATCH 4/6] Propagating changes from PR #4796 Propagating changes in #4796 1.) Include proclib 2.) Process libraries generation 3.) changes openloops source by imitating gitlab tag hash --- openloops.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openloops.spec b/openloops.spec index 3a3157cb7bf..a20f8924413 100644 --- a/openloops.spec +++ b/openloops.spec @@ -1,5 +1,5 @@ ### RPM external openloops 2.0.0 -%define tag 944f9f27fc68d2a14d6df9f877ab49258028c7e6 +%define tag df5dc23c322dd460c4f8f3cdfa331bb190c647f6 %define branch cms/v%{realversion} %define github_user cms-externals @@ -24,7 +24,10 @@ link_optimisation = -O2 EOF ./openloops update --processes generator=0 +./openloops libinstall all.coll %install -mkdir %i/lib +mkdir %i/{lib,proclib} cp lib/*.so %i/lib +cp proclib/*.so %i/proclib +cp proclib/*.info %i/proclib From 1109319aca465c4d1b6ea695d30a0344c7c2235e Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 30 Apr 2019 15:09:12 +0200 Subject: [PATCH 5/6] disable building Manual --- sherpa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sherpa.spec b/sherpa.spec index b252bfea32a..f628b6a4175 100644 --- a/sherpa.spec +++ b/sherpa.spec @@ -17,7 +17,7 @@ Requires: openloops %prep %setup -q -n %{n}-%{realversion} - +sed -i -e 's|^\s*Manual \s*\\$|\\|' Makefile.am autoreconf -i --force # Force architecture based on %%cmsplatf @@ -50,7 +50,7 @@ esac MPICXX="mpicxx" \ FC="mpifort" \ CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++0x -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$OPENSSL_ROOT/include" \ - LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib -L$OPENSSL_ROOT/lib" + LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib -L$OPENSSL_ROOT/lib" MAKEINFO=true make %{makeprocesses} From 172fca73bdefb9a2fdd37605c73b240417543a84 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 3 May 2019 15:16:33 +0200 Subject: [PATCH 6/6] Add changes for 7_1 openloops to evade ssl trouble --- openloops.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openloops.spec b/openloops.spec index a20f8924413..eba080a7961 100644 --- a/openloops.spec +++ b/openloops.spec @@ -11,6 +11,8 @@ BuildRequires: python scons %prep %setup -n %{n}-%{realversion} +#change the repo from remote to local files +sed -i -e 's|http:/|%{_builddir}/localrepo|' pyol/config/default.cfg %build cat << \EOF >> openloops.cfg @@ -24,6 +26,11 @@ link_optimisation = -O2 EOF ./openloops update --processes generator=0 + +#get remote repo data locally, for 7_1 urllib2.urlopen uses ssl version which fails the communication with the server +wget -r -np --reject "index.html*" https://www.physik.uzh.ch/data/openloops/repositories/public/processes/ -P %{_builddir}/localrepo +wget -r -np --reject "index.html*" https://www.physik.uzh.ch/data/openloops/repositories/public/collections/ -P %{_builddir}/localrepo +#build the libs ./openloops libinstall all.coll %install