Attachment #220255 for bug #250833




# $FreeBSD$

PORTNAME=	eigen
PORTVERSION=	3.3.8
CATEGORIES=	math
MASTER_SITES=	https://gitlab.com/libeigen/eigen/-/archive/${PORTVERSION}/
DISTNAME=	${PORTVERSION}
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	kde@FreeBSD.org
COMMENT=	Lightweight library for vector and matrix math

LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
LICENSE_FILE_MPL20=	${WRKSRC}/COPYING.MPL2

CMAKE_ARGS=	-DPKGCONFIG_INSTALL_DIR:PATH="libdata/pkgconfig"
USES=		cmake tar:bzip2
NO_BUILD=	yes
NO_ARCH=	yes

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>

Lines 1-3 Link Here

(-)math/eigen3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1544905503	1	TIMESTAMP = 1604406672
2	SHA256 (eigen/3.3.7.tar.bz2) = 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce	2	SHA256 (eigen-3.3.8.tar.bz2) = 0215c6593c4ee9f1f7f28238c4e8995584ebf3b556e9dbf933d84feb98d5b9ef
3	SIZE (eigen/3.3.7.tar.bz2) = 1665168	3	SIZE (eigen-3.3.8.tar.bz2) = 1667794




--- 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
 }
 

Line 0 Link Here

(-)math/eigen3/files/patch-test_CMakeLists.txt (+11 lines)
	1	--- test/CMakeLists.txt.orig 2020-10-05 11:24:15 UTC
	2	+++ test/CMakeLists.txt
	3	@@ -163,7 +163,7 @@ ei_add_test(constructor)
	4	ei_add_test(linearstructure)
	5	ei_add_test(integer_types)
	6	ei_add_test(unalignedcount)
	7	-if(NOT EIGEN_TEST_NO_EXCEPTIONS)
	8	+if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP)
	9	ei_add_test(exceptions)
	10	endif()
	11	ei_add_test(redux)

Return to bug 250833

Lines 1-11 Link Here

(-)math/eigen3/Makefile (-6 / +17 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= eigen	3	PORTNAME= eigen
4	DISTVERSION= 3.3.7	4	PORTVERSION= 3.3.8
5	CATEGORIES= math	5	CATEGORIES= math
6	MASTER_SITES= https://bitbucket.org/${PORTNAME}/${PORTNAME}/get/	6	MASTER_SITES= https://gitlab.com/libeigen/eigen/-/archive/${PORTVERSION}/
7	DISTNAME= ${PORTVERSION}
8	DIST_SUBDIR= ${PORTNAME}
9		7
10	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
11	COMMENT= Lightweight library for vector and matrix math	9	COMMENT= Lightweight library for vector and matrix math
Lines 15-25 Link Here
15	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL	13	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL
16	LICENSE_FILE_MPL20= ${WRKSRC}/COPYING.MPL2	14	LICENSE_FILE_MPL20= ${WRKSRC}/COPYING.MPL2
17		15
18	CMAKE_ARGS= -DPKGCONFIG_INSTALL_DIR:PATH="${PREFIX}/libdata/pkgconfig"	16	CMAKE_ARGS= -DPKGCONFIG_INSTALL_DIR:PATH="libdata/pkgconfig"
19	USES= cmake tar:bzip2	17	USES= cmake tar:bzip2
20	NO_BUILD= yes	18	NO_BUILD= yes
21	NO_ARCH= yes	19	NO_ARCH= yes
22		20
23	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-323c052e1731	21	OPTIONS_DEFINE= FULL
		22	OPTIONS_DEFAULT=FULL
24		23
		24	FULL_DESC= Add the support for math dependencies
		25	FULL_CMAKE_ON= -DBLAS_DIR:PATH="${LOCALBASE}"
		26	FULL_USES= blaslapack:openblas gl pkgconfig
		27	FULL_USE= GL=gl glew glut
		28	FULL_LIB_DEPENDS= libcholmod.so:math/suitesparse \
		29	libsuperlu.so:math/superlu \
		30	libadolc.so:math/adol-c \
		31	libfftw3.so:math/fftw3 \
		32	libmpfr.so:math/mpfr \
		33	libgmp.so:math/gmp \
		34	libboost_thread.so:devel/boost-libs
		35
25	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 0 Link Here

(-)math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h (+31 lines)
	1	--- Eigen/src/Core/products/Parallelizer.h.orig 2020-10-05 11:24:15 UTC
	2	+++ Eigen/src/Core/products/Parallelizer.h
	3	@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows,
	4
	5	ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0);
	6
	7	- int errorCount = 0;
	8	- #pragma omp parallel num_threads(threads) reduction(+: errorCount)
	9	+ #pragma omp parallel num_threads(threads)
	10	{
	11	Index i = omp_get_thread_num();
	12	// Note that the actual number of threads might be lower than the number of request ones.
	13	@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows,
	14	info[i].lhs_start = r0;
	15	info[i].lhs_length = actualBlockRows;
	16
	17	- EIGEN_TRY {
	18	- if(transpose) func(c0, actualBlockCols, 0, rows, info);
	19	- else func(0, rows, c0, actualBlockCols, info);
	20	- } EIGEN_CATCH(...) {
	21	- ++errorCount;
	22	- }
	23	+ if(transpose)
	24	+ func(c0, actualBlockCols, 0, rows, info);
	25	+ else
	26	+ func(0, rows, c0, actualBlockCols, info);
	27	}
	28	- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception());
	29	#endif
	30	}
	31