From 626d9183ecbfd9d03f91f12f423cbde19130248a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Oct 2020 06:15:16 +0000 Subject: [PATCH] import libomp-11.0.0-0.1.rc2.module+el8.4.0+8278+baa0f59e --- .gitignore | 2 +- .libomp.metadata | 2 +- SOURCES/99b03c1c18.patch | 39 -------------------- SOURCES/lit.fedora.cfg.py | 2 +- SOURCES/openmp-10.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/openmp-11.0.0rc2.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/libomp.spec | 46 +++++++++++++----------- 7 files changed, 29 insertions(+), 62 deletions(-) delete mode 100644 SOURCES/99b03c1c18.patch delete mode 100644 SOURCES/openmp-10.0.1.src.tar.xz.sig create mode 100644 SOURCES/openmp-11.0.0rc2.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index e83d8dd..150acb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/hans-gpg-key.asc -SOURCES/openmp-10.0.1.src.tar.xz +SOURCES/openmp-11.0.0rc2.src.tar.xz diff --git a/.libomp.metadata b/.libomp.metadata index 8b46fe9..31d21c8 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1,2 +1,2 @@ 32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc -5c7043bd0c4746a115edb38fe8e587d805b61d12 SOURCES/openmp-10.0.1.src.tar.xz +b83042c13fe005a024cd879c307321b885bee8c7 SOURCES/openmp-11.0.0rc2.src.tar.xz diff --git a/SOURCES/99b03c1c18.patch b/SOURCES/99b03c1c18.patch deleted file mode 100644 index 2de5faf..0000000 --- a/SOURCES/99b03c1c18.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg -index 8ff668a..8e15a38 100644 ---- a/runtime/test/lit.cfg -+++ b/runtime/test/lit.cfg -@@ -100,6 +100,13 @@ if config.operating_system == 'NetBSD': - if config.operating_system in ['Linux', 'Windows']: - config.available_features.add('affinity') - -+import multiprocessing -+try: -+ if multiprocessing.cpu_count() > 1: -+ config.available_features.add('multicpu') -+except NotImplementedError: -+ pass -+ - # to run with icc INTEL_LICENSE_FILE must be set - if 'INTEL_LICENSE_FILE' in os.environ: - config.environment['INTEL_LICENSE_FILE'] = os.environ['INTEL_LICENSE_FILE'] -diff --git a/runtime/test/ompt/teams/parallel_team.c b/runtime/test/ompt/teams/parallel_team.c -index 15d9b6c..96ce0d5 100644 ---- a/runtime/test/ompt/teams/parallel_team.c -+++ b/runtime/test/ompt/teams/parallel_team.c -@@ -1,5 +1,5 @@ - // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s --// REQUIRES: ompt -+// REQUIRES: ompt, multicpu - // UNSUPPORTED: gcc - #include "callback.h" - -diff --git a/runtime/test/ompt/teams/serial_teams.c b/runtime/test/ompt/teams/serial_teams.c -index 64d0c89..abd3db5 100644 ---- a/runtime/test/ompt/teams/serial_teams.c -+++ b/runtime/test/ompt/teams/serial_teams.c -@@ -1,5 +1,5 @@ - // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s --// REQUIRES: ompt -+// REQUIRES: ompt, multicpu - // UNSUPPORTED: gcc - #include "callback.h" diff --git a/SOURCES/lit.fedora.cfg.py b/SOURCES/lit.fedora.cfg.py index 10d1f1f..fe0fa89 100644 --- a/SOURCES/lit.fedora.cfg.py +++ b/SOURCES/lit.fedora.cfg.py @@ -9,7 +9,7 @@ test_root = '%(libomp_test_root)s' % lit_config.params # Lit will default to the compiler used to build openmp, which is gcc, but we # want to run the tests using clang. -config.test_compiler_features = ['clang'] +config.test_compiler_features = ['clang', 'clang-11'] config.test_c_compiler = 'clang' config.test_cxx_compiler = 'clang++' lit_config.load_config(config, '%(libomp_test_root)s/lit.cfg' % lit_config.params) diff --git a/SOURCES/openmp-10.0.1.src.tar.xz.sig b/SOURCES/openmp-10.0.1.src.tar.xz.sig deleted file mode 100644 index c87e0d26f5ed3ceb2fa510b306dde295b356fa13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$&%0lK=_{5TeJF zsfIzFipaPR{xmM!RbW~k#2rIe$x0grK9HnFaLjo{dk@_R3J@8^6Q$J;LT_cs;%$(U z1EFo0e5SR>Rc3^`SMaPqfzR(kLT{6O^2l@~r zG5C6O|9tXewSy&s1OIw#pJJTiuc;egPARAqAa@@^@d5PjUS*%tHCbfIY`OO;Kn;gd za0)FqMMKoMP?2Z+*RA>hZv!Qzo$x8(>t1t|XkHRDRC&gFEoacqvWaMC>eR%~Rv zPGk{pJ6mtqov>}?yrw#*N?%dm?ZyMe@{fVc1t}kh_ByCxS0R$Vy8jETV&8bo z)y7|IFn9CeMD7{*esmV~b_D1jv_A>09Iob&4Z{681zQuzl-63)p~mGyZyj2*!|n(3 z2a9dhF1;d77rnE;6-887w^Q8-@logJ=ie7r=0^Qyp3@pU3#Um(_7! EIIwF89RL6T diff --git a/SOURCES/openmp-11.0.0rc2.src.tar.xz.sig b/SOURCES/openmp-11.0.0rc2.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..e3705feb29c7cfb9519f26ce8de60fc2c69bae14 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j+-$oYbTxkTfz)xuK`!vrogTF_ku0$)DMoB#?55D&uy zE;L%uU8S!N|4Cj{)!dFO;`kU}Qr5UQd&zNSUG{G@Q2s z{~pYLZC!t<daIpD49*M|p zgdx{w0;9$Pt+i6!ctXoG)tiPDVpCISs5KJ81l3@46sU#}s=mya9`xdmP3WS35mY=r9{Tw14^ z0g3mj_@5ODGb+>&Y^Y;Ze`)m2dhGYz%S3-h`6Sf=4^%BXtJXP^sQXAx)1;$yY^1TT zh^2*pG50urWOi?}%kTa2cdU?^{?@2-MMaQPF_iHf{o+{zZ%7j_L}gAOhs!5twbJG! zH^>&$=H)9s<|6(TcdW)C7};j7S3!vN;-oxBXuTL4@Tvfavsa$%fx-r#E!fZL!Y z?Xr}@f&{Qz;xG((ASEH0LWRzzMCyYL&@w_bpoUj>hf#U~xTBtrGWiuhYq0nlpFuJr zTY@3r?prKPp}r+Og&a!J8f`rA_*GS}fkXt1T7y@{YB6R2Ck~zS@5YDg-M4s{bD>XV EN(-+M$p8QV literal 0 HcmV?d00001 diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index 9492dab..b868b81 100644 --- a/SPECS/libomp.spec +++ b/SPECS/libomp.spec @@ -1,5 +1,5 @@ -#%%global rc_ver 6 -%global baserelease 1 +%global rc_ver 2 +%global baserelease 0.1 %global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -10,27 +10,24 @@ %endif Name: libomp -Version: 10.0.1 +Version: 11.0.0 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -%if 0%{?rc_ver:1} -Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz -Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz.sig -%else -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz -Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz.sig -%endif -Source1: run-lit-tests -Source2: lit.fedora.cfg.py -Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig +Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc +Source3: run-lit-tests +Source4: lit.fedora.cfg.py Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch -Patch1: 99b03c1c18.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: ninja-build BuildRequires: elfutils-libelf-devel BuildRequires: perl BuildRequires: perl-Data-Dumper @@ -54,7 +51,7 @@ OpenMP header files. %package test Summary: OpenMP regression tests -Requires: %{name}%{?isa} = %{version} +Requires: %{name}%{?isa} = %{version}-%{release} Requires: %{name}-devel%{?isa} = %{version}-%{release} Requires: clang Requires: llvm @@ -72,7 +69,7 @@ OpenMP regression tests mkdir -p _build cd _build -%cmake .. \ +%cmake .. -GNinja \ -DLIBOMP_INSTALL_ALIASES=OFF \ -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{version}/include \ %if 0%{?__isa_bits} == 64 @@ -81,11 +78,11 @@ cd _build -DOPENMP_LIBDIR_SUFFIX= \ %endif -%make_build +%ninja_build %install -%make_install -C _build +%ninja_install -C _build # Test package setup %global libomp_srcdir %{_datadir}/libomp/src/ @@ -102,20 +99,23 @@ cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime head -n -1 _build/runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg} # Install custom fedora config file -cp %{SOURCE2} %{buildroot}%{lit_fedora_cfg} +cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg} # Patch lit config files to load custom fedora config echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_cfg} # Install test script install -d %{buildroot}%{_libexecdir}/tests/libomp -install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/libomp +install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp # Remove static libraries with equivalent shared libraries rm -rf %{buildroot}%{_libdir}/libarcher_static.a +%check +%ninja_build check-openmp -C _build %files +%license LICENSE.txt %{_libdir}/libomp.so %{_libdir}/libomptarget.so %ifnarch %{arm} @@ -130,6 +130,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %ifnarch %{arm} %{_libdir}/clang/%{version}/include/omp-tools.h %{_libdir}/clang/%{version}/include/ompt.h +# FIXME: This is probably wrong. Seems like LIBOMP_HEADERS_INSTALL may +# not be respected. +%{_includedir}/ompt-multiplex.h %endif %files test @@ -137,6 +140,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Mon Sep 21 2020 sguelton@redhat.com - 11.0.0-0.1.rc2 +- 11.0.0-rc2 Release + * Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1 - 10.0.1 final