Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backporting sherpa2.2.6 and openloops2.0.0 to 71X #4821

Merged
merged 6 commits into from
May 7, 2019
Merged

backporting sherpa2.2.6 and openloops2.0.0 to 71X #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9f9b29
updating sherpa2.2.6 and openloops2.0.0
SiewYan Mar 28, 2019
ba28838
Change openloops source
mrodozov Mar 28, 2019
adb18e8
Change sherpa source
mrodozov Mar 29, 2019
77a9e8c
Propagating changes from PR #4796
SiewYan Apr 9, 2019
1109319
disable building Manual
smuzaffar Apr 30, 2019
172fca7
Add changes for 7_1 openloops to evade ssl trouble
mrodozov May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions openloops.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,38 @@
### RPM external openloops 2.0.b
%define tag 0f0826bd718dc28dcc8a457acb59de678b011b96
### RPM external openloops 2.0.0
%define tag df5dc23c322dd460c4f8f3cdfa331bb190c647f6
%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

BuildRequires: python scons

Patch0: openloops-1.2.3-cpp-use-undef

%define keep_archives true

%prep
%setup -n %{n}-%{realversion}
#%patch0 -p1
#change the repo from remote to local files
sed -i -e 's|http:/|%{_builddir}/localrepo|' pyol/config/default.cfg

%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

#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
mkdir %i/{lib,proclib}
cp lib/*.so %i/lib
Expand Down
8 changes: 4 additions & 4 deletions sherpa.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### RPM external sherpa 2.2.5
%define tag 600078cc741021be898f15563235cf6c809ca5ff
### RPM external sherpa 2.2.6
%define tag ea0b6f6f50f77d2f7479ba81d0715e23b69eabee
%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
Expand All @@ -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
Expand Down Expand Up @@ -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}

Expand Down