<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/209c96f3b098b2a0c4d7bd2d15753de6838e39e6">https://github.com/macports/macports-ports/commit/209c96f3b098b2a0c4d7bd2d15753de6838e39e6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 209c96f3b09 eigen3: Update to 3.3.9 (#9665)
</span>209c96f3b09 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 209c96f3b098b2a0c4d7bd2d15753de6838e39e6
</span>Author: Eric A. Borisch <borisch.eric@mayo.edu>
AuthorDate: Fri Jan 8 14:44:33 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> eigen3: Update to 3.3.9 (#9665)
</span>---
math/eigen3/Portfile | 11 +++++-----
math/eigen3/files/openmp_fix.diff | 43 ---------------------------------------
2 files changed, 5 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/eigen3/Portfile b/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b261d940eba..2be99bf92ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +18,14 @@ platforms darwin
</span> depends_build-append port:pkgconfig
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.setup libeigen eigen 3.3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.setup libeigen eigen 3.3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts eigen3-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles openmp_fix.diff
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 af037485f91b43ef4e6622b14ba9c0de1b521679 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0215c6593c4ee9f1f7f28238c4e8995584ebf3b556e9dbf933d84feb98d5b9ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1667794
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f100af009a9b72532653d0e90eb81f12379f97a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1667231
</span> }
subport eigen3-devel {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/eigen3/files/openmp_fix.diff b/math/eigen3/files/openmp_fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b407e82dc40..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/eigen3/files/openmp_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/libeigen/eigen/-/issues/2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Eigen/src/Core/products/Parallelizer.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Eigen/src/Core/products/Parallelizer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int errorCount = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #pragma omp parallel num_threads(threads) reduction(+: errorCount)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #pragma omp parallel num_threads(threads)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Index i = omp_get_thread_num();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Note that the actual number of threads might be lower than the number of request ones.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info[i].lhs_start = r0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info[i].lhs_length = actualBlockRows;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EIGEN_TRY {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(transpose) func(c0, actualBlockCols, 0, rows, info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else func(0, rows, c0, actualBlockCols, info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } EIGEN_CATCH(...) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ++errorCount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(transpose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ func(c0, actualBlockCols, 0, rows, info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ func(0, rows, c0, actualBlockCols, info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,7 @@ ei_add_test(constructor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_add_test(linearstructure)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_add_test(integer_types)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_add_test(unalignedcount)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(NOT EIGEN_TEST_NO_EXCEPTIONS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_add_test(exceptions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ei_add_test(redux)
</span></pre><pre style='margin:0'>
</pre>