diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/analitza/Makefile | 1 | ||||
-rw-r--r-- | math/ceres-solver/Makefile | 1 | ||||
-rw-r--r-- | math/cgal/Makefile | 1 | ||||
-rw-r--r-- | math/eigen3/Makefile | 23 | ||||
-rw-r--r-- | math/eigen3/distinfo | 6 | ||||
-rw-r--r-- | math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h | 31 | ||||
-rw-r--r-- | math/eigen3/files/patch-test_CMakeLists.txt | 11 | ||||
-rw-r--r-- | math/fcl/Makefile | 1 | ||||
-rw-r--r-- | math/fcl05/Makefile | 1 | ||||
-rw-r--r-- | math/g2o/Makefile | 2 | ||||
-rw-r--r-- | math/ignition-math/Makefile | 2 | ||||
-rw-r--r-- | math/libmesh/Makefile | 2 | ||||
-rw-r--r-- | math/libsemigroups/Makefile | 1 | ||||
-rw-r--r-- | math/moab/Makefile | 1 | ||||
-rw-r--r-- | math/openturns/Makefile | 1 | ||||
-rw-r--r-- | math/py-python-fcl/Makefile | 1 | ||||
-rw-r--r-- | math/scilab/Makefile | 2 | ||||
-rw-r--r-- | math/xlife++/Makefile | 2 |
18 files changed, 76 insertions, 14 deletions
diff --git a/math/analitza/Makefile b/math/analitza/Makefile index 339a981a8b92..e830c587c2b2 100644 --- a/math/analitza/Makefile +++ b/math/analitza/Makefile @@ -2,6 +2,7 @@ PORTNAME= analitza DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= math education kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 224a3c7d4145..3472cd9297ce 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -2,6 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org diff --git a/math/cgal/Makefile b/math/cgal/Makefile index d1480f134088..4ef167d75efc 100644 --- a/math/cgal/Makefile +++ b/math/cgal/Makefile @@ -3,6 +3,7 @@ PORTNAME= cgal PORTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/releases/${DISTNAME}/ DISTNAME= ${PORTNAME:tu}-${PORTVERSION} diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile index 1d42bb236f32..59c5eda36a3d 100644 --- a/math/eigen3/Makefile +++ b/math/eigen3/Makefile @@ -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_COMB= multi 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> diff --git a/math/eigen3/distinfo b/math/eigen3/distinfo index f4f4fb2ffbfc..d318df032633 100644 --- a/math/eigen3/distinfo +++ b/math/eigen3/distinfo @@ -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 diff --git a/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h b/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h new file mode 100644 index 000000000000..660759aff0a9 --- /dev/null +++ b/math/eigen3/files/patch-Eigen_src_Core_products_Parallelizer.h @@ -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 + } + diff --git a/math/eigen3/files/patch-test_CMakeLists.txt b/math/eigen3/files/patch-test_CMakeLists.txt new file mode 100644 index 000000000000..826374bc38f5 --- /dev/null +++ b/math/eigen3/files/patch-test_CMakeLists.txt @@ -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) diff --git a/math/fcl/Makefile b/math/fcl/Makefile index 0d5e2217d2be..c5d9621fe5a2 100644 --- a/math/fcl/Makefile +++ b/math/fcl/Makefile @@ -3,6 +3,7 @@ PORTNAME= fcl DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/fcl05/Makefile b/math/fcl05/Makefile index e771739d0e31..7c836b49d5a7 100644 --- a/math/fcl05/Makefile +++ b/math/fcl05/Makefile @@ -2,6 +2,7 @@ PORTNAME= fcl DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= math PKGNAMESUFFIX= 05 diff --git a/math/g2o/Makefile b/math/g2o/Makefile index 840728676bf0..a766a74dd8ae 100644 --- a/math/g2o/Makefile +++ b/math/g2o/Makefile @@ -3,7 +3,7 @@ PORTNAME= g2o DISTVERSION= 20200410 DISTVERSIONSUFFIX= _git -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/ignition-math/Makefile b/math/ignition-math/Makefile index bda319fcaa88..59a0676530c1 100644 --- a/math/ignition-math/Makefile +++ b/math/ignition-math/Makefile @@ -2,7 +2,7 @@ PORTNAME= ignition-math DISTVERSION= 6.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ diff --git a/math/libmesh/Makefile b/math/libmesh/Makefile index 9c71feb731a4..2e9bd4186b32 100644 --- a/math/libmesh/Makefile +++ b/math/libmesh/Makefile @@ -4,7 +4,7 @@ PORTNAME= libmesh DISTVERSIONPREFIX= v DISTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/libsemigroups/Makefile b/math/libsemigroups/Makefile index e27a3addfd0a..e45c809403ba 100644 --- a/math/libsemigroups/Makefile +++ b/math/libsemigroups/Makefile @@ -3,6 +3,7 @@ PORTNAME= libsemigroups PORTVERSION= 1.3.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= math diff --git a/math/moab/Makefile b/math/moab/Makefile index 39205fa53755..2da2e3dc98ae 100644 --- a/math/moab/Makefile +++ b/math/moab/Makefile @@ -2,6 +2,7 @@ PORTNAME= moab DISTVERSION= 5.2.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ diff --git a/math/openturns/Makefile b/math/openturns/Makefile index b3f155b0c989..ac2dd983de87 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -3,6 +3,7 @@ PORTNAME= openturns DISTVERSIONPREFIX= v DISTVERSION= 1.16 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile index c4e0f60320de..010c4bf37f0e 100644 --- a/math/py-python-fcl/Makefile +++ b/math/py-python-fcl/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-fcl PORTVERSION= 0.0.12 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 1039afea5356..74bcac97861c 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -3,7 +3,7 @@ PORTNAME= scilab PORTVERSION= 6.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} diff --git a/math/xlife++/Makefile b/math/xlife++/Makefile index ca640f597957..24e1f42b6a18 100644 --- a/math/xlife++/Makefile +++ b/math/xlife++/Makefile @@ -2,7 +2,7 @@ PORTNAME= xlife++ DISTVERSION= 2.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MASTER_SITES= https://uma.ensta-paristech.fr/soft/XLiFE++/var/files/src/ DISTNAME= xlifepp-sources-v${DISTVERSION}-2018-05-09 |