import libomp-11.0.0-0.1.rc2.module+el8.4.0+8278+baa0f59e

This commit is contained in:
CentOS Sources 2020-10-20 06:15:16 +00:00 committed by Andrew Lukoshko
parent 7ed46cae8b
commit 626d9183ec
7 changed files with 29 additions and 62 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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)

Binary file not shown.

Binary file not shown.

View File

@ -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