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

multi-vector build fixes after toolfile migration #7250

Merged
merged 1 commit into from
Aug 29, 2021
Merged

multi-vector build fixes after toolfile migration #7250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cmssw-patch-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
### RPM cms cmssw-patch-tool-conf 4.0
### RPM cms cmssw-patch-tool-conf 5.0

## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes

Requires: cmssw

## INCLUDE cmssw-vectorization
## INCLUDE cmssw-drop-tools
## INCLUDE scram-tool-conf
6 changes: 2 additions & 4 deletions cmssw-tool-conf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
### RPM cms cmssw-tool-conf 51.0
### RPM cms cmssw-tool-conf 52.0
# With cmsBuild, change the above version only when a new tool is added

## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes cmssw-osenv cms-git-tools
## UPLOAD_DEPENDENCIES dqmgui

%define vectorized_packages OpenBLAS fastjet mkfit rivet tensorflow vecgeom zlib
%{expand:%(for t in %{vectorized_packages} ; do echo Requires: $t; for v in %{package_vectorization}; do echo Requires: ${t}_${v}; done; done)}

Requires: crab
Requires: cmssw-wm-tools
Requires: google-benchmark
Expand Down Expand Up @@ -182,5 +179,6 @@ Requires: xtensor
Requires: xtl
Requires: xgboost

## INCLUDE cmssw-vectorization
## INCLUDE cmssw-drop-tools
## INCLUDE scram-tool-conf
2 changes: 2 additions & 0 deletions cmssw-vectorization.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%define vectorized_packages zlib fastjet mkfit vecgeom tensorflow-sources tensorflow OpenBLAS rivet
%{expand:%(for t in %{vectorized_packages} ; do echo Requires: $t; for v in %{package_vectorization}; do echo Requires: ${t}_${v}; done; done)}
25 changes: 4 additions & 21 deletions scram-tool-conf.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
BuildRequires: SCRAMV1
Source99: scram-tools
Source: none
%{expand:%(i=90; for v in %{package_vectorization}; do let i=$i+1 ; echo Source${i}: vectorization/$v; done)}

%if "%{?vec_tools:set}" != "set"
%define vec_tools %{nil}
%if "%{?vectorized_packages:set}" != "set"
%define vectorized_packages %{nil}
%endif

%prep
Expand Down Expand Up @@ -38,7 +39,7 @@ done

for vec in %{package_vectorization}; do \
ucvec=`echo $vec | tr '[a-z-]' '[A-Z_]'`
for tool in %{vec_tools}; do \
for tool in %{vectorized_packages}; do \
uctool=`echo $tool | tr '[a-z-]' '[A-Z_]'`
toolbase=`eval echo \\$${uctool}_${ucvec}_ROOT`
toolver=`eval echo \\$${uctool}_${ucvec}_VERSION`
Expand Down Expand Up @@ -122,24 +123,6 @@ if [ "${DUP_BIN}" != "" ] ; then
fi
set -x

#vectorized packages
%if "%{?vectorized_packages}" != ""
for vect_package in %vectorized_packages; do
echo $vect_package
package_uc=$(echo $vect_package | tr '[a-z-]' '[A-Z_]')
r=""
#echo $package_uc
for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]'); do
r=$r" <environment name=\"${v}_LIBDIR\" default=\""
r=$r'\$'
r=$r${package_uc}_${v}_ROOT/lib"\"/>\n"
#echo $v
done
r=$r'</client>'
perl -p -i -e "s|</client>|${r}|g" %i/tools/selected/$(echo $vect_package | tr '[A-Z]' '[a-z]').xml
done
%endif

%post

%{relocateCmsFiles} $(find $RPM_INSTALL_PREFIX/%{pkgrel}/tools -type f)
Expand Down