Skip to content

Commit

Permalink
Merge IB/CMSSW_11_3_X/master into IB/CMSSW_11_3_X/rootmaster.
Browse files Browse the repository at this point in the history
cmsbuild committed Mar 15, 2021
2 parents 16300e3 + 1d7486b commit e3a7465
Showing 6 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion gcc-toolfile.spec
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
# "--use-system-compiler" option.

Source: none
%{expand:%(i=90; for v in %{package_vectorization}; do let i=$i+1 ; echo Source${i}: vectorization/$v; done)}

%prep
%build
@@ -68,7 +69,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gcc-cxxcompiler.xml
EOF_TOOLFILE
%ifarch x86_64
for v in %{package_vectorization} ; do
uv=$(echo $v | tr '[a-z-]' '[A-Z_]')
uv=$(echo $v | tr [a-z-] [A-Z_] | tr '.' '_')
echo " <flags CXXFLAGS_VECTORIZE_${uv}=\"$(%{cmsdist_directory}/vectorization/cmsdist_packages.py $v)\"/>" >> %i/etc/scram.d/gcc-cxxcompiler.xml
done
%endif
14 changes: 13 additions & 1 deletion scram-project-build.file
Original file line number Diff line number Diff line change
@@ -8,6 +8,11 @@
%define isslc6_amd64 %(case %{cmsplatf} in (slc6_amd64_*) echo 1 ;; (*) echo 0 ;; esac)
%define scram_home_suffix %(echo %{directpkgreqs} | grep -q /SCRAMV1/V2_ && echo /src || true)
%define scram_script_prefix %(echo %{directpkgreqs} | grep -q /SCRAMV1/V2_ && echo .pl || echo .py)
%if "%{?pkgname}" != "coral"
%if "%{?package_vectorization}" != ""
%define vectorized_build yes
%endif
%endif

Requires: SCRAMV1
BuildRequires: gcc
@@ -62,7 +67,7 @@ Requires: glibc
%endif

%if "%{?configtag:set}" != "set"
%define configtag V06-01-18
%define configtag V06-01-19
%endif

%if "%{?cvssrc:set}" != "set"
@@ -131,6 +136,10 @@ echo %{configtag} > %_builddir/config/config_tag
%else
--keys PROJECT_GIT_HASH=%{realversion}
%endif
%if "%{?vectorized_build:set}" == "set"
sed -i -e 's| SCRAM_VECTORIZE=.*"| SCRAM_VECTORIZE="%{package_vectorization}"|' %_builddir/config/Self.xml
sed -i -e 's|</tool>|<runtime name="USER_VECTORIZE_ALL" value="1"/></tool>|' %_builddir/config/Self.xml
%endif

%{?PartialBootstrapPatch:%PartialBootstrapPatch}
%{?patchsrc:%patchsrc}
@@ -183,6 +192,9 @@ export SCRAM_NOSYMCHECK=true
%endif

case %n in (cmssw|cmssw-patch) %scramcmd b -f -k %{makeprocesses} llvm-ccdb </dev/null || true ;; esac
%if "%{?vectorized_build:set}" == "set"
touch %{i}/.SCRAM/%{cmsplatf}/vectorize
%endif
%scramcmd b --verbose -f %{compileOptions} %{extraOptions} %{makeprocesses} %{buildtarget} </dev/null || { touch ../build-errors && %scramcmd b -f outputlog && [ "%{?ignore_compile_errors:set}" == "set" ]; }

%if "%{?additionalBuildTarget0:set}" == "set"
Empty file added vectorization/haswell.file
Empty file.
Empty file added vectorization/nehalem.file
Empty file.
Empty file added vectorization/sandybridge.file
Empty file.
Empty file.

0 comments on commit e3a7465

Please sign in to comment.