pool/eigen3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 843973 from home:StefanBruens:branches:science

Browse Source 
- Fix compilation error when using Eigen3 with OpenMP:
  *  Remove-error-counting-in-OpenMP-parallelize_gemm.patch

OBS-URL: https://build.opensuse.org/request/show/843973
OBS-URL: https://build.opensuse.org/package/show/science/eigen3?expand=0&rev=33
This commit is contained in:
Atri Bhattacharya 2020-10-26 10:07:14 +00:00 committed by Git OBS Bridge
parent b4b27e89e0
commit 9861383636
3 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Remove-error-counting-in-OpenMP-parallelize_gemm.patch Normal file
View File

@ -0,0 +1,64 @@
From ef3cc72cb65e2d500459c178c63e349bacfa834f Mon Sep 17 00:00:00 2001
From: Luke Peterson <hazelnusse@gmail.com>
Date: Thu, 8 Oct 2020 12:16:53 -0700
Subject: [PATCH] Remove error counting in OpenMP parallelize_gemm
This resolves a compilation error associated with
Eigen::eigen_assert_exception. It also eliminates the counting of
exceptions that may occur in the OpenMP parallel section. If an
unhandled exception occurs in this section, the behavior is non-conforming
according to the OpenMP specification.
---
Eigen/src/Core/products/Parallelizer.h | 14 +++++---------
test/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h
index 67b2442b5..a3cc05b77 100644
--- a/Eigen/src/Core/products/Parallelizer.h
+++ b/Eigen/src/Core/products/Parallelizer.h
@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0);
- int errorCount = 0;
- #pragma omp parallel num_threads(threads) reduction(+: errorCount)
+ #pragma omp parallel num_threads(threads)
{
Index i = omp_get_thread_num();
// Note that the actual number of threads might be lower than the number of request ones.
@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
info[i].lhs_start = r0;
info[i].lhs_length = actualBlockRows;
- EIGEN_TRY {
- if(transpose) func(c0, actualBlockCols, 0, rows, info);
- else func(0, rows, c0, actualBlockCols, info);
- } EIGEN_CATCH(...) {
- ++errorCount;
- }
+ if(transpose)
+ func(c0, actualBlockCols, 0, rows, info);
+ else
+ func(0, rows, c0, actualBlockCols, info);
}
- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception());
#endif
}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0747aa6cb..b02577780 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -163,7 +163,7 @@ ei_add_test(constructor)
ei_add_test(linearstructure)
ei_add_test(integer_types)
ei_add_test(unalignedcount)
-if(NOT EIGEN_TEST_NO_EXCEPTIONS)
+if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP)
ei_add_test(exceptions)
endif()
ei_add_test(redux)
--
GitLab

6
eigen3.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 25 21:45:11 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix compilation error when using Eigen3 with OpenMP:
* Remove-error-counting-in-OpenMP-parallelize_gemm.patch
-------------------------------------------------------------------
Thu Oct 15 13:23:17 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

3
eigen3.spec
View File

@ -43,6 +43,8 @@ Patch3: 01_install_FindEigen3.patch
Patch4: eigen3-3.3.1-fixcmake.patch
# PATCH-FIX-UPSTREAM eigen3-CastXML-support-for-aarch64.patch badshah400@gmail.com -- Add CastXML support for ARM aarch64 [https://gitlab.com/libeigen/eigen/-/issues/1979]
Patch5: eigen3-CastXML-support-for-aarch64.patch
# PATCH-FIX-UPSTREAM -- https://gitlab.com/libeigen/eigen/-/merge_requests/232
Patch6: Remove-error-counting-in-OpenMP-parallelize_gemm.patch
BuildRequires: adolc-devel
BuildRequires: cmake
BuildRequires: fftw3-devel
@ -103,6 +105,7 @@ for Linear Algebra
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
# Fix rpmlint warning "wrong-file-end-of-line-encoding"
sed -i 's/\r$//' COPYING.MINPACK