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

use x86-64-v3 as default; enable multi microarch as default #9547

Merged
merged 2 commits into from
Dec 5, 2024
Merged

use x86-64-v3 as default; enable multi microarch as default #9547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d8144b
use x86-64-v3 as default; enable multi microarch as default
smuzaffar Dec 4, 2024
f82a3a6
use consistent zlib version 1.2.13 for all archs
smuzaffar Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmssw-vectorization.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%ifarch x86_64
%define vectorized_packages zlib fastjet tensorflow-sources tensorflow OpenBLAS rivet gbl lwtnn opencv pytorch
%define vectorized_packages fastjet tensorflow-sources tensorflow OpenBLAS rivet gbl lwtnn opencv pytorch
%{expand:%(for t in %{vectorized_packages} ; do echo Requires: $t; for v in %{package_vectorization}; do echo Requires: ${t}_${v}; done; done)}
%endif
4 changes: 3 additions & 1 deletion microarch_flags.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
%ifarch x86_64
%define default_microarch -march=x86-64-v2
%define default_microarch_name x86-64-v3
%define default_microarch -march=%{default_microarch_name}
%if "%{?override_microarch:set}" == "set"
%define selected_microarch %{override_microarch}
%else
%define selected_microarch %{default_microarch}
%endif
%else
%define default_microarch_name %{nil}
%define selected_microarch %{nil}
%define default_microarch %{nil}
%endif
7 changes: 5 additions & 2 deletions scram-project-build.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### FILE scram-project-build
## NO_AUTO_DEPENDENCY
## INCLUDE compilation_flags_lto
## INCLUDE microarch_flags
# FIXME: support building all platforms together like scram does?
# FIXME: automatic sub-packages for "doc" etc?
%define cmssw_libs biglib/%{cmsplatf} lib/%{cmsplatf}
Expand Down Expand Up @@ -51,7 +52,7 @@ BuildRequires: dwz
%endif

%if "%{?configtag:set}" != "set"
%define configtag V09-05-08
%define configtag V09-06-01
%endif

%if "%{?buildarch:set}" != "set"
Expand Down Expand Up @@ -123,10 +124,12 @@ echo %{configtag} > %_builddir/config/config_tag
sed -i -e 's| SCRAM_TARGETS=.*"| SCRAM_TARGETS=""|' %_builddir/config/Self.xml
%if "%{package_vectorization}"
%if "%{?scram_target_default:set}" != "set"
%define scram_target_default default
%define scram_target_default auto
%endif
if [ -e ${%{toolconf}}/vectorized_packages.txt ] ; then
sed -i -e 's| SCRAM_TARGETS=.*"| SCRAM_TARGETS="%{package_vectorization}"|' %_builddir/config/Self.xml
sed -i -e 's|</tool>| <runtime name="SCRAM_DEFAULT_MICROARCH" value="%{default_microarch_name}"/>\n</tool>|' %_builddir/config/Self.xml
sed -i -e 's|</tool>| <runtime name="SCRAM_MIN_SUPPORTED_MICROARCH" value="%{default_microarch_name}"/>\n</tool>|' %_builddir/config/Self.xml
sed -i -e 's|</tool>| <runtime name="SCRAM_TARGET" value="%{scram_target_default}"/>\n <runtime name="USER_TARGETS_ALL" value="1"/>\n</tool>|' %_builddir/config/Self.xml
fi
%endif
Expand Down
1 change: 0 additions & 1 deletion vectorization/cmsdist_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# and vectorized_packages list in cmssw-vectorization.file file
#########################################
MULTI_TARGET_PACKAGES = [
"zlib",
"fastjet",
"tensorflow-sources",
"tensorflow",
Expand Down
11 changes: 2 additions & 9 deletions zlib.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
### RPM external zlib 1.2.11
## INCLUDE microarch_flags
%ifarch x86_64
%define git_repo cms-externals
%define git_branch cms/v%{realversion}
%define git_commit 822f7f5a8c57802faf8bbfe16266be02eff8c2e2
%else
### RPM external zlib 1.2.13
%define git_repo madler
%define git_branch master
%define git_commit v%{realversion}
%endif
Source0: git://github.com/%{git_repo}/zlib.git?obj=%{git_branch}/%{git_commit}&export=zlib-%{realversion}&output=/zlib-%{realversion}.tgz

%prep
%setup -n zlib-%{realversion}

%build

CONF_FLAGS="-fPIC -O3 -DUSE_MMAP -DUNALIGNED_OK -D_LARGEFILE64_SOURCE=1 %{selected_microarch}"
CONF_FLAGS="-fPIC -O3 -DUSE_MMAP -DUNALIGNED_OK -D_LARGEFILE64_SOURCE=1"
CFLAGS="${CONF_FLAGS}" ./configure --prefix=%{i}

make %{makeprocesses}
Expand Down