From nobody Sat Jul 09 05:46:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 345F212DE4FD; Sat, 9 Jul 2022 05:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfzg766tCz3VpJ; Sat, 9 Jul 2022 05:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657345619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sukuvgJRXlUOy7QkpXX3wKl+MtjCBGvfxCHmNMti1mI=; b=RN4Uh7v+l8p0EowLiQooGpTtTvQzYNd34aUbev9PgrBeZFn0JF1hv1O1YIzDsiRaGcmqU5 YhAu0ilTz5KcDxz/UPWgVU39IPV7DKB7ijBlhFY3NvQ0FTcuQHeq6TGB3fMjGCpbzVz2Nc JkrIyFKqfWznB39fu6TR0Gdj+rFBi+qoDcxQdFZTikNOs67B9/JwxwrpiVOl0D5YuU6nw3 mOHAZabN9gWXAiK81b/aZJ/8f6PLGYV6dCjJGXkiEISyS6kBdnThEI3nM3gHp/yTLz76p6 B2lMt0fVaxvaD3uhuD/l0js1Py0V2uRXTJC/mQ1WcwGb8xJVtSiaIaId1YnR4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfzg75CsDzb16; Sat, 9 Jul 2022 05:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2695kxTZ053931; Sat, 9 Jul 2022 05:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2695kxR8053930; Sat, 9 Jul 2022 05:46:59 GMT (envelope-from git) Date: Sat, 9 Jul 2022 05:46:59 GMT Message-Id: <202207090546.2695kxR8053930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 693e8cb7080c - main - science/trilinos: Enable features needed for Xyce; Eliminate conflict with mpich; Add -lexecinfo List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 693e8cb7080cf17ceba8c87c71b3dab2720d7ed4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657345619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sukuvgJRXlUOy7QkpXX3wKl+MtjCBGvfxCHmNMti1mI=; b=t23GadRsbTKhqsSa3g4VuOo8IC0W4DuBXzATwpcmOOuJb1yThG0psQfUce+4a1jH5MHMtT pegphkgP5ycX0z5uM9nYDkCdKoowHfvN5AkRZhuJVFXjIVlsot/+mlHtUTIzvkuK/S8+hv IAvIEPrySQj42ZTnAwGS8F8RbapeUB4ySFIURcLVuIbKF4LV9tj5CptIePRP9gipQOkOnF 9wFyvjQAj6RY/gcoK/T656dn+6RvX8hRLJUeNWwjgZiqOj3BI1dwSNpoPhnFt1TfCBz/T2 syksP4HhaY1r8PHFh/AzECivdXFnNvHiZQN+pFrRA9gWy0t2OMpCWt0J4Njufg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657345619; a=rsa-sha256; cv=none; b=KNk5/EUak8R0KbGldmEiZJs55M9lYlCa8yx8eQq1NBVpgyiX2ZE1/dnmZ1ZHSvKZEsLsob +ON454Nk3++Rbd4jGj4KTfMvZIB9Dpjz3/m6NfjET4kx59cDpaA2dRpe+FPcsFtkKaSrRa ip59jmo7rKqJK2/VaxDnQP5tUez6yAomYCkJ08vicQISooDeniUfRlZusLtPzVAc1dvH38 Il6gMLcdFAIhC6eAc/+XzOtsY78MFy43M6brzT63bin3ow9cAG0X4KGBij/C54r7WUZvaL l5uK02OHmGqqF10jBifpkMdWo+IIu+ypgpzhU1puY4HtqKCbtLTxfBnaoQ2gBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=693e8cb7080cf17ceba8c87c71b3dab2720d7ed4 commit 693e8cb7080cf17ceba8c87c71b3dab2720d7ed4 Author: Yuri Victorovich AuthorDate: 2022-07-09 05:40:10 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-09 05:46:57 +0000 science/trilinos: Enable features needed for Xyce; Eliminate conflict with mpich; Add -lexecinfo --- science/trilinos/Makefile | 30 +++++++++++++++++++++++++++--- science/trilinos/pkg-plist | 17 ++++++++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile index 41206545d1e4..d84adf0749dc 100644 --- a/science/trilinos/Makefile +++ b/science/trilinos/Makefile @@ -1,6 +1,7 @@ PORTNAME= trilinos DISTVERSIONPREFIX= trilinos-release- DISTVERSION= 13-4-0 +PORTREVISION= 1 CATEGORIES= science # physics MAINTAINER= yuri@FreeBSD.org @@ -13,8 +14,10 @@ BUILD_DEPENDS= bash:shells/bash \ boost-libs>0:devel/boost-libs \ swig:devel/swig \ ${PYNUMPY} -LIB_DEPENDS= libblas.so:math/blas \ - liblapack.so:math/lapack +LIB_DEPENDS= libamd.so:math/suitesparse-amd \ + libblas.so:math/blas \ + liblapack.so:math/lapack \ + libumfpack.so:math/suitesparse-umfpack RUN_DEPENDS= bash:shells/bash USES= cmake compiler:c++14-lang fortran perl5 python shebangfix @@ -28,8 +31,9 @@ SHEBANG_FILES= packages/kokkos/bin/kokkos_launch_compiler \ packages/phalanx/scripts/phalanx_create_evaluator.py CXXFLAGS+= -DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED # fails otherwise with backtrace-related symbol error explicitly printed by Boost +LDFLAGS+= -lexecinfo # only for kokkos (?), to prevent missing symbols -CONFLICTS_INSTALL= mpich kokkos # installs bundled kokkos, need to figure out how to prevent this +CONFLICTS_INSTALL= kokkos # installs bundled kokkos, need to figure out how to prevent this ## configure Trilinos @@ -51,4 +55,24 @@ CMAKE_ARGS+= -DTrilinos_ENABLE_OpenMP:BOOL=OFF #CMAKE_ARGS+= -DMPI_BASE_DIR:PATH="${LOCALBASE}/mpi/openmpi" #CMAKE_ARGS+= -DMPI_BIN_DIR:PATH="${LOCALBASE}/mpi/openmpi/bin" +## additional features/packages required by Xyce + +CMAKE_ON+= EpetraExt_BUILD_BTF +CMAKE_ON+= EpetraExt_BUILD_EXPERIMENTAL +CMAKE_ON+= EpetraExt_BUILD_GRAPH_REORDERINGS +#CMAKE_ON+= Teuchos_ENABLE_COMPLEX # this feature is broken in Trilinos +CMAKE_ON+= Trilinos_ENABLE_COMPLEX_DOUBLE +# Enabling the UMFPACK feature required by the above features. +CMAKE_ON+= TPL_ENABLE_UMFPACK +CMAKE_ON+= TPL_ENABLE_AMD +CMAKE_ARGS+= -DUMFPACK_INCLUDE_DIRS=${LOCALBASE}/include/suitesparse +CMAKE_ARGS+= -DTPL_AMD_INCLUDE_DIRS=${LOCALBASE}/include/suitesparse +CMAKE_ARGS+= -DAMD_LIBRARY_DIRS=${LOCALBASE}/lib + +# users: https://duongdo27.github.io/Trilinos/users.html + +post-install: + # remove MPI headers that it installs + @${RM} ${STAGEDIR}${PREFIX}/include/mpi*.h + .include diff --git a/science/trilinos/pkg-plist b/science/trilinos/pkg-plist index a755e903cee5..22cf80210846 100644 --- a/science/trilinos/pkg-plist +++ b/science/trilinos/pkg-plist @@ -79,6 +79,11 @@ include/Amesos2_TpetraRowMatrix_AbstractMatrixAdapter_decl.hpp include/Amesos2_TpetraRowMatrix_AbstractMatrixAdapter_def.hpp include/Amesos2_TypeDecl.hpp include/Amesos2_TypeMap.hpp +include/Amesos2_Umfpack.hpp +include/Amesos2_Umfpack_FunctionMap.hpp +include/Amesos2_Umfpack_TypeMap.hpp +include/Amesos2_Umfpack_decl.hpp +include/Amesos2_Umfpack_def.hpp include/Amesos2_Util.hpp include/Amesos2_VectorTraits.hpp include/Amesos2_Version.hpp @@ -97,6 +102,7 @@ include/Amesos_Status.h include/Amesos_Support.h include/Amesos_TestRowMatrix.h include/Amesos_Time.h +include/Amesos_Umfpack.h include/Amesos_Utils.h include/Amesos_config.h include/AnasaziBasicEigenproblem.hpp @@ -390,13 +396,18 @@ include/Domi_Utils.hpp include/Domi_Version.hpp include/Domi_config.h include/Domi_getValidParameters.hpp +include/EpetraExt_AMD_CrsGraph.h include/EpetraExt_AmesosAMDGlobal_CrsGraph.h include/EpetraExt_AmesosBTFGlobal_LinearProblem.h include/EpetraExt_AmesosBTF_CrsGraph.h include/EpetraExt_AmesosBTF_CrsMatrix.h +include/EpetraExt_BTF_CrsGraph.h +include/EpetraExt_BTF_CrsMatrix.h +include/EpetraExt_BTF_LinearProblem.h include/EpetraExt_BlockAdjacencyGraph.h include/EpetraExt_BlockCrsMatrix.h include/EpetraExt_BlockDiagMatrix.h +include/EpetraExt_BlockJacobi_LinearProblem.h include/EpetraExt_BlockMapIn.h include/EpetraExt_BlockMapOut.h include/EpetraExt_BlockMultiVector.h @@ -441,6 +452,7 @@ include/EpetraExt_Scale_LinearProblem.h include/EpetraExt_SolverMap_CrsMatrix.h include/EpetraExt_SolverMap_LinearProblem.h include/EpetraExt_SubCopy_CrsMatrix.h +include/EpetraExt_SymmRCM_CrsGraph.h include/EpetraExt_TCrsGraph_MapColoringIndex.h include/EpetraExt_TimedEpetraOperator.hpp include/EpetraExt_Transform.h @@ -6923,11 +6935,6 @@ include/ml_xxt.h include/ml_xyt.h include/mli_solver.h include/mmio_Tpetra.h -include/mpi.h -include/mpi_config.h -include/mpi_implementation.h -include/mpi_profile.h -include/mpi_prototypes.h include/mrtr_convexhull_Def.hpp include/mrtr_function.H include/mrtr_functions.H