From nobody Sun Dec 31 15:19:47 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 4T32pq6MP1z55xDD; Sun, 31 Dec 2023 15:19:47 +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 4T32pq5kzLz4Qfq; Sun, 31 Dec 2023 15:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704035987; 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=XvxFI8gSLjzrTzzhHQwFsdzTqZj7AspaFxPZEAQ37NM=; b=fhRS81liUdK1BDzuO+aWDsnWGUMzjnW3xpnEXg0dCUzyUp2DC/KBMzPFFh2MM2CQWslbpU EQGzkg5R8ap7oQaTJFJbtQVNNXKNR9OmfGIsv5kohgQ7WYsubqhRuMS4bZTavy1Y8BnRKh gMLI0XFPcyY8FJD7+W60jd3ftMO3eBCLD2O9ZMFNeCoFNUqCABvPDmppCFV3pyktg3Us6A AOnC7U9Ub4lj8Awlm6i5CMKIvMthkuT7svV3xGbYQXGy/XSSGKWVWAc4lFPKiSf0T0wLeH MOIJui8t9tLLzt12+CaasIeu/0IlcT0GzosU7k4gcDZtj8XQjc8QaMfP4TeT1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704035987; a=rsa-sha256; cv=none; b=iIjDabb7hollXzIFgT/GE/FYfdMcCfhSCbzmcWIK6coLnOFzZYzhsUYOPvivtJd3stCvCn RhHuER9z/v2ER1tc6t74b03NuPy6Zwfn0FCTQdOZLYAxShS864J5X8aD4Rmk8vTZYbPECp mXc2PhVYIiLslH4L2U1FFkUTWOF4KT5+TXtcr4vIOyoEFCAHZ5SrNDsYsHPbeSSZualPtY cJwpEJokm5ZYz9WwTT5FHze0CJywq2wEnTdLgF/EgMUUQRwZMu4m/kPeHPXG0wspCnpvSi YIpNdsAPXY4eul3XR0OFZ9RN8wFmY+jop555SGMHHTWpkWrG7vTi1wVzZUzJWQ== 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=1704035987; 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=XvxFI8gSLjzrTzzhHQwFsdzTqZj7AspaFxPZEAQ37NM=; b=EtHpyxcNWW8zorWaKI/xoS5+iEtUyJFU3d2TnBDRNeJQWs2F/athGsLnE9yCihh8Y5eBJW l8Ue/qTwaTX1wBfC0eNnsjGqbM4x8iq4OL09mm6UNUYarZw05HD5ak4mwI8Yz9tb6FsSkn 0cUYD+6Hm0g9P6tAtUVWT4wySsHYsnfHfkP3KjV4PsUsULC+IscYsCdgqhH6QX6qbc6xBH sLDuMUXWLlQ6lYZz/fQQUss1QHluC6zLT6S1PAB+5YPoBDUu/TjviJk+lUD9+KsZ6x0+E3 BVt6xtr92GC5TLRxo2yK+6C8BVWQdodaGJGpkyQRYNnHz05B9+zvBLB4ORr+UQ== 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 4T32pq4pGBzfD7; Sun, 31 Dec 2023 15:19:47 +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 3BVFJlpl026462; Sun, 31 Dec 2023 15:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BVFJl6P026459; Sun, 31 Dec 2023 15:19:47 GMT (envelope-from git) Date: Sun, 31 Dec 2023 15:19:47 GMT Message-Id: <202312311519.3BVFJl6P026459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 6379a25b53e6 - main - benchmarks/hpl: =?utf-8?Q?let=E2=80=99s?= choose among various BLAS =?utf-8?Q?=C3=97?= MPI implementations 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6379a25b53e6988f825bddd0057e00871b9ebffe Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=6379a25b53e6988f825bddd0057e00871b9ebffe commit 6379a25b53e6988f825bddd0057e00871b9ebffe Author: Thierry Thomas AuthorDate: 2023-11-02 21:01:06 +0000 Commit: Thierry Thomas CommitDate: 2023-12-31 15:18:39 +0000 benchmarks/hpl: let’s choose among various BLAS × MPI implementations - Add a license - Add options to choose MPI and BLAS implementations. - Do not bump PORTREVISION because the default remains Netlib (excepted static vs shared libs). - And also this fixes the port with BLAS 3.12 Caveat: may install an unneeded liblapack. PR: 274882, 275860 Approved by: maintainer’s time-out --- benchmarks/hpl/Makefile | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile index d8cde4f8ef35..e34c23d8e39c 100644 --- a/benchmarks/hpl/Makefile +++ b/benchmarks/hpl/Makefile @@ -8,36 +8,53 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= High Performance Computing Linpack Benchmark WWW= https://www.netlib.org/benchmark/hpl/ -LIB_DEPENDS= libblas.so:math/blas \ - libmpich.so:net/mpich +LICENSE= BSD4CLAUSE +LICENSE_FILE= ${WRKSRC}/www/copyright.html USES= fortran -USE_LDCONFIG= yes HPL_ARCH?= FreeBSD_PIV_CBLAS MAKE_ARGS= arch=${HPL_ARCH} ALL_TARGET= build -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= BLAS MPI +OPTIONS_RADIO_BLAS= ATLAS BLIS FLEXIBLAS NETLIB OPENBLAS +OPTIONS_RADIO_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= NETLIB MPICH +BLIS_DESC= BLAS implementation from FLAME +FLEXIBLAS_DESC= BLAS and LAPACK wrapper library -post-patch: - @${REINPLACE_CMD} -e 's|^TOPdir[ ]*=.*$$|TOPdir = ${WRKSRC}| ; \ +ATLAS_USES= blaslapack:atlas +BLIS_USES= blaslapack:blis +FLEXIBLAS_USES= blaslapack:flexiblas +NETLIB_USES= blaslapack:netlib +OPENBLAS_USES= blaslapack:openblas + +MPICH_USES= mpi:mpich +OPENMPI_USES= mpi:openmpi + +CFLAGS+= -fomit-frame-pointer -funroll-loops + +pre-configure: + ${REINPLACE_CMD} -e 's|^TOPdir[ ]*=.*$$|TOPdir = ${WRKSRC}| ; \ s|^MPdir[ ]*=.*$$|MPdir = ${LOCALBASE}| ; \ s|^LAdir[ ]*=.*$$|LAdir = ${LOCALBASE}| ; \ s|^CC[ ]*=.*$$|CC = ${CC}| ; \ - s|^CCFLAGS[ ]*=.*$$|CCFLAGS = $$\(HPL_DEFS\) ${CFLAGS} -fomit-frame-pointer -funroll-loops| ; \ + s|^CCFLAGS[ ]*=.*$$|CCFLAGS = $$\(HPL_DEFS\) ${CFLAGS}| ; \ s|^LINKER[ ]*=.*$$|LINKER = ${FC}| ; \ s|^LINKFLAGS[ ]*=\(.*\)$$|LINKFLAGS =\1 ${LDFLAGS}| ; \ s|^ARCHIVER[ ]*=.*$$|ARCHIVER = ${AR}| ; \ s|ARCH[ )]|_&|g ; \ s|^HPL_OPTS[ ]*=.*$$|HPL_OPTS =| ; \ - s|^LAlib[ ]*=.*$$|LAlib = $$\(LAdir\)/lib/libblas.a| ; \ - s|libmpich.a|libmpich.so -lpthread| ; \ - s|libpmpich.a|libmpl.so -lpthread|' \ + s|^LAlib[ ]*=.*$$|LAlib = ${BLASLIB}| ; \ + s|^MPdir[ ]*=.*$$|MPdir = ${MPI_HOME}| ; \ + s|^MPinc[ ]*=.*$$|MPinc = ${MPI_CFLAGS}| ; \ + s|^MPlib[ ]*=.*$$|MPlib = ${MPI_LIBS}|' \ ${WRKSRC}/setup/Make.${HPL_ARCH} - @${REINPLACE_CMD} -e 's|HPL\.dat|${PREFIX}/etc/${PORTNAME}/&|' \ + ${REINPLACE_CMD} -e 's|HPL\.dat|${PREFIX}/etc/${PORTNAME}/&|' \ ${WRKSRC}/testing/ptest/HPL_pdinfo.c - @${CP} ${WRKSRC}/setup/Make.${HPL_ARCH} ${WRKSRC}/ - @${REINPLACE_CMD} -e '/^build/s|$$| startup|' ${WRKSRC}/Makefile + ${CP} ${WRKSRC}/setup/Make.${HPL_ARCH} ${WRKSRC}/ + ${REINPLACE_CMD} -e '/^build/s|$$| startup|' ${WRKSRC}/Makefile do-install: ${MKDIR} ${STAGEDIR}${ETCDIR}