summaryrefslogtreecommitdiff
path: root/math/eigen3
diff options
context:
space:
mode:
authorAdriaan de Groot <adridg@FreeBSD.org>2021-02-20 20:38:24 +0000
committerAdriaan de Groot <adridg@FreeBSD.org>2021-02-20 20:38:24 +0000
commitadb0217b380fcd5645b9a39f7ddb80ae0b043ce0 (patch)
tree295203adc3041bec5fb12cf54aac9d23bf7cd068 /math/eigen3
parentgraphics/swappy: update to 1.3.1 (diff)
Update math/eigen3 to latest upstream release
Release notes are at https://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.9 One of our patches was for issue 2011, which is resolved upstream, so that can go. The other patch is not needed anymore either. While here, drop the gl (USE=gl) dependency. This turned out to be needed for tests that aren't built anyway. I mini-exp-ran this by test-compiling all the things that showed fallout in the previous Eigen update. Referenced PR is about gl, not about updating Eigen. PR: 251939
Notes
Notes: svn path=/head/; revision=566187
Diffstat (limited to 'math/eigen3')
-rw-r--r--math/eigen3/Makefile5
-rw-r--r--math/eigen3/distinfo6
-rw-r--r--math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h31
-rw-r--r--math/eigen3/files/patch-test_CMakeLists.txt11
4 files changed, 5 insertions, 48 deletions
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index 59c5eda36a3d..2b5364ae20b9 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= eigen
-PORTVERSION= 3.3.8
+PORTVERSION= 3.3.9
CATEGORIES= math
MASTER_SITES= https://gitlab.com/libeigen/eigen/-/archive/${PORTVERSION}/
@@ -23,8 +23,7 @@ OPTIONS_DEFAULT=FULL
FULL_DESC= Add the support for math dependencies
FULL_CMAKE_ON= -DBLAS_DIR:PATH="${LOCALBASE}"
-FULL_USES= blaslapack:openblas gl pkgconfig
-FULL_USE= GL=gl glew glut
+FULL_USES= blaslapack:openblas pkgconfig
FULL_LIB_DEPENDS= libcholmod.so:math/suitesparse \
libsuperlu.so:math/superlu \
libadolc.so:math/adol-c \
diff --git a/math/eigen3/distinfo b/math/eigen3/distinfo
index d318df032633..d1cf90cc1f69 100644
--- a/math/eigen3/distinfo
+++ b/math/eigen3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604406672
-SHA256 (eigen-3.3.8.tar.bz2) = 0215c6593c4ee9f1f7f28238c4e8995584ebf3b556e9dbf933d84feb98d5b9ef
-SIZE (eigen-3.3.8.tar.bz2) = 1667794
+TIMESTAMP = 1613848877
+SHA256 (eigen-3.3.9.tar.bz2) = 0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677
+SIZE (eigen-3.3.9.tar.bz2) = 1667231
diff --git a/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h b/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h
deleted file mode 100644
index 660759aff0a9..000000000000
--- a/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- Eigen/src/Core/products/Parallelizer.h.orig 2020-10-05 11:24:15 UTC
-+++ Eigen/src/Core/products/Parallelizer.h
-@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows,
-
- 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,
- 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/math/eigen3/files/patch-test_CMakeLists.txt b/math/eigen3/files/patch-test_CMakeLists.txt
deleted file mode 100644
index 826374bc38f5..000000000000
--- a/math/eigen3/files/patch-test_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/CMakeLists.txt.orig 2020-10-05 11:24:15 UTC
-+++ 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)