git: 381d803a0c96 - main - science/agrum: Update 1.1.1 -> 1.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 29 Jul 2022 08:08:54 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=381d803a0c96f6b6199936e44a2973d158afa38a

commit 381d803a0c96f6b6199936e44a2973d158afa38a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-07-29 07:16:33 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-07-29 08:08:49 +0000

    science/agrum: Update 1.1.1 -> 1.2.0
    
    Also add test target.
---
 science/agrum/Makefile  | 15 ++++++++++++---
 science/agrum/distinfo  |  6 +++---
 science/agrum/pkg-plist | 37 +++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/science/agrum/Makefile b/science/agrum/Makefile
index 56a86b9a06e8..ccffcb4c6bdd 100644
--- a/science/agrum/Makefile
+++ b/science/agrum/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	agrum
-DISTVERSION=	1.1.1
+DISTVERSION=	1.2.0
 CATEGORIES=	science math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -8,14 +8,17 @@ COMMENT=	Graphical modeler for Bayesian networks, influence diagrams, etc
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++14-lang # the 'act' executable uses 'python' and is broken, when act is broken CMakeLists.txt builds with default configuration which is fine
+USES=		cmake compiler:c++17-lang shebangfix # the 'act' executable uses 'python' and is broken, when act is broken CMakeLists.txt builds with default configuration which is fine
 USE_LDCONFIG=	yes
+
 LLD_UNSAFE=	yes
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	agrumery
 GL_PROJECT=	aGrUM
-GL_COMMIT=	1a905d0ecbe18c924a44d6e5024eb81fc252ecf6
+GL_COMMIT=	8141e589aaca335b9582c2ca8bbd6594bc4b174b
+
+SHEBANG_FILES=	act
 
 CMAKE_OFF=	USE_SWIG
 
@@ -48,4 +51,10 @@ PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 			# see wrappers/pyAgrum/requirements.txt and wrappers/pyAgrum/testunits/optional_requirements.txt
 
+BINARY_ALIAS=	gcc=${CC} g++=${CXX} # only for tests, see https://gitlab.com/agrumery/aGrUM/-/issues/100
+
+do-test:
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ./act test release agrum -t all
+
 .include <bsd.port.mk>
diff --git a/science/agrum/distinfo b/science/agrum/distinfo
index e8038912896e..983b684d8e94 100644
--- a/science/agrum/distinfo
+++ b/science/agrum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654925110
-SHA256 (agrumery-aGrUM-1a905d0ecbe18c924a44d6e5024eb81fc252ecf6_GL0.tar.gz) = 8c4fe3f22b020de9e73863a8ed332de928ff26f93fca8e9782e168ea1c29cb17
-SIZE (agrumery-aGrUM-1a905d0ecbe18c924a44d6e5024eb81fc252ecf6_GL0.tar.gz) = 21257133
+TIMESTAMP = 1659066434
+SHA256 (agrumery-aGrUM-8141e589aaca335b9582c2ca8bbd6594bc4b174b_GL0.tar.gz) = 0181d5ae4e90805289afa0b54b751cd0488503b3623908e1048213d553015935
+SIZE (agrumery-aGrUM-8141e589aaca335b9582c2ca8bbd6594bc4b174b_GL0.tar.gz) = 21258413
diff --git a/science/agrum/pkg-plist b/science/agrum/pkg-plist
index 90791e4d66d4..4242291a369c 100644
--- a/science/agrum/pkg-plist
+++ b/science/agrum/pkg-plist
@@ -125,28 +125,15 @@ include/agrum/BN/io/net/netReader_tpl.h
 include/agrum/BN/io/net/netWriter.h
 include/agrum/BN/io/net/netWriter_tpl.h
 include/agrum/BN/learning/BNLearnUtils/BNLearnerListener.h
-include/agrum/BN/learning/BNLearnUtils/genericBNLearner.h
-include/agrum/BN/learning/BNLearnUtils/genericBNLearner_inl.h
-include/agrum/BN/learning/BNLearnUtils/genericBNLearner_tpl.h
+include/agrum/BN/learning/BNLearnUtils/IBNLearner.h
+include/agrum/BN/learning/BNLearnUtils/IBNLearner_inl.h
+include/agrum/BN/learning/BNLearnUtils/IBNLearner_tpl.h
 include/agrum/BN/learning/BNLearner.h
 include/agrum/BN/learning/BNLearner_tpl.h
 include/agrum/BN/learning/K2.h
 include/agrum/BN/learning/K2_inl.h
 include/agrum/BN/learning/K2_tpl.h
 include/agrum/BN/learning/Miic.h
