packages/eigen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Building opencv,eigen_assert_exception’ is not a member of ‘Eigen’

Browse Source
This commit is contained in:
tanyulong2021 2022-05-23 11:27:29 +08:00
parent 87b58fd8b3
commit 02dd7bb5b6
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0001-rebuild-and-modify-exception-error.patch Normal file
View File

@ -0,0 +1,60 @@
From 4d2d8c2286d83bd343d2619ac19b731a3ff4f4ec Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Tue, 10 May 2022 18:33:38 +0800
Subject: [PATCH] rebuild and modify exception error
---
Eigen/src/Core/products/Parallelizer.h | 15 ++++++---------
test/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h
index 67b2442..ebb80f0 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,12 @@ 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 0747aa6..b025777 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)
--
2.33.0

6
eigen3.spec
View File

@ -2,12 +2,13 @@
Name: eigen3
Version: 3.3.8
Release: 3
Release: 4
Summary: A lightweight C++ template library for vector and matrix math
License: MPLv2.0 and LGPLv2+ and BSD
URL: http://eigen.tuxfamily.org/index.php?title=Main_Page
Source0: https://gitlab.com/libeigen/eigen/-/archive/%{version}/eigen-%{version}.tar.bz2
Patch0: 0001-rebuild-and-modify-exception-error.patch
BuildRequires: cmake
BuildRequires: make
@ -50,6 +51,9 @@ cp -r Eigen %{buildroot}%{_includedir}/%{name}/
%{_includedir}/%{name}
%{_datadir}
%changelog
* Mon May 23 2022 tanyulong <tanyulong@kylinos.cn> - 3.3.8-4
- Building opencv,eigen_assert_exception’ is not a member of ‘Eigen’
* Fri Apr 15 2022 tanyulong <tanyulong@kylinos.cn> - 3.3.8-3
- fix cmake build error