From d772eafb9473bb4695cfa6f045e2db7724078329 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Sun, 21 Jun 2026 19:23:28 +0200 Subject: [PATCH] added override_microarch_name for vectorized packages --- microarch_flags.file | 13 ++++++++----- vectorization/cmsdist_packages.py | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/microarch_flags.file b/microarch_flags.file index 41dff3e120b..fca0c7fe456 100644 --- a/microarch_flags.file +++ b/microarch_flags.file @@ -1,13 +1,16 @@ %ifarch x86_64 %define default_microarch_name x86-64-v3 %define default_microarch -march=%{default_microarch_name} -%if "%{?override_microarch:set}" == "set" -%define selected_microarch %{override_microarch} +%if "%{?override_microarch_name:set}" == "set" +%define selected_microarch_name %{override_microarch_name} +%define selected_microarch %{override_microarch} %else +%define selected_microarch_name %{default_microarch_name} %define selected_microarch %{default_microarch} %endif %else -%define default_microarch_name %{nil} -%define selected_microarch %{nil} -%define default_microarch %{nil} +%define default_microarch_name %{nil} +%define default_microarch %{nil} +%define selected_microarch_name %{nil} +%define selected_microarch %{nil} %endif diff --git a/vectorization/cmsdist_packages.py b/vectorization/cmsdist_packages.py index 7a70bd97a05..e5d515004f0 100755 --- a/vectorization/cmsdist_packages.py +++ b/vectorization/cmsdist_packages.py @@ -21,6 +21,7 @@ "lwtnn", "opencv", "pytorch", + "ucx", ] VALID_TARGETS = { "nehalem": "-march=nehalem", @@ -43,6 +44,7 @@ def packages(virtual_packages, *args): err = True vpkg = "%s_%s" % (pkg, v) spec = ["%define vectorized_package {0}".format(v)] + spec.append("%define override_microarch_name {0}".format(v)) spec.append("%define default_pkgname {0}".format(pkg)) spec.append("%define override_microarch {0}".format(VALID_TARGETS[v])) spec.append("cmd:sed -e 's|\(^### *RPM *[^\s]*\) *{0} |\\1 {1} |;s|%{{n}}|{0}|g;' {2}/{0}.spec".format(pkg, vpkg, opts.cmsdist))