Received: by mail.netbsd.org (Postfix, from userid 605) id EA18F84D78; Thu, 4 Jan 2018 20:31:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7149D84D38 for ; Thu, 4 Jan 2018 20:31:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id nWNc2YTw8Qz5 for ; Thu, 4 Jan 2018 20:31:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 71DC484CFB for ; Thu, 4 Jan 2018 20:31:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6846DFBDE; Thu, 4 Jan 2018 20:31:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1515097888280280" MIME-Version: 1.0 Date: Thu, 4 Jan 2018 20:31:28 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/parallel/openmpi To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180104203128.6846DFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1515097888280280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Jan 4 20:31:28 UTC 2018 Modified Files: pkgsrc/parallel/openmpi: DESCR Makefile PLIST distinfo options.mk Log Message: openmpi: updated to 1.10.7 1.10.7: - Fix bug in TCP BTL that impacted performance on 10GbE (and faster) networks by not adjusting the TCP send/recv buffer sizes and using system default values - Add missing MPI_AINT_ADD and MPI_AINT_DIFF function delcarations in mpif.h - Fixed time reported by MPI_WTIME; it was previously reported as dependent upon the CPU frequency. - Fix platform detection on FreeBSD - Fix a bug in the handling of MPI_TYPE_CREATE_DARRAY in MPI_(R)(GET_)ACCUMULATE - Fix openib memory registration limit calculation - Add missing MPI_T_PVAR_SESSION_NULL in mpi.h - Fix "make distcheck" when using external hwloc and/or libevent packages - Add latest ConnectX-5 vendor part id to OpenIB device params - Fix race condition in the UCX PML - Fix signal handling for rsh launcher - Fix Fortran compilation errors by removing MPI_SIZEOF in the Fortran interfaces when the compiler does not support it - Fixes for the pre-ignore-TKR "mpi" Fortran module implementation (i.e., for older Fortran compilers -- these problems did not exist in the "mpi" module implementation for modern Fortran compilers): - Add PMPI_* interfaces - Fix typo in MPI_FILE_WRITE_AT_ALL_BEGIN interface name - Fix typo in MPI_FILE_READ_ORDERED_BEGIN interface name - Fixed the type of MPI_DISPLACEMENT_CURRENT in all Fortran interfaces to be an INTEGER(KIND=MPI_OFFSET_KIND). - Fixed typos in MPI_INFO_GET_* man pages. Thanks to Nicolas Joly for the patch - Fix typo bugs in wrapper compiler script To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/parallel/openmpi/DESCR cvs rdiff -u -r1.37 -r1.38 pkgsrc/parallel/openmpi/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/parallel/openmpi/PLIST \ pkgsrc/parallel/openmpi/distinfo cvs rdiff -u -r1.9 -r1.10 pkgsrc/parallel/openmpi/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1515097888280280 Content-Disposition: inline Content-Length: 9640 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/parallel/openmpi/DESCR diff -u pkgsrc/parallel/openmpi/DESCR:1.3 pkgsrc/parallel/openmpi/DESCR:1.4 --- pkgsrc/parallel/openmpi/DESCR:1.3 Mon Apr 8 18:29:41 2013 +++ pkgsrc/parallel/openmpi/DESCR Thu Jan 4 20:31:28 2018 @@ -1,15 +1,11 @@ -The Open MPI Project is an open source MPI-2 implementation -that is developed and maintained by a consortium of academic, -research, and industry partners. Open MPI is therefore able to -combine the expertise, technologies, and resources from all -across the High Performance Computing community in order to -build the best MPI library available. Open MPI offers advantages -for system and software vendors, application developers and -computer science researchers. - -Features implemented or in short-term development for Open MPI -include: +The Open MPI Project is an open source MPI-2 implementation that is developed +and maintained by a consortium of academic, research, and industry partners. +Open MPI is therefore able to combine the expertise, technologies, and +resources from all across the High Performance Computing community in order to +build the best MPI library available. Open MPI offers advantages for system and +software vendors, application developers and computer science researchers. +Features implemented or in short-term development for Open MPI include: - Full MPI-2 standards conformance - Thread safety and concurrency - Dynamic process spawning Index: pkgsrc/parallel/openmpi/Makefile diff -u pkgsrc/parallel/openmpi/Makefile:1.37 pkgsrc/parallel/openmpi/Makefile:1.38 --- pkgsrc/parallel/openmpi/Makefile:1.37 Mon Jan 1 18:16:38 2018 +++ pkgsrc/parallel/openmpi/Makefile Thu Jan 4 20:31:28 2018 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2018/01/01 18:16:38 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2018/01/04 20:31:28 adam Exp $ -DISTNAME= openmpi-1.10.4 +DISTNAME= openmpi-1.10.7 CATEGORIES= parallel MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.10/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -8,34 +8,34 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= asau@inbox.ru HOMEPAGE= http://www.open-mpi.org/ COMMENT= Open source MPI-3.1 implementation +LICENSE= modified-bsd -GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ fortran77 +CONFLICTS= mpich-[0-9]* + +USE_LANGUAGES= c c++ USE_LIBTOOL= yes +USE_TOOLS+= perl:run +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-slurm +CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package +CONFIGURE_ARGS+= --with-libltdl=${BUILDLINK_PREFIX.libltdl} +CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc} +CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" +CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool \ ${WRKSRC}/ompi/contrib/vt/vt/extlib/otf/libtool \ ${WRKSRC}/ompi/contrib/vt/vt/libtool \ ${WRKSRC}/ompi/mca/io/romio/romio/libtool SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 -CONFIGURE_ARGS+= --without-slurm -CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package -CONFIGURE_ARGS+= --with-libltdl=${BUILDLINK_PREFIX.libltdl:Q} # use our libltdl -CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc:Q} #external -CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" -CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"?? -CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 - -# Prevent detection of OpenMP support in order to make PLIST consistent: +# Prevent detection of OpenMP support in order to make PLIST consistent BUILDLINK_TRANSFORM= rm:-fopenmp -USE_TOOLS+= perl:run - .include "options.mk" TEST_TARGET= check -PLIST_VARS+= f08 linux loadleveler oshmem pstattest shm +PLIST_VARS+= linux loadleveler oshmem pstattest shm PLIST_VARS+= ignoretkr noignoretkr .if ${OPSYS} == "Linux" @@ -44,7 +44,6 @@ PLIST.linux= yes PLIST.loadleveler= yes PLIST.oshmem= yes PLIST.ignoretkr= yes -PLIST.f08= yes .elif ${OPSYS} == "AIX" PLIST.loadleveler= yes .elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \ @@ -53,17 +52,12 @@ PLIST.shm= yes .endif .if ${OPSYS} != "Linux" PLIST.pstattest= yes +. if ${OPSYS} != "Darwin" PLIST.noignoretkr= yes +. endif .endif -## Just in case you'll need it... -# USE_TOOLS+= aclocal autoconf automake bash perl -# REPLACE_BASH= autogen.sh - -REPLACE_PERL= ompi/tools/wrappers/mpijavac.pl.in - -# pre-configure: replace-interpreter -# cd $(WRKSRC) && $(BASH) autogen.sh +REPLACE_PERL= ompi/tools/wrappers/mpijavac.pl.in #LIBLTDL_CONVENIENCE_SUBDIR= opal/libltdl #.include "../../devel/libltdl/convenience.mk" # for "test" target to work Index: pkgsrc/parallel/openmpi/PLIST diff -u pkgsrc/parallel/openmpi/PLIST:1.18 pkgsrc/parallel/openmpi/PLIST:1.19 --- pkgsrc/parallel/openmpi/PLIST:1.18 Mon Jan 1 22:29:51 2018 +++ pkgsrc/parallel/openmpi/PLIST Thu Jan 4 20:31:28 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2018/01/01 22:29:51 rillig Exp $ +@comment $NetBSD: PLIST,v 1.19 2018/01/04 20:31:28 adam Exp $ bin/mpiCC bin/mpic++ bin/mpicc @@ -36,14 +36,14 @@ ${PLIST.oshmem}bin/shmemrun include/mpi-ext.h include/mpi.h include/mpi_portable_platform.h -include/mpif-config.h -include/mpif-constants.h +${PLIST.f90}include/mpif-config.h +${PLIST.f90}include/mpif-constants.h include/mpif-ext.h -include/mpif-externals.h -include/mpif-handles.h -include/mpif-io-constants.h -include/mpif-io-handles.h -include/mpif-sentinels.h +${PLIST.f90}include/mpif-externals.h +${PLIST.f90}include/mpif-handles.h +${PLIST.f90}include/mpif-io-constants.h +${PLIST.f90}include/mpif-io-handles.h +${PLIST.f90}include/mpif-sentinels.h include/mpif-sizeof.h include/mpif.h ${PLIST.oshmem}include/mpp/shmem.fh @@ -95,8 +95,8 @@ lib/libmca_common_sm.la lib/libmpi.la lib/libmpi_cxx.la ${PLIST.java}lib/libmpi_java.la -lib/libmpi_mpifh.la -${PLIST.noignoretkr}lib/libmpi_usempi.la +${PLIST.f90}lib/libmpi_mpifh.la +${PLIST.f90}${PLIST.noignoretkr}lib/libmpi_usempi.la ${PLIST.ignoretkr}lib/libmpi_usempi_ignore_tkr.la ${PLIST.f08}lib/libmpi_usempif08.la lib/libompitrace.la @@ -104,8 +104,8 @@ lib/libopen-pal.la lib/libopen-rte.la ${PLIST.oshmem}lib/liboshmem.la ${PLIST.java}lib/mpi.jar -lib/mpi.mod -${PLIST.ignoretkr}lib/mpi_ext.mod +${PLIST.f90}lib/mpi.mod +${PLIST.f90}${PLIST.ignoretkr}lib/mpi_ext.mod ${PLIST.f08}lib/mpi_f08.mod ${PLIST.f08}lib/mpi_f08_callbacks.mod ${PLIST.f08}lib/mpi_f08_ext.mod @@ -863,6 +863,7 @@ share/openmpi/help-dash-host.txt share/openmpi/help-db-base.txt share/openmpi/help-errmgr-base.txt share/openmpi/help-ess-base.txt +share/openmpi/help-ess-hnp.txt share/openmpi/help-hostfile.txt share/openmpi/help-mca-base.txt share/openmpi/help-mca-bml-r2.txt Index: pkgsrc/parallel/openmpi/distinfo diff -u pkgsrc/parallel/openmpi/distinfo:1.18 pkgsrc/parallel/openmpi/distinfo:1.19 --- pkgsrc/parallel/openmpi/distinfo:1.18 Sun Oct 23 14:02:28 2016 +++ pkgsrc/parallel/openmpi/distinfo Thu Jan 4 20:31:28 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.18 2016/10/23 14:02:28 asau Exp $ +$NetBSD: distinfo,v 1.19 2018/01/04 20:31:28 adam Exp $ -SHA1 (openmpi-1.10.4.tar.bz2) = 1676a7da6cc8cde1d46f6296f38d575249b46cd9 -RMD160 (openmpi-1.10.4.tar.bz2) = cea15b9fe8852805a5f8c1591b31907d996587c7 -SHA512 (openmpi-1.10.4.tar.bz2) = 58bcdc48a4d539f2656480751a9d8129597a0460f7b6ecc6f4d0094703c5f1a3f560eaf80b819d902dee91a77a0d21994f6e42728305969647d3170beefe39df -Size (openmpi-1.10.4.tar.bz2) = 13430203 bytes +SHA1 (openmpi-1.10.7.tar.bz2) = fe359d8caa4888625308cf03343d913dd5ac6198 +RMD160 (openmpi-1.10.7.tar.bz2) = 6397a59bef49f51d865a7a6f53fc4cf51d317076 +SHA512 (openmpi-1.10.7.tar.bz2) = 9c5470f9959ca37650a59e56fb8343c028422c709876ab9d25a411dd09a07cdde927c45d8f3db1ad524b1f2847fe799471d469fa1efee48f8018b2ff24427ecb +Size (openmpi-1.10.7.tar.bz2) = 13435131 bytes SHA1 (patch-aa) = 6fa20775c6e2abae7c9a2ae858dbb941652beab8 SHA1 (patch-ai) = 33667fb853caef7ae9a22c7f2e6a016929eb1a13 SHA1 (patch-aj) = ec79dc2137107d1253e47811c3ea7d00ff988b06 Index: pkgsrc/parallel/openmpi/options.mk diff -u pkgsrc/parallel/openmpi/options.mk:1.9 pkgsrc/parallel/openmpi/options.mk:1.10 --- pkgsrc/parallel/openmpi/options.mk:1.9 Sun Dec 13 06:49:01 2015 +++ pkgsrc/parallel/openmpi/options.mk Thu Jan 4 20:31:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2015/12/13 06:49:01 markd Exp $ +# $NetBSD: options.mk,v 1.10 2018/01/04 20:31:28 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openmpi PKG_SUPPORTED_OPTIONS= debug f90 java sge @@ -9,23 +9,19 @@ PKG_SUPPORTED_OPTIONS= debug f90 java sg CONFIGURE_ARGS+= --enable-debug .endif -PLIST_VARS+= f90 java sge +PLIST_VARS+= f08 f90 java sge .if !empty(PKG_OPTIONS:Mf90) +USE_LANGUAGES+= fortran GCC_REQD+= 4.7 GCCDIR= ${PREFIX}/gcc47 -CONFIGURE_ARGS+= --enable-mpi-f90 -CONFIGURE_ENV+= FC=${GCCDIR}/bin/gfortran +CONFIGURE_ARGS+= --enable-mpi-fortran=yes PLIST.f90= yes - -SUBST_CLASSES+= f90 -SUBST_STAGE.f90= post-configure -SUBST_FILES.f90= ompi/tools/wrappers/mpif90-wrapper-data.txt -SUBST_SED.f90= -e 's,^compiler=.*$$,compiler=${GCCDIR}/bin/gfortran,' -SUBST_SED.f90+= -e 's,^linker_flags=,linker_flags= -R${GCCDIR}/lib ,' -SUBST_SED.f90+= -e 's,^linker_flags=,linker_flags= -L${GCCDIR}/lib ,' +. if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" +PLIST.f08= yes +. endif .else -CONFIGURE_ARGS+= --disable-mpi-f90 +CONFIGURE_ARGS+= --enable-mpi-fortran=no .endif .if !empty(PKG_OPTIONS:Mjava) @@ -37,7 +33,7 @@ CONFIGURE_ARGS+= --disable-mpi-java .endif .if !empty(PKG_OPTIONS:Msge) -CONFIGURE_ARGS+= --with-sge +CONFIGURE_ARGS+= --with-sge PLIST.sge= yes .else CONFIGURE_ARGS+= --without-sge --_----------=_1515097888280280--