Attachment 220255 Details for Bug 250833 – Upgrade to 3.3.8 with latest patches

[patch] Upgrade to 3.3.8 with latest patches

math_eigen3.diff (text/plain), 4.65 KB, created by Thierry Thomas on 2020-12-04 18:59:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2020-12-04 18:59:13 UTC

Size: 4.65 KB

patch

obsolete

>Index: math/eigen3/Makefile
>===================================================================
>--- math/eigen3/Makefile	(revision 556570)
>+++ math/eigen3/Makefile	(working copy)
>@@ -1,11 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	eigen
>-DISTVERSION=	3.3.7
>+PORTVERSION=	3.3.8
> CATEGORIES=	math
>-MASTER_SITES=	https://bitbucket.org/${PORTNAME}/${PORTNAME}/get/
>-DISTNAME=	${PORTVERSION}
>-DIST_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	https://gitlab.com/libeigen/eigen/-/archive/${PORTVERSION}/
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Lightweight library for vector and matrix math
>@@ -15,11 +13,24 @@
> LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
> LICENSE_FILE_MPL20=	${WRKSRC}/COPYING.MPL2
> 
>-CMAKE_ARGS=	-DPKGCONFIG_INSTALL_DIR:PATH="${PREFIX}/libdata/pkgconfig"
>+CMAKE_ARGS=	-DPKGCONFIG_INSTALL_DIR:PATH="libdata/pkgconfig"
> USES=		cmake tar:bzip2
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-323c052e1731
>+OPTIONS_DEFINE=	FULL
>+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_LIB_DEPENDS=	libcholmod.so:math/suitesparse	\
>+			libsuperlu.so:math/superlu	\
>+			libadolc.so:math/adol-c		\
>+			libfftw3.so:math/fftw3		\
>+			libmpfr.so:math/mpfr		\
>+			libgmp.so:math/gmp		\
>+			libboost_thread.so:devel/boost-libs
>+
> .include <bsd.port.mk>
>Index: math/eigen3/distinfo
>===================================================================
>--- math/eigen3/distinfo	(revision 556570)
>+++ math/eigen3/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1544905503
>-SHA256 (eigen/3.3.7.tar.bz2) = 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce
>-SIZE (eigen/3.3.7.tar.bz2) = 1665168
>+TIMESTAMP = 1604406672
>+SHA256 (eigen-3.3.8.tar.bz2) = 0215c6593c4ee9f1f7f28238c4e8995584ebf3b556e9dbf933d84feb98d5b9ef
>+SIZE (eigen-3.3.8.tar.bz2) = 1667794
>Index: math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h
>===================================================================
>--- math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h	(nonexistent)
>+++ math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h	(working copy)
>@@ -0,0 +1,31 @@
>+--- 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
>+ }
>+ 
>
>Property changes on: math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: math/eigen3/files/patch-test_CMakeLists.txt
>===================================================================
>--- math/eigen3/files/patch-test_CMakeLists.txt	(nonexistent)
>+++ math/eigen3/files/patch-test_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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)
>
>Property changes on: math/eigen3/files/patch-test_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250833: 219325 | 220255