From nobody Tue Aug 23 01:26:56 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 4MBWmJ4bDnz4Yx9C; Tue, 23 Aug 2022 01:26: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 4MBWmJ42Ypz49mW; Tue, 23 Aug 2022 01:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661218016; 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=rerxWDlm3AewqcMjntXIwu5SnZsAwaM0DYDY1aalUyE=; b=gaXozLvDMfHdOHcBTlm6Dk5r0b0+Lsmeab/JNSA9/XPwPGEEePmxriMWDFEgub9TH3cX26 3/dZWI0od5e07JYfUfqj0ydfaXP5nlCSYgRhQ8komBua4ShPXtnF9obQh2sfArlSnF7a85 GUWbIEfV2+HGlKMQ7pUYsF7lmTDnagmdbp1xYRtPu9XMcU6KtvYyPTPoZOhkGf9wHNzb65 xFNb6oNkvSAqsOMcfsBarIQWglRHaVMD++IExZLHECr1Dp1OTGJ98XtI5jM3H7Ek7dq7Si n3Moy1M8Kr2vVC+Tq2E9thVAw+cLe8FusLlQD+d/3UNd5BB5dzDyzIAbvgJDrQ== 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 4MBWmJ35Rkz19th; Tue, 23 Aug 2022 01:26:56 +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 27N1QuFO016779; Tue, 23 Aug 2022 01:26:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27N1Qupl016778; Tue, 23 Aug 2022 01:26:56 GMT (envelope-from git) Date: Tue, 23 Aug 2022 01:26:56 GMT Message-Id: <202208230126.27N1Qupl016778@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: e30ce086a7a3 - main - science/conduit: Add MPI options NOMPI,MPICH,OPENMPI; Change default 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: e30ce086a7a37fae1179cced3cda8e2696029b3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661218016; 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=rerxWDlm3AewqcMjntXIwu5SnZsAwaM0DYDY1aalUyE=; b=gLuN2qwaefxeJgJ0msCPHDzZcwFvQT0xsm8l4Pd5/3ZiIdnqmz5iVXfFW/+Xvi4UWRN8ox NUnpFI7MgaMGDAvDSA28FJCZxev3yc2yEdnLP6nsc2NSKn5dfOSmvtmafZ1lLv1k8aGnD4 ylUXcAXyQrnrCapzEky73Y6tFmhYy/E2dtiRH6yGo6gtEw5LvhNsEDV6p308WXwvEq4tNq ozNJEkFobP0tZ17FcBZaVfgTSj/xFXsBasNiZQ4ZW2sbwaEK0tsatXorNF68oW5gpEPFg+ vewzjNx315crEdhIZu2TkrVzxVgH9iV4SllEoE0kWcGfV2U0tpGKaCWqHCN9Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661218016; a=rsa-sha256; cv=none; b=gty2ZJcJeaO8lGfurwKqYiBcO9+UbVUxYlIEHz+m+GnyxA3pSx5Y+ZyC4tmN3tOol82nCQ vdLCLEYDUUNYdSgRch52JzWxQ+1mqGAN0xkiHGGtxOjpbaVGGPuLLN/DrKPj9Llyhrq5gx e7tdxF0qFn1rqwSgSmIGHtfW9sWhdOtbTa5KHy5KEEOif6mxrxlZbaCmIyME8orrGZyy8g rkaKJnXMc4OqdJxuxU4exV1f0bWLVGpmJaQEajLY4Ntixi78FaOQ5zR4UpJU1ERWDZQBwP vqm5DQuBYCJDIF8sorf5kPzk7CNynLMCrd9YbkbzdiX4/WxCTroEx4BvcqInLA== 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=e30ce086a7a37fae1179cced3cda8e2696029b3f commit e30ce086a7a37fae1179cced3cda8e2696029b3f Author: Yuri Victorovich AuthorDate: 2022-08-23 01:24:35 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-23 01:26:54 +0000 science/conduit: Add MPI options NOMPI,MPICH,OPENMPI; Change default ... MPI option to MPICH to match the choice in dependent ports. --- science/conduit/Makefile | 18 +++++++++++++++--- science/conduit/pkg-plist | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/science/conduit/Makefile b/science/conduit/Makefile index 1e32feeb0672..72c520d3a9e8 100644 --- a/science/conduit/Makefile +++ b/science/conduit/Makefile @@ -1,7 +1,7 @@ PORTNAME= conduit DISTVERSIONPREFIX= v DISTVERSION= 0.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -11,7 +11,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE LIB_DEPENDS= libhdf5.so:science/hdf5 \ - libmpi_cxx.so:net/openmpi \ libsiloh5.so:science/silo \ libsz.so:science/libaec @@ -26,7 +25,7 @@ GH_TUPLE= LLNL:blt:86a7d6b:blt/blt \ WRKSRC_SUBDIR= src -CMAKE_ON= ENABLE_FORTRAN ENABLE_MPI +CMAKE_ON= ENABLE_FORTRAN CMAKE_OFF= CONDUIT_ENABLE_TESTS ENABLE_DOCS ENABLE_EXAMPLES ENABLE_GIT ENABLE_TESTS ENABLE_VALGRIND CMAKE_ARGS= -DHDF5_DIR=${LOCALBASE} \ -DSILO_DIR=${LOCALBASE} \ @@ -34,4 +33,17 @@ CMAKE_ARGS= -DHDF5_DIR=${LOCALBASE} \ #CMAKE_ARGS+= -DADIOS_DIR=${LOCALBASE} # broken, see https://github.com/LLNL/conduit/issues/841 CMAKE_TESTING_ON= ENABLE_TESTS +OPTIONS_SINGLE= MPI +OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI +OPTIONS_DEFAULT= MPICH +OPTIONS_SUB= yes + +NOMPI_DESC= Build without parallel processing support + +MPICH_USES= mpi:mpich +MPICH_CMAKE_ON= -DENABLE_MPI=ON + +OPENMPI_USES= mpi:openmpi +OPENMPI_CMAKE_ON= -DENABLE_MPI=ON + .include diff --git a/science/conduit/pkg-plist b/science/conduit/pkg-plist index eae8d0e4ea99..916359c3bfe0 100644 --- a/science/conduit/pkg-plist +++ b/science/conduit/pkg-plist @@ -25,11 +25,11 @@ include/conduit/conduit_blueprint_mesh_examples_polystar.hpp include/conduit/conduit_blueprint_mesh_examples_related_boundary.hpp include/conduit/conduit_blueprint_mesh_examples_venn.hpp include/conduit/conduit_blueprint_mesh_utils.hpp -include/conduit/conduit_blueprint_mpi.hpp -include/conduit/conduit_blueprint_mpi_mesh.h -include/conduit/conduit_blueprint_mpi_mesh.hpp -include/conduit/conduit_blueprint_mpi_mesh_examples.hpp -include/conduit/conduit_blueprint_mpi_mesh_partition.hpp +%%NO_NOMPI%%include/conduit/conduit_blueprint_mpi.hpp +%%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh.h +%%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh.hpp +%%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_examples.hpp +%%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_partition.hpp include/conduit/conduit_blueprint_o2mrelation.hpp include/conduit/conduit_blueprint_o2mrelation_examples.hpp include/conduit/conduit_blueprint_o2mrelation_iterator.hpp @@ -89,12 +89,12 @@ include/conduit/conduit_relay_io_identify_protocol.hpp include/conduit/conduit_relay_io_identify_protocol_api.hpp include/conduit/conduit_relay_io_silo.hpp include/conduit/conduit_relay_io_silo_api.hpp -include/conduit/conduit_relay_mpi.hpp -include/conduit/conduit_relay_mpi_io.h -include/conduit/conduit_relay_mpi_io.hpp -include/conduit/conduit_relay_mpi_io_blueprint.hpp -include/conduit/conduit_relay_mpi_io_hdf5.hpp -include/conduit/conduit_relay_mpi_io_silo.hpp +%%NO_NOMPI%%include/conduit/conduit_relay_mpi.hpp +%%NO_NOMPI%%include/conduit/conduit_relay_mpi_io.h +%%NO_NOMPI%%include/conduit/conduit_relay_mpi_io.hpp +%%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_blueprint.hpp +%%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_hdf5.hpp +%%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_silo.hpp include/conduit/conduit_relay_silo.hpp include/conduit/conduit_relay_web.hpp include/conduit/conduit_relay_web_node_viewer_server.hpp @@ -109,10 +109,10 @@ lib/cmake/conduit/conduit_setup_deps.cmake lib/cmake/conduit/conduit_setup_targets.cmake lib/libconduit.so lib/libconduit_blueprint.so -lib/libconduit_blueprint_mpi.so +%%NO_NOMPI%%lib/libconduit_blueprint_mpi.so lib/libconduit_relay.so -lib/libconduit_relay_mpi.so -lib/libconduit_relay_mpi_io.so +%%NO_NOMPI%%lib/libconduit_relay_mpi.so +%%NO_NOMPI%%lib/libconduit_relay_mpi_io.so %%DATADIR%%/conduit_config.mk %%DATADIR%%/web_clients/node_viewer/index.html %%DATADIR%%/web_clients/node_viewer/resources/d3/LICENSE