commit c115611d58c0d13bafe2675ecb986629063dbb4a
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 22 21:52:16 2023 +0100
- updated to 3.4.0
- removed obsolete buildtype,error-counting patches
eigen3-buildtype.patch | 16 ----------------
eigen3.spec | 12 ++++--------
error-counting.patch | 46 ----------------------------------------------
3 files changed, 4 insertions(+), 70 deletions(-)
---
diff --git a/eigen3.spec b/eigen3.spec
index abf4c04..b5aacee 100644
--- a/eigen3.spec
+++ b/eigen3.spec
@@ -6,17 +6,15 @@
Summary: C++ template library for linear algebra
Summary(pl.UTF-8): Biblioteka szablonów C++ do algebry liniowej
Name: eigen3
-Version: 3.3.8
-Release: 2
+Version: 3.4.0
+Release: 1
License: MPL v2.0 with LGPL v2.1+ parts
Group: Development/Libraries
#Source0Download: http://eigen.tuxfamily.org/index.php?title=Main_Page
Source0:
https://gitlab.com/libeigen/eigen/-/archive/%{version}/eigen-%{version}.tar.bz2
-# Source0-md5: 432ef01499d514f4606343276afa0ec3
-Patch0: %{name}-buildtype.patch
-Patch1: error-counting.patch
+# Source0-md5: 132dde48fe2b563211675626d29f1707
URL: http://eigen.tuxfamily.org/
-BuildRequires: cmake >= 2.8.5
+BuildRequires: cmake >= 3.5.0
%{?with_gdb:BuildRequires: python-modules}
BuildRequires: rpmbuild(macros) >= 1.605
Requires: libstdc++-devel
@@ -85,8 +83,6 @@ do pliku ~/.gdbinit .
%prep
%setup -q -n eigen-%{version}
-%patch0 -p1
-%patch1 -p1
%build
install -d build
diff --git a/eigen3-buildtype.patch b/eigen3-buildtype.patch
deleted file mode 100644
index 811943d..0000000
--- a/eigen3-buildtype.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- eigen-eigen-13a11181fc5a/CMakeLists.txt.orig 2011-12-06
14:15:10.000000000 +0100
-+++ eigen-eigen-13a11181fc5a/CMakeLists.txt 2012-01-31 17:26:58.373450532
+0100
-@@ -14,13 +14,6 @@
- set(CMAKE_BUILD_TYPE "Release")
- endif()
-
--string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
--if( NOT cmake_build_type_tolower STREQUAL "debug"
-- AND NOT cmake_build_type_tolower STREQUAL "release"
-- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
-- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed
values are Debug, Release, RelWithDebInfo (case-insensitive).")
--endif()
--
-
- #############################################################################
- # retrieve version infomation #
diff --git a/error-counting.patch b/error-counting.patch
deleted file mode 100644
index 91ba0d6..0000000
--- a/error-counting.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Eigen/src/Core/products/Parallelizer.h
b/Eigen/src/Core/products/Parallelizer.h
-index
67b2442b53a114af3c08829af4344acc6be7a42f..a3cc05b77bbd19466e7f969d37ec18085ba3d36c
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
0747aa6cb65a40a47fdee2685a2798f93c481ea0..b0257778082143ce27fc847cf163e845fa2afd1e
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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eigen3.git/commitdiff/c115611d58c0d13bafe2675ecb986629063dbb4a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
