From owner-svn-ports-all@freebsd.org Sun Apr 12 09:14:12 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 181E72B78D3; Sun, 12 Apr 2020 09:14:12 +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 490Qzl6wW3z3Mpw; Sun, 12 Apr 2020 09:14:11 +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 E8B2B270D9; Sun, 12 Apr 2020 09:14:11 +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 03C9EB0s021791; Sun, 12 Apr 2020 09:14:11 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03C9EBNe021789; Sun, 12 Apr 2020 09:14:11 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <202004120914.03C9EBNe021789@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:14:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531490 - in head/math/scalapack: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: in head/math/scalapack: . files X-SVN-Commit-Revision: 531490 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:14:12 -0000 Author: danilo Date: Sun Apr 12 09:14:11 2020 New Revision: 531490 URL: https://svnweb.freebsd.org/changeset/ports/531490 Log: - Remove leading article from COMMENT - Introduce option helpers - Move OpenMPI support to net/openmpi3. OpenMPI 1 is deprecated Modified: head/math/scalapack/Makefile head/math/scalapack/files/pkg-message.in Modified: head/math/scalapack/Makefile ============================================================================== --- head/math/scalapack/Makefile Sun Apr 12 09:09:15 2020 (r531489) +++ head/math/scalapack/Makefile Sun Apr 12 09:14:11 2020 (r531490) @@ -3,7 +3,7 @@ PORTNAME= scalapack PORTVERSION= 2.0.2 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= math MASTER_SITES= NL DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz @@ -11,15 +11,16 @@ DIST_SUBDIR= scalapack EXTRACT_ONLY= scalapack-${PORTVERSION}.tgz manpages.tgz MAINTAINER= ports@FreeBSD.org -COMMENT= The ScaLAPACK Scalable LAPACK library +COMMENT= ScaLAPACK Scalable LAPACK library LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= elmer-mathlibs-1* -USE_LDCONFIG= yes USES= cmake:insource fortran pathfix + +USE_LDCONFIG= yes CMAKE_ARGS_ST= -DBUILD_STATIC_LIBS:BOOL=ON CMAKE_ARGS_SH= -DBUILD_SHARED_LIBS:BOOL=ON CMAKE_ARGS= ${CMAKE_ARGS_ST} @@ -32,40 +33,47 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME:tu} SUB_FILES= pkg-message PLIST_SUB= SVERSION=${SVERSION} PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_RADIO= LA MPI +OPTIONS_RADIO_LA= ATLAS BLAS +LA_DESC= Linear Algebra library support +BLAS_DESC= LAPACK blass implementation +OPTIONS_RADIO_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= BLAS DOCS EXAMPLES MPICH -.include - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= scalapack_install.ps scalapackqref.ps \ +DOCS_DISTFILES= scalapack_install.ps scalapackqref.ps \ lawn100.ps pblasqref.ps manual.ps design.ps \ pumma_refmanual.ps trans.ps -.endif -.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes -.endif -.if defined(WITH_ATLAS) -LIB_DEPENDS+= libatlas.so:math/atlas +ATLAS_LIB_DEPENDS= libatlas.so:math/atlas + +BLAS_LIB_DEPENDS= libblas.so:math/blas \ + liblapack.so:math/lapack + +OPENMPI_BUILD_DEPENDS= openmpi3>0:net/openmpi3 +OPENMPI_RUN_DEPENDS= openmpi3>0:net/openmpi3 +OPENMPI_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi3 + +MPICH_BUILD_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich +MPICH_RUN_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich +MPICH_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE} + +.include + +.if ${PORT_OPTIONS:MATLAS} BLAS= -lf77blas LAPACK= -lalapack -lcblas .else -LIB_DEPENDS+= libblas.so:math/blas -LIB_DEPENDS+= liblapack.so:math/lapack BLAS= -lblas LAPACK= -llapack .endif -.if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) -WITH_OPENMPI= yes -.endif - -.if defined(WITH_OPENMPI) -BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi -RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi +.if ${PORT_OPTIONS:MOPENMPI} +MPIF77= ${LOCALBASE}/mpi/openmpi3/bin/mpif77 +MPICC= ${LOCALBASE}/mpi/openmpi3/bin/mpicc .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/mpicc:net/mpich -RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:net/mpich +MPIF77= ${LOCALBASE}/bin/mpif77 +MPICC= ${LOCALBASE}/bin/mpicc .endif .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" @@ -92,13 +100,6 @@ CFLAGS+= -O3 -ffast-math -finline-functions -fomit-fra .endif NOOPT= -O0 -.if defined(WITH_OPENMPI) -MPIF77= ${LOCALBASE}/mpi/openmpi/bin/mpif77 -MPICC= ${LOCALBASE}/mpi/openmpi/bin/mpicc -.else -MPIF77= ${LOCALBASE}/bin/mpif77 -MPICC= ${LOCALBASE}/bin/mpicc -.endif # USES=fortran already forces FC to a supported fortran compiler; # assume mpicc points to a compatible compiler and force that, too. Modified: head/math/scalapack/files/pkg-message.in ============================================================================== --- head/math/scalapack/files/pkg-message.in Sun Apr 12 09:09:15 2020 (r531489) +++ head/math/scalapack/files/pkg-message.in Sun Apr 12 09:14:11 2020 (r531490) @@ -24,8 +24,8 @@ If you're using OpenMPI, use this instead: % cd %%DATADIR%%/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 ./xcbrd % mpirun -np 4 ./xcdblu etc., etc. ...