-include/agrum/BN/learning/aprioris/apriori.h
-include/agrum/BN/learning/aprioris/aprioriBDeu.h
-include/agrum/BN/learning/aprioris/aprioriBDeu_inl.h
-include/agrum/BN/learning/aprioris/aprioriDirichletFromDatabase.h
-include/agrum/BN/learning/aprioris/aprioriDirichletFromDatabase_inl.h
-include/agrum/BN/learning/aprioris/aprioriK2.h
-include/agrum/BN/learning/aprioris/aprioriK2_inl.h
-include/agrum/BN/learning/aprioris/aprioriNoApriori.h
-include/agrum/BN/learning/aprioris/aprioriNoApriori_inl.h
-include/agrum/BN/learning/aprioris/aprioriSmoothing.h
-include/agrum/BN/learning/aprioris/aprioriSmoothing_inl.h
-include/agrum/BN/learning/aprioris/aprioriTypes.h
-include/agrum/BN/learning/aprioris/apriori_inl.h
 include/agrum/BN/learning/constraints/structuralConstraint.h
 include/agrum/BN/learning/constraints/structuralConstraintDAG.h
 include/agrum/BN/learning/constraints/structuralConstraintDAG_inl.h
@@ -187,6 +174,20 @@ include/agrum/BN/learning/paramUtils/paramEstimatorML.h
 include/agrum/BN/learning/paramUtils/paramEstimatorML_inl.h
 include/agrum/BN/learning/paramUtils/paramEstimator_inl.h
 include/agrum/BN/learning/paramUtils/paramEstimator_tpl.h
+include/agrum/BN/learning/priors/DirichletPriorFromBN.h
+include/agrum/BN/learning/priors/DirichletPriorFromBN_tpl.h
+include/agrum/BN/learning/priors/DirichletPriorFromDatabase.h
+include/agrum/BN/learning/priors/DirichletPriorFromDatabase_inl.h
+include/agrum/BN/learning/priors/K2Prior.h
+include/agrum/BN/learning/priors/K2Prior_inl.h
+include/agrum/BN/learning/priors/bdeuPrior.h
+include/agrum/BN/learning/priors/bdeuPrior_inl.h
+include/agrum/BN/learning/priors/noPrior.h
+include/agrum/BN/learning/priors/noPrior_inl.h
+include/agrum/BN/learning/priors/prior.h
+include/agrum/BN/learning/priors/prior_inl.h
+include/agrum/BN/learning/priors/smoothingPrior.h
+include/agrum/BN/learning/priors/smoothingPrior_inl.h
 include/agrum/BN/learning/scores_and_tests/score.h
 include/agrum/BN/learning/scores_and_tests/scoreAIC.h
 include/agrum/BN/learning/scores_and_tests/scoreAIC_inl.h
@@ -877,6 +878,8 @@ include/agrum/tools/variables/IContinuousVariable.h
 include/agrum/tools/variables/IContinuousVariable_inl.h
 include/agrum/tools/variables/IDiscretizedVariable.h
 include/agrum/tools/variables/IDiscretizedVariable_inl.h
+include/agrum/tools/variables/allDiscreteVariables.h
+include/agrum/tools/variables/allDiscreteVariables_tpl.h
 include/agrum/tools/variables/continuousVariable.h
 include/agrum/tools/variables/continuousVariable_inl.h
 include/agrum/tools/variables/continuousVariable_tpl.h
@@ -890,8 +893,6 @@ include/agrum/tools/variables/labelizedVariable.h
 include/agrum/tools/variables/labelizedVariable_inl.h
 include/agrum/tools/variables/rangeVariable.h
 include/agrum/tools/variables/rangeVariable_inl.h
-include/agrum/tools/variables/allDiscreteVariables.h
-include/agrum/tools/variables/allDiscreteVariables_tpl.h
 include/agrum/tools/variables/variable.h
 include/agrum/tools/variables/variable_inl.h
 lib/cmake/aGrUM/aGrUMConfig.cmake