From nobody Sat Dec 30 17:08:55 2023 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 4T2THC59Ngz55dFQ; Sat, 30 Dec 2023 17:08:55 +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 4T2THC4W9Sz4GL0; Sat, 30 Dec 2023 17:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956135; 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=AQtpE/rLGFPZ3lBHLijuStSUzziI6qPnqTC996xvznE=; b=LajxLaC+5Pf2uhYIb+Or67kuVmWfDxC4OY8nY5vCG5PpKDovElQrtadS0eTuM2G1ekrLaY hF25Y4b3xVYry63mKhfNH4PMbR1FvlGrL8VuAEKS2xMN7G0Ictjb1L3e+sWWkHE595XHTM 8JS3wZDltx6BaoKa6VM40tsjd2sMUMSxlBeukt/hwhOKzfeOyVPbZayOolzdpwq1ISRAYu NmD41fQlIMV/QQ1Npw5yMlVihRNm7606eqIw6dJFeMHF9xa3SE8Qold6o7AEuGsN2bGW2X rV81CxTZYYPJJ17y8BhpzZtme5rKeuaft9PZ5CnfP2LzQUviuN78HhheVA0q+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703956135; a=rsa-sha256; cv=none; b=IHbC6NAhw0Lp1UVQDW3blchaaWePiOJ61F8TNpejwrYOatCuKtgUeq79FAGk2sBKSA6h4b otRCza2ThCJaHcOiaed9zS+d4NwGAsbNZ+BdT7cNJQ8YzBv5cen+6YXQxTHWM/KGP2vx9/ mQgGmdTzprlFf3ViEiyDIeGfYo6KfnJJPrvZBZ4UGR6+LllScrVd9vYsza3H/9q4xZX9jr dFb/p/RelHiuIYGeKSchxA24uwFF4IVTQESgos9SqgtNN0TtkKKd6wuPN770o7q5Gnlsgo UcUTQWOYJLWw076m32M6fyb9r2Cak6GH4o/4uTXrHLg0D1yIs5YRXsqeJ5GN8g== 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=1703956135; 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=AQtpE/rLGFPZ3lBHLijuStSUzziI6qPnqTC996xvznE=; b=KeRaFY+Iql0HZCxkFPZEG38rcxO8YD64bkQ2Sux+BiWGbBanHJ1/YnH+CLb8T7MLpzl4Zq 1ZnqNQ2OZUcdn7QrkvYK8mUIg9/NCZADWxzeFrjjyW4Sjtqxac/0MHPS2cpXQeMPjqnzzV cdxUgyr7CLkKUWEkQO7K5cYpK5jQX3bueGVdZ9JK/c9C6o2GsYCXEMyPs6tLQ0UpXuzX0i wWv6UOu/YUrTEt7FktXqfys9yufjBgJCxYXNnr+7MYf3rvCHRzl4G2x3z9pzrpz8GNAz81 wKfqj2TdBYEmWKl5LhdB0oIkX4P/CenYIyrQ/BRD4hoL2KSHAsOxP5VBxEMxHg== 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 4T2THC3SCCzyCx; Sat, 30 Dec 2023 17:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUH8tXH087625; Sat, 30 Dec 2023 17:08:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUH8t2m087622; Sat, 30 Dec 2023 17:08:55 GMT (envelope-from git) Date: Sat, 30 Dec 2023 17:08:55 GMT Message-Id: <202312301708.3BUH8t2m087622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 003d02547265 - main - net/mpich: Revert dependency changes 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 003d02547265d581b5defeea24580c5d9277235b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=003d02547265d581b5defeea24580c5d9277235b commit 003d02547265d581b5defeea24580c5d9277235b Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 17:01:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-30 17:05:15 +0000 net/mpich: Revert dependency changes Revert "net/mpich: fix build by removal of hydra from pkg-plist" This reverts commit 531052cb22f42acc476e0b15379db24115b683f1. Revert "net/mpich: Update dependency" This reverts commit 78bb85928c8845e2f3ccd78dc68bd2e7184a9339. sysutils/torque is required by mpich. Reported by: thierry --- net/mpich/Makefile | 12 ++++++++---- net/mpich/pkg-plist | 8 ++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 0e7c1c372e75..f97f283e6faa 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -1,6 +1,6 @@ PORTNAME= mpich PORTVERSION= 4.1.2 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= net parallel MASTER_SITES= https://www.mpich.org/static/downloads/${DISTVERSION}/ @@ -33,10 +33,10 @@ BINARY_ALIAS= python3=${PYTHON_CMD} OPTIONS_DEFINE= DOCS FORTRAN L0 OPTIONS_GROUP= PM -OPTIONS_GROUP_PM= GFORKER +OPTIONS_GROUP_PM= GFORKER HYDRA OPTIONS_RADIO= DEFAULTPM -OPTIONS_RADIO_DEFAULTPM=DGFORKER -OPTIONS_DEFAULT= FORTRAN GFORKER DGFORKER L0 +OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA +OPTIONS_DEFAULT= FORTRAN GFORKER HYDRA DHYDRA L0 OPTIONS_SUB= yes FORTRAN_USES= fortran @@ -51,8 +51,12 @@ 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 + +HYDRA_LIB_DEPENDS= libtorque.so:sysutils/torque L0_DESC= oneAPI Level Zero support L0_LIB_DEPENDS= libze_loader.so:devel/level-zero diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist index ba2c9b260e10..82339b2ab27a 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 %%FORTRAN%%include/mpi_c_interface.mod @@ -49,6 +54,9 @@ lib/libmpicxx.so.12.3.1 lib/libmpl.so lib/libopa.so libdata/pkgconfig/mpich.pc +man/man1/hydra_nameserver.1.gz +man/man1/hydra_persist.1.gz +man/man1/hydra_pmi_proxy.1.gz man/man1/mpicc.1.gz man/man1/mpicxx.1.gz man/man1/mpiexec.1.gz