From nobody Tue Aug 23 18:33: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 4MByYJ45Twz4bDw9; Tue, 23 Aug 2022 18:33: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 4MByYJ3dLVz3NZx; Tue, 23 Aug 2022 18:33:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661279636; 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=KR9/+Nkni87FPGukSGHCl3YPFlNSpjfDgNoZDmyR8OE=; b=cjHhEaH03VWyuII1Wborrw/8nXrBGtLwT32ZiWZfC86c8JobHC2v35bUAmG+B5PGrXBugz nMOeY4TVCpclbBdR+P4tYgFa5tQlTGvomU5lse0cB5x/cAAPD2lu6DI/M8iyoyWNqFm4r8 2Z9k1QCRh8Xs5HmfC732dKsNYGNu/+Yd5UWFO+A/WLRmYnRuTsDj7HmVMayRSxs1TXjCGP Mw2veckmIx+6WyWOXWFCRVbg/EL+F3O3LSlP4oZYFMXzX3DiGO98I4bktYmRz4+hWQ0vKC 4fFMNDVbx9VDT3qc6/GeBrSgiIGHLN1MYQN5sqNExdIwwLApWauf3ZogdETJ4w== 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 4MByYJ2Nk1zfQm; Tue, 23 Aug 2022 18:33: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 27NIXuEE066409; Tue, 23 Aug 2022 18:33:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NIXuEB066408; Tue, 23 Aug 2022 18:33:56 GMT (envelope-from git) Date: Tue, 23 Aug 2022 18:33:56 GMT Message-Id: <202208231833.27NIXuEB066408@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: be927e1c8772 - main - science/ascent: Fix MPI, add MPI options NOMPI, MPICH, OPENMPI 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: be927e1c87723f345c05e7624f72ade636da47ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661279636; 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=KR9/+Nkni87FPGukSGHCl3YPFlNSpjfDgNoZDmyR8OE=; b=mQti3t9sntTTkaXn9CYyrJtg0N6S8K0ZUFlVEBsjWVFV+y36L8gbntWgxxEYd91pc4yz++ xGYUp0QlqNkiLSr0Twin5sTdhq2yVOdlfj7rfPvObU4e8VjcpM1xphlAUkvQXrF5oRH/Se O6EgDz6OL1c1/GFJTOm1Wr9o8xuZNPIkaav4vV0cn+/RElZpGZIW6LL70iD6hC+rrvDmQA 1riZ7kX09v5sOfsuZX5Q4CAYo5BnXVA3Qq6oWcu27Q5+49KIXHCEd6GsLhwAO/uEtL7GvM dmliNLsNf30J2nWNQEmhT5vBkF0pvkFlhAMPi65OBH614hVBu5a6jt39ThlfeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661279636; a=rsa-sha256; cv=none; b=ZtTbyNu9pYCxdHR0w68daEaRJJUK4tHagkjcG1u/7ZQU1STIjQ+1soT0lg/LGZ88NnqOiO LvIbPTvSmqDRto542j0WrjKXdIfLBxUK+e4q1d3sofiY+Wj3D8DshTAT0hJf7PhA8pTb5d 07C2fzbGYmD+IU8eBCeH2hgU/vSLjQTOzEobyty2bTCzwUiJ/nPkHwS5QkUhxovBuDBxtO ljNLhbr4gmoIwzrTgrfD/n7mAtAxL/qgtf/wmXlAgyMVnUq8ez1tQeMgMjsZLmUMPioYbV yZZ5vBoOyXWQTCuMLx4OzC7S/SQZVKcOkyuyDM5/mJ+9hRn5jJK/3EI4SRYGFQ== 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=be927e1c87723f345c05e7624f72ade636da47ba commit be927e1c87723f345c05e7624f72ade636da47ba Author: Yuri Victorovich AuthorDate: 2022-08-23 08:34:51 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-23 18:33:53 +0000 science/ascent: Fix MPI, add MPI options NOMPI, MPICH, OPENMPI --- science/ascent/Makefile | 17 +++++++++++++++-- science/ascent/pkg-plist | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/science/ascent/Makefile b/science/ascent/Makefile index 1ccc1f27742e..a3617f44fec1 100644 --- a/science/ascent/Makefile +++ b/science/ascent/Makefile @@ -1,7 +1,7 @@ PORTNAME= ascent DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science PKGNAMESUFFIX= -visualizer @@ -27,7 +27,6 @@ GH_TUPLE= Alpine-DAV:spack_configs:26ea412:spack_configs/../scripts/uberenv_conf CMAKE_OFF= ENABLE_PYTHON ENABLE_DOCS ENABLE_TESTS ENABLE_EXAMPLES CMAKE_OFF+= ENABLE_UTILS # utils are installed into a non-standard path, see https://github.com/Alpine-DAV/ascent/issues/814 -CMAKE_OFF+= ENABLE_MPI # MPI fails to link, see https://github.com/Alpine-DAV/ascent/issues/813 CMAKE_ARGS= -DCONDUIT_DIR=${LOCALBASE} CMAKE_TESTING_ON= ENABLE_TESTS # one testcase fails because conduit lacks HDF5, see https://github.com/LLNL/conduit/issues/840 @@ -35,4 +34,18 @@ LDFLAGS+= -lsysinfo WRKSRC_SUBDIR= src +OPTIONS_SINGLE= MPI +OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI +OPTIONS_DEFAULT= MPICH +OPTIONS_SUB= yes + +NOMPI_DESC= Build without parallel processing support +NOMPI_CMAKE_ON= -DENABLE_MPI=OFF + +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/ascent/pkg-plist b/science/ascent/pkg-plist index 926b64b73fc1..5e0d1af99949 100644 --- a/science/ascent/pkg-plist +++ b/science/ascent/pkg-plist @@ -21,6 +21,7 @@ include/ascent/ascent_expressions_tokens.hpp include/ascent/ascent_file_system.hpp include/ascent/ascent_flow_runtime.hpp include/ascent/ascent_hola.hpp +%%NO_NOMPI%%include/ascent/ascent_hola_mpi.hpp include/ascent/ascent_insertion_ordered_set.hpp include/ascent/ascent_jit_array.hpp include/ascent/ascent_jit_field.hpp @@ -40,6 +41,7 @@ include/ascent/ascent_resources_cinema_web.hpp include/ascent/ascent_runtime.hpp include/ascent/ascent_runtime_blueprint_filters.hpp include/ascent/ascent_runtime_filters.hpp +%%NO_NOMPI%%include/ascent/ascent_runtime_hola_filters.hpp include/ascent/ascent_runtime_param_check.hpp include/ascent/ascent_runtime_query_filters.hpp include/ascent/ascent_runtime_relay_filters.hpp @@ -69,6 +71,7 @@ lib/cmake/ascent/ascent_setup_targets.cmake lib/libascent.so lib/libascent_flow.so lib/libascent_lodepng.so +%%NO_NOMPI%%lib/libascent_mpi.so %%DATADIR%%/ascent_config.mk %%DATADIR%%/web_clients/ascent/index.html %%DATADIR%%/web_clients/ascent/resources/ascent_style.css