From owner-svn-ports-all@freebsd.org Sun Apr 12 09:15:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D4B52B794D; Sun, 12 Apr 2020 09:15:37 +0000 (UTC) (envelope-from danilo@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 490R1N75k0z3N0g; Sun, 12 Apr 2020 09:15:36 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEBBA270DC; Sun, 12 Apr 2020 09:15:36 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03C9FaNd022128; Sun, 12 Apr 2020 09:15:36 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03C9FaOx022124; Sun, 12 Apr 2020 09:15:36 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <202004120915.03C9FaOx022124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 12 Apr 2020 09:15:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531492 - in head/math/blacs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: in head/math/blacs: . files X-SVN-Commit-Revision: 531492 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2020 09:15:37 -0000 Author: danilo Date: Sun Apr 12 09:15:36 2020 New Revision: 531492 URL: https://svnweb.freebsd.org/changeset/ports/531492 Log: - Remove leading article from COMMENT - Introduce option helpers - Move OpenMPI support to net/openmpi3. OpenMPI 1 is deprecated Modified: head/math/blacs/Makefile head/math/blacs/files/Bmake.inc-openmpi.diff head/math/blacs/files/pkg-message.in Modified: head/math/blacs/Makefile ============================================================================== --- head/math/blacs/Makefile Sun Apr 12 09:14:39 2020 (r531491) +++ head/math/blacs/Makefile Sun Apr 12 09:15:36 2020 (r531492) @@ -3,7 +3,7 @@ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 35 +PORTREVISION= 36 CATEGORIES= math MASTER_SITES= NETLIB/blacs DISTNAME= BLACS @@ -12,33 +12,27 @@ DIST_SUBDIR= blacs EXTRACT_ONLY= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz MAINTAINER= ports@FreeBSD.org -COMMENT= The BLACS (Basic Linear Algebra Communication Subprograms) +COMMENT= BLACS (Basic Linear Algebra Communication Subprograms) SUB_FILES= pkg-message USES= fortran gmake USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= MPI +OPTIONS_RADIO_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= DOCS MPICH -.include - -.if ! ${PORT_OPTIONS:MDOCS} -DISTFILES+= blacs_install.ps f77blacsqref.ps lawn94.ps \ +DOCS_DISTFILES= blacs_install.ps f77blacsqref.ps lawn94.ps \ cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps -.endif -.if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) -WITH_OPENMPI= yes -.endif +OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi3 +OPENMPI_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-openmpi.diff -.if defined(WITH_OPENMPI) -BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi -RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi -EXTRA_PATCHES+= ${FILESDIR}/Bmake.inc-openmpi.diff -.else -LIB_DEPENDS+= libmpich.so:net/mpich2 -EXTRA_PATCHES+= ${FILESDIR}/Bmake.inc-mpich.diff -.endif +MPICH_LIB_DEPENDS= libmpich.so:net/mpich2 +MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff + +.include F77EXTRAFLAGS= #-w -fno-globals -fugly-complex DEBUG_LEVEL= 0 Modified: head/math/blacs/files/Bmake.inc-openmpi.diff ============================================================================== --- head/math/blacs/files/Bmake.inc-openmpi.diff Sun Apr 12 09:14:39 2020 (r531491) +++ head/math/blacs/files/Bmake.inc-openmpi.diff Sun Apr 12 09:15:36 2020 (r531492) @@ -1,5 +1,5 @@ ---- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 -+++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 +--- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 ++++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory @@ -32,7 +32,7 @@ # ------------------------------------- - MPIdir = /usr/local/mpich - MPILIBdir = $(MPIdir)/lib/ -+ MPIdir = @LOCALBASE@/mpi/openmpi ++ MPIdir = @LOCALBASE@/mpi/openmpi3 + MPILIBdir = MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpich.a @@ -40,7 +40,7 @@ # ------------------------------------- # All libraries required by the tester. -@@ -86,7 +86,7 @@ +@@ -86,14 +86,14 @@ # The directory to find the required communication library include files, # if they are required by your system. # ----------------------------------------------------------------------- @@ -49,6 +49,14 @@ # --------------------------------------------------------------------------- # The Fortran 77 to C interface to be used. If you are unsure of the correct + # setting for your platform, compile and run BLACS/INSTALL/xintface. + # Choices are: Add_, NoChange, UpCase, or f77IsF2C. + # --------------------------------------------------------------------------- +- INTFACE = -Df77IsF2C ++ INTFACE = -DAdd_ + + # ------------------------------------------------------------------------ + # Allows the user to vary the topologies that the BLACS default topologies @@ -140,7 +140,7 @@ # If you know that your MPI uses the same handles for fortran and C # communicators, you can replace the empty macro definition below with @@ -70,14 +78,14 @@ - CC = gcc - CCFLAGS = -O4 - CCLOADER = $(CC) -+ F77 = @LOCALBASE@/mpi/openmpi/bin/mpif77 ++ F77 = @LOCALBASE@/mpi/openmpi3/bin/mpif77 + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ -+ F77LOADER = @LOCALBASE@/mpi/openmpi/bin/mpif77 ++ F77LOADER = @LOCALBASE@/mpi/openmpi3/bin/mpif77 + F77LOADFLAGS = @FFLAGS@ -+ CC = @LOCALBASE@/mpi/openmpi/bin/mpicc ++ CC = @LOCALBASE@/mpi/openmpi3/bin/mpicc + CCFLAGS = @CFLAGS@ -+ CCLOADER = @LOCALBASE@/mpi/openmpi/bin/mpicc ++ CCLOADER = @LOCALBASE@/mpi/openmpi3/bin/mpicc CCLOADFLAGS = - # -------------------------------------------------------------------------- Modified: head/math/blacs/files/pkg-message.in ============================================================================== --- head/math/blacs/files/pkg-message.in Sun Apr 12 09:14:39 2020 (r531491) +++ head/math/blacs/files/pkg-message.in Sun Apr 12 09:15:36 2020 (r531492) @@ -13,8 +13,8 @@ Or, if you're using OpenMPI: % cd %%PREFIX%%/share/BLACS/TESTING - % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi/lib/ export LD_LIBRARY_PATH - % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi/bin/ export PATH + % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi3/lib/ export LD_LIBRARY_PATH + % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi3/bin/ export PATH % mpirun -np 4 ./xCbtest_MPI-FreeBSD % mpirun -np 4 ./xFbtest_MPI-FreeBSD