From nobody Tue Aug 23 02:34:55 2022 X-Original-To: dev-commits-ports-all@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 4MBYGm18pFz4Z5nY; Tue, 23 Aug 2022 02:34:56 +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 4MBYGm0cndz3H76; Tue, 23 Aug 2022 02:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661222096; 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=E/JvUPVIQz48sSwl/RjNE9xvmsSK2My4UO5jswkvhMc=; b=FTjEzB3u+1jPO3I6j88uXgFS3aku/AiPDWYvd+juqFOLyAyPxfVzZV7azenEV6MtcURMf/ rDKoSYeqQ+L2CSCMXUl75nWqNIoWLeMCnIUivrQ0TorJO/zAJnNZ65z5VKwonAWIOyKU+h nkC1J4vebrKUiQ0/efxk6YsEQzpPGG2ukgcWW8AaTq/T4JhpYeVlYEH25tF3+9yrfJl/5s 2I2ne6gjHWLymjLKJkRtePpVL4MGhRBM+IDc062jT3i27SV0Llf1/EDmh8nh6vqIVGcEPr bq4VcPbjBHnX/EVEIrxHzCIIsl7rGrOaUxc5e5brltl3tkdnUVtoQcKywikgDQ== 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 4MBYGl6mfdz1Csc; Tue, 23 Aug 2022 02:34:55 +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 27N2Yt99014721; Tue, 23 Aug 2022 02:34:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27N2YtYB014720; Tue, 23 Aug 2022 02:34:55 GMT (envelope-from git) Date: Tue, 23 Aug 2022 02:34:55 GMT Message-Id: <202208230234.27N2YtYB014720@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: 9b095bd2447f - main - science/axom: Add option group MPI with options NOMPI,MPICH,OPENMPI List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 9b095bd2447f80d0cc9aec7fe18703cdcc543a05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661222096; 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=E/JvUPVIQz48sSwl/RjNE9xvmsSK2My4UO5jswkvhMc=; b=kEPbbaD/ex0rqZUBK8Lg6xAcew7V9QBUUa1n9s24gjGROjFu57rB5bvc1Negg6MTx2JTw3 Zc8hSO7xTf4PATr7ji6JlGZIlpemY6erUvFtZNoatUF07AG2VrxZqKH1GnaExA8b3Z1Ood AZF3fyWU5f+5p/QAn4g5VP6AzQ6uOkhCZtpuhloSc87dulkzATyVEPT4ZCx2AWazX6w4yE e2A6lKb0KKoVFoXW4AAn9W44oh2DYEY79vZhY3W7vEsB+uwUf1+H1gE4RJdYtlhDvVQviO 4j7YyFB6bC9zQ4q85+aMQrJCfUHU3R17VMkfwGlSfhaPBY/5bvvgm+RszrBohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661222096; a=rsa-sha256; cv=none; b=I6voCz1TVp6KLBmDGUCY7pf9aYm3mswzwBbQPo1E3qxIpW9vTyWTW1FroEY4N5tnMuFBdq ciy1dU8kastdcArVSjdyWpkhrslpLopazMWBfSNrKU/LJyq9J1rgmJw7AHrU2H0+tIPDfO i7DjNeDhxIZ25QgZHUD8rBt+MYLzAieVQ7dMeaSWei8J0KoA+HQTbV/A5R82JRQiqd9rgz Kdn5YBeUoRVEiXrHoYKRRnOr08m99iTd01lmAHgu+hIdDbGAN3LH0nKshWgJYPCo3v8P8n Tb2F53k51bJHxigLHSOnrS/kY0OcThKWvUIFP8PzdzP+70Z5dVpqmV7KjHVe6A== 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=9b095bd2447f80d0cc9aec7fe18703cdcc543a05 commit 9b095bd2447f80d0cc9aec7fe18703cdcc543a05 Author: Yuri Victorovich AuthorDate: 2022-08-23 02:34:04 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-23 02:34:53 +0000 science/axom: Add option group MPI with options NOMPI,MPICH,OPENMPI --- science/axom/Makefile | 19 ++++++++++++++----- science/axom/pkg-plist | 32 ++++++++++++++++---------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/science/axom/Makefile b/science/axom/Makefile index 0d9a1c76c253..70a50525793a 100644 --- a/science/axom/Makefile +++ b/science/axom/Makefile @@ -1,6 +1,7 @@ PORTNAME= axom DISTVERSIONPREFIX= v DISTVERSION= 0.6.1-1671 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g88cac2607 CATEGORIES= science @@ -41,8 +42,10 @@ WRKSRC_SUBDIR= src CONFLICTS_INSTALL= libfmt # bundles and installs an incompatible libfmt version: https://github.com/LLNL/axom/issues/561, axom headers include fmt unnecessarily -OPTIONS_DEFINE= LUA MFEM MPI OPENMP -OPTIONS_DEFAULT= LUA MFEM MPI #OPENMP LUA,MFEM,MPI are required for LLNL/serac +OPTIONS_DEFINE= LUA MFEM OPENMP +OPTIONS_SINGLE= MPI +OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI +OPTIONS_DEFAULT= LUA MFEM MPICH #OPENMP LUA,MFEM,MPI are required for LLNL/serac OPTIONS_SUB= yes LUA_USES= lua:54 @@ -54,9 +57,14 @@ MFEM_DESC= Use mfem - library for finite element methods MFEM_CMAKE_ON= -DMFEM_DIR=${LOCALBASE} MFEM_LIB_DEPENDS= libmfem.so:math/mfem -MPI_CMAKE_BOOL= ENABLE_MPI -MPI_BUILD_DEPENDS= openmpi>0:net/openmpi -MPI_RUN_DEPENDS= openmpi>0:net/openmpi +NOMPI_DESC= Build without parallel processing support +NOMPI_BROKEN= https://github.com/LLNL/axom/issues/913 + +MPICH_USES= mpi:mpich +MPICH_CMAKE_ON= -DENABLE_MPI=ON + +OPENMPI_USES= mpi:openmopi +OPENMPI_CMAKE_ON= -DENABLE_MPI=ON OPENMP_CMAKE_BOOL= ENABLE_OPENMP OPENMP_BROKEN= https://github.com/LLNL/axom/issues/911 @@ -65,5 +73,6 @@ post-install: # installs headers of a third party library sparsehash: https://gi @${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash # 2 tests are known to fail, see https://github.com/LLNL/axom/issues/912 +# tests don't run in newer revisions, see https://github.com/LLNL/axom/issues/915 .include diff --git a/science/axom/pkg-plist b/science/axom/pkg-plist index f7c862e272f9..7259d01e6201 100644 --- a/science/axom/pkg-plist +++ b/science/axom/pkg-plist @@ -1,4 +1,4 @@ -%%MPI%%bin/convert_sidre_protocol +%%NO_NOMPI%%bin/convert_sidre_protocol %%MFEM%%bin/data_collection_util bin/mesh_tester include/axom/CLI11.hpp @@ -88,15 +88,15 @@ include/axom/klee/KleeError.hpp include/axom/klee/Shape.hpp include/axom/klee/ShapeSet.hpp include/axom/klee/Units.hpp -%%MPI%%include/axom/lumberjack.hpp -%%MPI%%include/axom/lumberjack/BinaryTreeCommunicator.hpp -%%MPI%%include/axom/lumberjack/Combiner.hpp -%%MPI%%include/axom/lumberjack/Communicator.hpp -%%MPI%%include/axom/lumberjack/Lumberjack.hpp -%%MPI%%include/axom/lumberjack/MPIUtility.hpp -%%MPI%%include/axom/lumberjack/Message.hpp -%%MPI%%include/axom/lumberjack/RootCommunicator.hpp -%%MPI%%include/axom/lumberjack/TextEqualityCombiner.hpp +%%NO_NOMPI%%include/axom/lumberjack.hpp +%%NO_NOMPI%%include/axom/lumberjack/BinaryTreeCommunicator.hpp +%%NO_NOMPI%%include/axom/lumberjack/Combiner.hpp +%%NO_NOMPI%%include/axom/lumberjack/Communicator.hpp +%%NO_NOMPI%%include/axom/lumberjack/Lumberjack.hpp +%%NO_NOMPI%%include/axom/lumberjack/MPIUtility.hpp +%%NO_NOMPI%%include/axom/lumberjack/Message.hpp +%%NO_NOMPI%%include/axom/lumberjack/RootCommunicator.hpp +%%NO_NOMPI%%include/axom/lumberjack/TextEqualityCombiner.hpp include/axom/mint.hpp include/axom/mint/config.hpp include/axom/mint/deprecated/MCArray.hpp @@ -197,7 +197,7 @@ include/axom/quest.hpp include/axom/quest/AllNearestNeighbors.hpp include/axom/quest/Delaunay.hpp include/axom/quest/Discretize.hpp -%%MPI%%include/axom/quest/DistributedClosestPoint.hpp +%%NO_NOMPI%%include/axom/quest/DistributedClosestPoint.hpp include/axom/quest/InOutOctree.hpp %%MFEM%%include/axom/quest/IntersectionShaper.hpp include/axom/quest/MeshTester.hpp @@ -221,7 +221,7 @@ include/axom/quest/interface/inout.hpp include/axom/quest/interface/internal/QuestHelpers.hpp include/axom/quest/interface/internal/mpicomm_wrapper.hpp include/axom/quest/interface/signed_distance.hpp -%%MPI%%include/axom/quest/readers/PSTLReader.hpp +%%NO_NOMPI%%include/axom/quest/readers/PSTLReader.hpp include/axom/quest/readers/STLReader.hpp include/axom/sidre.hpp include/axom/sidre/core/Array.hpp @@ -238,8 +238,8 @@ include/axom/sidre/core/MapCollection.hpp include/axom/sidre/core/SidreDataTypeIds.h include/axom/sidre/core/SidreTypes.hpp include/axom/sidre/core/View.hpp -%%MPI%%include/axom/sidre/spio/IOBaton.hpp -%%MPI%%include/axom/sidre/spio/IOManager.hpp +%%NO_NOMPI%%include/axom/sidre/spio/IOBaton.hpp +%%NO_NOMPI%%include/axom/sidre/spio/IOManager.hpp include/axom/slam.hpp include/axom/slam/BitSet.hpp include/axom/slam/BivariateMap.hpp @@ -281,8 +281,8 @@ include/axom/slic/interface/slic.hpp include/axom/slic/interface/slic_macros.hpp include/axom/slic/internal/stacktrace.hpp include/axom/slic/streams/GenericOutputStream.hpp -%%MPI%%include/axom/slic/streams/LumberjackStream.hpp -%%MPI%%include/axom/slic/streams/SynchronizedStream.hpp +%%NO_NOMPI%%include/axom/slic/streams/LumberjackStream.hpp +%%NO_NOMPI%%include/axom/slic/streams/SynchronizedStream.hpp %%LUA%%include/axom/sol.hpp %%LUA%%include/axom/sol_forward.hpp include/axom/sparsehash/README