From nobody Mon Jul 08 13:50:10 2024 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 4WHlqk6YhGz5QFYR; Mon, 08 Jul 2024 13:50:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHlqk5Xfcz4nV1; Mon, 8 Jul 2024 13:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720446610; 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=vweEwm4vmnlhH4PlYc/6Ko5Q6OZ1ISZmsYdAUW/2DiE=; b=FbjZnffRTQkH9ej2Ecmhl7syc1ef2x/A8iYsYe3hEeTnzaHXPnlBklOphzt2xMp5JO2/Ge EScxzLKSsTfoR51OT86lEaLQJVUUNfl8zNzECf6DVJh5dBBDUSgzXXUJZr8Mf/KI3Xv26X X23dqcxExDMXtdwC64Wzmb2BJteMo2T+jtdLkxzhbGKO3VnEJgMXPzBsFU8R8Mq7SFeQmk GWl63iAOQh6e3MV7/QbuXWSz7hpaAk81p6LFKDNFOskRkdhFABgkgxNZs9rSCaasVMJzIr yKHyjzPwo+KWO6bm4qgJ02S2mGxFzo5M8LcaK5IHrRl7rvEBywJfyjVscSixCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720446610; a=rsa-sha256; cv=none; b=exw68KNxsmkoJoNajmHBqEnKufkDxLlc9TtIaz1CgWxxBBJx4zAS6VwM6YqTHBzc3Hl0/o nKA+MTFGE7NEW0kC2wDKOoBTrqxMuyX11We5wJdR0XfClzDdVtnJhNJquWvQT46GeGVhC3 6T2htD6USIKHrA5nQ7aFxCswh1MjCjPkHqJyCi3VvaG8jJ5vV6ljSSVvmJPVHN8JZ4NOG5 N6t/E+A28l1nAW3MbaLvczgr2oe+ma1Q56+Rh7lDXaQxzwYYebmcLnZtN2DmQ0DsvXT/l4 n+81I+4Xn7IkIQvbQoobGPmpdZYboHu0EEjlwq3DL5KQZzF0HhkgVgu6YW9xkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720446610; 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=vweEwm4vmnlhH4PlYc/6Ko5Q6OZ1ISZmsYdAUW/2DiE=; b=harvQ7oyfJl0lU0jcnyq0rrihFLdf0foxPiD2foUQBGoNwFLJNiXsc1MRbmSULevN3zII4 eqNvHnC6aTZhtRUWs7bxsUf45Q4OGf/oAuvScuv9Fg3ay9fOVqFuu6Fy/xxR7H4t8/K0+Q 9PK16VklPXDFTSqy9P/+DxBxT4Ba6igbKiDbxh/1sbRFakcPf3Mxhn5MB6gp+d5E4PSp+L 86XCnq++4AYGomAu7DFV6gPPrA0nbFVOKa5xCizD0HMVeAwG51Tqft3P4WGL7lnq+2UmTg qNTIArO4gYuG922IZuFWbnFOPNvBJ502oR9yt4A9PO4mRjz0jyts8NQUXhGuFw== 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 4WHlqk58GNztMQ; Mon, 8 Jul 2024 13:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 468DoAoj032718; Mon, 8 Jul 2024 13:50:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 468DoAGP032708; Mon, 8 Jul 2024 13:50:10 GMT (envelope-from git) Date: Mon, 8 Jul 2024 13:50:10 GMT Message-Id: <202407081350.468DoAGP032708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Torsten Zuehlsdorff Subject: git: 09f0bf2ada08 - main - net/mpich: Upgrade mpich from 4.2.1 to 4.2.2 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09f0bf2ada083c098fadf42160afe96cad9c2660 Auto-Submitted: auto-generated The branch main has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=09f0bf2ada083c098fadf42160afe96cad9c2660 commit 09f0bf2ada083c098fadf42160afe96cad9c2660 Author: Torsten Zuehlsdorff AuthorDate: 2024-07-08 13:47:54 +0000 Commit: Torsten Zuehlsdorff CommitDate: 2024-07-08 13:49:59 +0000 net/mpich: Upgrade mpich from 4.2.1 to 4.2.2 - Remove default slurm dependency and make it an option (Bug 279777) - Remove HYDRA dependency on torque (not needed) - Revert removal of HYDRA option PR: 280184, 279777 Approved by: Laurent Chardon (maintainer) --- net/mpich/Makefile | 20 ++++++++++++-------- net/mpich/distinfo | 6 +++--- net/mpich/pkg-plist | 11 ++++++++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 2be87db25831..0ebce9491b4d 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -1,6 +1,5 @@ PORTNAME= mpich -DISTVERSION= 4.2.1 -PORTREVISION= 2 +DISTVERSION= 4.2.2 CATEGORIES= net parallel MASTER_SITES= https://www.mpich.org/static/downloads/${DISTVERSION}/ @@ -16,7 +15,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libhwloc.so:devel/hwloc2 \ libjson-c.so:devel/json-c \ libfabric.so:net/libfabric \ - libslurm.so:sysutils/slurm-wlm \ libepoll-shim.so:devel/libepoll-shim CONFLICTS= mpd @@ -28,12 +26,12 @@ TEST_TARGET= check BINARY_ALIAS= python3=${PYTHON_CMD} -OPTIONS_DEFINE= DOCS FORTRAN L0 +OPTIONS_DEFINE= DOCS FORTRAN SLURM L0 OPTIONS_GROUP= PM -OPTIONS_GROUP_PM= GFORKER +OPTIONS_GROUP_PM= GFORKER HYDRA OPTIONS_RADIO= DEFAULTPM -OPTIONS_RADIO_DEFAULTPM=DGFORKER -OPTIONS_DEFAULT= FORTRAN GFORKER DHYDRA +OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA +OPTIONS_DEFAULT= FORTRAN GFORKER HYDRA DHYDRA OPTIONS_SUB= yes FORTRAN_USES= fortran @@ -48,13 +46,19 @@ MPICH_LDFLAGS= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ PM_DESC= Process managers GFORKER_DESC= Simple local process manager +HYDRA_DESC= Parallel process manager DEFAULTPM_DESC= Default process manager DGFORKER_DESC= Make gforker the default process manager DHYDRA_DESC= Make hydra the default process manager +SLURM_DESC= Extra Slurm support +SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm +SLURM_CONFIGURE_WITH= slurm +SLURM_IMPLIES= HYDRA + L0_DESC= oneAPI Level Zero support L0_LIB_DEPENDS= libze_loader.so:devel/level-zero -L0_CONFIGURE_OFF= --without-ze +L0_CONFIGURE_WITH= ze CONFIGURE_ARGS= --enable-fast="" \ --with-libfabric=${LOCALBASE} \ diff --git a/net/mpich/distinfo b/net/mpich/distinfo index bf868a214c65..e2da02a40b2e 100644 --- a/net/mpich/distinfo +++ b/net/mpich/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713430822 -SHA256 (mpich-4.2.1.tar.gz) = 23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7 -SIZE (mpich-4.2.1.tar.gz) = 39915201 +TIMESTAMP = 1720056694 +SHA256 (mpich-4.2.2.tar.gz) = 883f5bb3aeabf627cb8492ca02a03b191d09836bbe0f599d8508351179781d41 +SIZE (mpich-4.2.2.tar.gz) = 40241352 diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist index a6f443c49761..6f514a042eca 100644 --- a/net/mpich/pkg-plist +++ b/net/mpich/pkg-plist @@ -1,12 +1,17 @@ +%%HYDRA%%bin/hydra_nameserver +%%HYDRA%%bin/hydra_persist +%%HYDRA%%bin/hydra_pmi_proxy bin/mpic++ bin/mpicc bin/mpichversion bin/mpicxx %%EXEC%%bin/mpiexec %%EXECGFORKER%%bin/mpiexec.gforker +%%HYDRA%%bin/mpiexec.hydra %%FORTRAN%%bin/mpif77 %%FORTRAN%%bin/mpif90 %%FORTRAN%%bin/mpifort +%%HYDRA%%bin/mpirun bin/mpivars bin/parkill include/mpi.h @@ -35,18 +40,18 @@ include/mpiof.h lib/libmpi.a lib/libmpi.so lib/libmpi.so.12 -lib/libmpi.so.12.4.1 +lib/libmpi.so.12.4.2 lib/libmpich.so lib/libmpichcxx.so %%FORTRAN%%lib/libmpichf90.so lib/libmpicxx.a lib/libmpicxx.so lib/libmpicxx.so.12 -lib/libmpicxx.so.12.4.1 +lib/libmpicxx.so.12.4.2 %%FORTRAN%%lib/libmpifort.a %%FORTRAN%%lib/libmpifort.so %%FORTRAN%%lib/libmpifort.so.12 -%%FORTRAN%%lib/libmpifort.so.12.4.1 +%%FORTRAN%%lib/libmpifort.so.12.4.2 lib/libmpl.so lib/libopa.so libdata/pkgconfig/mpich.pc