Compare commits
No commits in common. "6784f7f0ac02f51749168935f31c4f8302ff2cc2" and "3f8af8ac60bf4d414626a00a9e67351fb8e1f119" have entirely different histories.
6784f7f0ac
...
3f8af8ac60
@ -1,60 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
36
README.en.md
Normal file
36
README.en.md
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
# eigen
|
||||||
|
|
||||||
|
#### Description
|
||||||
|
a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.
|
||||||
|
|
||||||
|
#### Software Architecture
|
||||||
|
Software architecture description
|
||||||
|
|
||||||
|
#### Installation
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Instructions
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Contribution
|
||||||
|
|
||||||
|
1. Fork the repository
|
||||||
|
2. Create Feat_xxx branch
|
||||||
|
3. Commit your code
|
||||||
|
4. Create Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### Gitee Feature
|
||||||
|
|
||||||
|
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||||
|
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||||
|
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||||
|
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
37
README.md
Normal file
37
README.md
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
# eigen
|
||||||
|
|
||||||
|
#### 介绍
|
||||||
|
a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.
|
||||||
|
|
||||||
|
#### 软件架构
|
||||||
|
软件架构说明
|
||||||
|
|
||||||
|
|
||||||
|
#### 安装教程
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### 使用说明
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### 参与贡献
|
||||||
|
|
||||||
|
1. Fork 本仓库
|
||||||
|
2. 新建 Feat_xxx 分支
|
||||||
|
3. 提交代码
|
||||||
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### 码云特技
|
||||||
|
|
||||||
|
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
||||||
|
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||||
|
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
|
||||||
|
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
Binary file not shown.
@ -1,4 +0,0 @@
|
|||||||
version_control: git
|
|
||||||
src_repo: https://gitlab.com/libeigen/eigen.git
|
|
||||||
tag_prefix: ""
|
|
||||||
seperator: .
|
|
||||||
65
eigen3.spec
65
eigen3.spec
@ -1,65 +0,0 @@
|
|||||||
%global debug_package %{nil}
|
|
||||||
|
|
||||||
Name: eigen3
|
|
||||||
Version: 3.3.8
|
|
||||||
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
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: doxygen
|
|
||||||
|
|
||||||
%description
|
|
||||||
%{summary}.
|
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: A lightweight C++ template library for vector and matrix math
|
|
||||||
BuildArch: noarch
|
|
||||||
# -devel subpkg only atm, compat with other distros
|
|
||||||
Provides: %{name} = %{version}-%{release}
|
|
||||||
# not *strictly* a -static pkg, but the results are the same
|
|
||||||
Provides: %{name}-static = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
%{summary}.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -p1 -n eigen-%{version}
|
|
||||||
|
|
||||||
%build
|
|
||||||
mkdir build_dir
|
|
||||||
pushd build_dir
|
|
||||||
%cmake ../ -DINCLUDE_INSTALL_DIR=include/%{name}
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
|
||||||
mkdir -p %{buildroot}%{_includedir}/%{name}/
|
|
||||||
cp -r unsupported %{buildroot}%{_includedir}/%{name}/
|
|
||||||
cp -r Eigen %{buildroot}%{_includedir}/%{name}/
|
|
||||||
%make_install -C build_dir
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%license COPYING.README COPYING.BSD COPYING.MPL2 COPYING.LGPL
|
|
||||||
%defattr(0644, root, root, 0755)
|
|
||||||
%{_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
|
|
||||||
|
|
||||||
* Sat Mar 27 2021 herengui <herengui@uniontech.com> - 3.3.8-2
|
|
||||||
- fix empty include directory issue
|
|
||||||
|
|
||||||
* Tue Dec 1 2020 hubble_zhu<hubble_zhu@qq.com> - 3.3.8-1
|
|
||||||
- package init
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user