[110951] users/eborisch/dports

eborisch at macports.org eborisch at macports.org
Tue Sep 10 17:37:00 PDT 2013


Revision: 110951
          https://trac.macports.org/changeset/110951
Author:   eborisch at macports.org
Date:     2013-09-10 17:37:00 -0700 (Tue, 10 Sep 2013)
Log Message:
-----------
mpich ports (user branch): Update ports depending on mpich. Work in progress.

Modified Paths:
--------------
    users/eborisch/dports/devel/valgrind/Portfile
    users/eborisch/dports/devel/valgrind-devel/Portfile
    users/eborisch/dports/graphics/vtk-devel/Portfile
    users/eborisch/dports/lang/omnixmp/Portfile
    users/eborisch/dports/math/arpack/Portfile
    users/eborisch/dports/math/fftw/Portfile
    users/eborisch/dports/math/fftw-3/Portfile
    users/eborisch/dports/math/fftw-single/Portfile
    users/eborisch/dports/math/gnudatalanguage/Portfile
    users/eborisch/dports/math/petsc/Portfile
    users/eborisch/dports/math/plda/Portfile
    users/eborisch/dports/python/py-mpi4py/Portfile
    users/eborisch/dports/science/hdf5/Portfile
    users/eborisch/dports/science/hdf5-18/Portfile
    users/eborisch/dports/science/hpl/Portfile
    users/eborisch/dports/science/nco/Portfile
    users/eborisch/dports/science/netcdf/Portfile
    users/eborisch/dports/science/netcdf-cxx/Portfile
    users/eborisch/dports/science/netcdf-cxx4/Portfile
    users/eborisch/dports/science/netcdf-fortran/Portfile
    users/eborisch/dports/science/ocaml-mpi/Portfile
    users/eborisch/dports/science/octopus/Portfile

Modified: users/eborisch/dports/devel/valgrind/Portfile
===================================================================
--- users/eborisch/dports/devel/valgrind/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/devel/valgrind/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -72,9 +72,9 @@
 
 variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {}
 variant mpich description {Use mpich for MPI support} conflicts universal {
-    depends_lib-append path:bin/mpicc:mpich
+    depends_lib-append path:bin/mpicc-mp:mpich-default
     configure.args-delete --without-mpicc
-    configure.args-append --with-mpicc=${prefix}/bin/mpicc
+    configure.args-append --with-mpicc=${prefix}/bin/mpicc-mp
 }
 
 variant openmpi description {Use openmpi for MPI support} conflicts universal {

Modified: users/eborisch/dports/devel/valgrind-devel/Portfile
===================================================================
--- users/eborisch/dports/devel/valgrind-devel/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/devel/valgrind-devel/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -65,9 +65,9 @@
 
 variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {}
 variant mpich description {Use mpich for MPI support} conflicts universal {
-    depends_lib-append path:bin/mpicc:mpich
+    depends_lib-append path:bin/mpicc-mp:mpich-default
     configure.args-delete --without-mpicc
-    configure.args-append --with-mpicc=${prefix}/bin/mpicc
+    configure.args-append --with-mpicc=${prefix}/bin/mpicc-mp
 }
 
 variant openmpi description {Use openmpi for MPI support} conflicts universal {

Modified: users/eborisch/dports/graphics/vtk-devel/Portfile
===================================================================
--- users/eborisch/dports/graphics/vtk-devel/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/graphics/vtk-devel/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -757,14 +757,14 @@
 # --- Miscellaneous variants
 
 
-variant mpi description "use message passing interface (mpich2) for parallel support" {
+variant mpi description "use message passing interface (mpich) for parallel support" {
     set nCPU [expr [exec sysctl -n hw.logicalcpu_max]]
     depends_lib-append \
-        path:bin/mpicc:mpich
+        path:bin/mpicxx-mp:mpich-default
     configure.args-append \
         -DVTK_USE_MPI:BOOL=ON \
-        -DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx \
-        -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec \
+        -DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx-mp \
+        -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec-mp \
         -DMPIEXEC_MAX_NUMPROCS:STRING=${nCPU}
         # If the MPI_LIBRARY and-or MPI_INCLUDE_PATH are set, then the
         # FindMPI module will not determine all the cmake variables

Modified: users/eborisch/dports/lang/omnixmp/Portfile
===================================================================
--- users/eborisch/dports/lang/omnixmp/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/lang/omnixmp/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -86,9 +86,9 @@
 variant mpich2 requires mpich description {Variant remaned as +mpich} {}
 
 variant mpich conflicts openmpi description {build with MPICH} {
-    depends_lib-append      port:mpich
-    configure.args-append   --with-mpicc=${prefix}/bin/mpicc
-    configure.args-append   --with-mpif90=${prefix}/bin/mpif90
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.args-append   --with-mpicc=${prefix}/bin/mpicc-mp
+    configure.args-append   --with-mpif90=${prefix}/bin/mpif90-mp
 }
 
 notes \

Modified: users/eborisch/dports/math/arpack/Portfile
===================================================================
--- users/eborisch/dports/math/arpack/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/arpack/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -61,10 +61,10 @@
 }
 
 variant mpich description {build PARPACK, with MPICH} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 openmpi {
-    depends_lib-append     path:bin/mpif77:mpich
+    depends_lib-append     path:bin/mpif77-mp:mpich-default
     configure.args-delete  --disable-mpi
     configure.args-append  --enable-mpi
-    configure.env-append   F77=${prefix}/bin/mpif77 MPIF77=${prefix}/bin/mpif77
+    configure.env-append   F77=${prefix}/bin/mpif77-mp MPIF77=${prefix}/bin/mpif77-mp
 }
 
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] \

Modified: users/eborisch/dports/math/fftw/Portfile
===================================================================
--- users/eborisch/dports/math/fftw/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/fftw/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -46,8 +46,12 @@
 }
 
 variant mpi description {Include FFTW MPI library} {
-    depends_lib-append path:bin/mpicc:mpich
+    depends_lib-append path:bin/mpicc-mp:mpich-default
     configure.args-append --enable-mpi
+
+    post-extract {
+       reinplace "s/mpicc/mpicc-mp mpicc/" configure
+    }
 }
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}

Modified: users/eborisch/dports/math/fftw-3/Portfile
===================================================================
--- users/eborisch/dports/math/fftw-3/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/fftw-3/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -245,8 +245,8 @@
 }
 
 variant mpich description {compile FFTW MPI library with MPICH} conflicts openmpi {
-    depends_lib-append      path:bin/mpicc:mpich
-    configure.env           MPICC=${prefix}/bin/mpicc
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.env           MPICC=${prefix}/bin/mpicc-mp
     configure.args-append   --enable-mpi
 }
 

Modified: users/eborisch/dports/math/fftw-single/Portfile
===================================================================
--- users/eborisch/dports/math/fftw-single/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/fftw-single/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -50,8 +50,12 @@
 }
 
 variant mpi description {Include FFTW MPI library} {
-    depends_lib-append path:bin/mpicc:mpich
+    depends_lib-append path:bin/mpicc-mp:mpich-default
     configure.args-append --enable-mpi
+
+    post-extract {
+       reinplace "s/mpicc/mpicc-mp mpicc/" configure
+    }
 }
 
 # Documentation conflicts with the double precision version,

Modified: users/eborisch/dports/math/gnudatalanguage/Portfile
===================================================================
--- users/eborisch/dports/math/gnudatalanguage/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/gnudatalanguage/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -123,12 +123,19 @@
 }
 
 variant mpich description {build with support for MPICH (experimental)} {
-    depends_lib-append      port:mpich
+    depends_lib-append      port:mpich-default
     configure.args-delete   -DMPICH=OFF
     configure.args-append   -DMPICH=ON \
-                            -DMPICHDIR=${prefix}/lib/mpich
+                            -DMPICHDIR=${prefix}/lib/mpich-mp
 } 
 
+variant mpich_devel description {build with support for MPICH (experimental)} {
+    depends_lib-append      port:mpich-devel-default
+    configure.args-delete   -DMPICH=OFF
+    configure.args-append   -DMPICH=ON \
+                            -DMPICHDIR=${prefix}/lib/mpich-devel-mp
+} 
+
 # gnudatalanguage does not build against wxWidgets30. 
 # wxWidget support is not actively developed.
 variant wxWidgets description {deprecated compatibility variant} {

Modified: users/eborisch/dports/math/petsc/Portfile
===================================================================
--- users/eborisch/dports/math/petsc/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/petsc/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -74,12 +74,12 @@
 }
 
 variant mpich description {Build using the MPICH compiler} conflicts openmpi {
-    depends_lib-append path:bin/mpicc:mpich
+    depends_lib-append path:bin/mpicc-mp:mpich-default
     configure.args-append \
-        --with-cc=${prefix}/bin/mpicc \
-        --with-cxx=${prefix}/bin/mpicxx \
-        --with-fc=${prefix}/bin/mpif90 \
-        --with-mpiexec=${prefix}/bin/mpiexec
+        --with-cc=${prefix}/bin/mpicc-mp \
+        --with-cxx=${prefix}/bin/mpicxx-mp \
+        --with-fc=${prefix}/bin/mpif90-mp \
+        --with-mpiexec=${prefix}/bin/mpiexec.hydra-mp
 }
 
 variant accelerate description {Use Accelerate framework for LAPACK} conflicts atlas {

Modified: users/eborisch/dports/math/plda/Portfile
===================================================================
--- users/eborisch/dports/math/plda/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/math/plda/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -33,8 +33,11 @@
                     CFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
 
 variant mpi description {Add parallel lda} {
-    depends_lib         path:bin/mpicc:mpich
+    depends_lib         path:bin/mpicc-mp:mpich-default
     build.target        lda infer mpi_lda
+    post-extract {
+        reinplace "s/mpicxx/mpicxx-mp -Wno-type-safety/" Makefile
+    }
     post-destroot {
         xinstall -m 755 ${worksrcpath}/mpi_lda ${destroot}${prefix}/bin/mpi_plda
     }

Modified: users/eborisch/dports/python/py-mpi4py/Portfile
===================================================================
--- users/eborisch/dports/python/py-mpi4py/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/python/py-mpi4py/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -44,8 +44,9 @@
 
         variant mpich description {builds with the mpich port} {
             build.args-delete   "--mpicc=${prefix}/bin/openmpicc"
+            build.args-delete   "--mpicc=${prefix}/bin/mpicc-mp"
             depends_lib-delete  port:openmpi
-            depends_lib-append  path:bin/mpicc:mpich
+            depends_lib-append  path:bin/mpicc-mp:mpich-default
         }
 
         variant mpich2 requires mpich description {Legacy compatibility variant} {}

Modified: users/eborisch/dports/science/hdf5/Portfile
===================================================================
--- users/eborisch/dports/science/hdf5/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/hdf5/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -116,11 +116,11 @@
 }
 
 variant mpich description {Parallel HDF5 with mpich (disables C++)} {
-    depends_lib-append          path:bin/mpicc:mpich
+    depends_lib-append          path:bin/mpicc-mp:mpich-default
     configure.args-delete       --enable-cxx
-    configure.cc                ${prefix}/bin/mpicc
+    configure.cc                ${prefix}/bin/mpicc-mp
     if { [variant_isset fortran] } {
-       configure.fc             ${prefix}/bin/mpif90
+       configure.fc             ${prefix}/bin/mpif90-mp
     }
 }
 

Modified: users/eborisch/dports/science/hdf5-18/Portfile
===================================================================
--- users/eborisch/dports/science/hdf5-18/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/hdf5-18/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -170,10 +170,10 @@
     Enable Parallel HDF5 with mpich. Uses compiler selected with mpich.
   +mpich is EXPERIMENTAL with +cxx or +threadsafe.
 } conflicts universal openmpi gcc44 gcc45 gcc46 gcc47 gcc48 {
-    depends_lib-append          path:bin/mpicc:mpich
-    configure.cc                ${prefix}/bin/mpicc
-    configure.cxx               ${prefix}/bin/mpicxx
-    configure.fc                ${prefix}/bin/mpif90
+    depends_lib-append          path:bin/mpicc-mp:mpich-default
+    configure.cc                ${prefix}/bin/mpicc-mp
+    configure.cxx               ${prefix}/bin/mpicxx-mp
+    configure.fc                ${prefix}/bin/mpif90-mp
 }
 
 if {[ variant_isset mpich ] || [ variant_isset openmpi ]} {

Modified: users/eborisch/dports/science/hpl/Portfile
===================================================================
--- users/eborisch/dports/science/hpl/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/hpl/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -63,10 +63,10 @@
 }
 
 variant mpich conflicts openmpi description {Build with MPICH} {
-    depends_lib-append     path:bin/mpicc:mpich
-    build.args-append      CC=${prefix}/bin/mpicc \
-                           LINKER=${prefix}/bin/mpicc
-    test.cmd cd bin/macos && ${prefix}/bin/openmpirun -n 4 ./xhpl
+    depends_lib-append     path:bin/mpicc-mp:mpich-default
+    build.args-append      CC=${prefix}/bin/mpicc-mp \
+                           LINKER=${prefix}/bin/mpicc-mp
+    test.cmd cd bin/macos && ${prefix}/bin/mpiexec.hydra-mp -n 4 ./xhpl
 }
 
 variant atlas conflicts accelerate description {Use ATLAS for BLAS library} {

Modified: users/eborisch/dports/science/nco/Portfile
===================================================================
--- users/eborisch/dports/science/nco/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/nco/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -72,8 +72,12 @@
 }
 
 variant mpich description {enable MPI with mpich} {
-    depends_lib-append      path:bin/mpicc:mpich
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
     configure.args-append   --enable-mpi
+    post-extract {
+        reinplace -E "s|( ?MPICC := ).*|\\1${prefix}/mpicc-mp|" bld/Makefile
+        reinplace -E "s|( ?MPICXX := ).*|\\1${prefix}/mpicxx-mp|" bld/Makefile
+    }
 }
 
 variant openmpi description {enable MPI with openmpi} {

Modified: users/eborisch/dports/science/netcdf/Portfile
===================================================================
--- users/eborisch/dports/science/netcdf/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/netcdf/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -63,8 +63,8 @@
 }
 
 variant mpich conflicts openmpi description {compile with mpich} {
-    depends_lib-append      path:bin/mpicc:mpich
-    configure.cc            mpicc
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.cc            mpicc-mp
     configure.cc_archflags  ""
     configure.ld_archflags  ""
 }

Modified: users/eborisch/dports/science/netcdf-cxx/Portfile
===================================================================
--- users/eborisch/dports/science/netcdf-cxx/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/netcdf-cxx/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -57,9 +57,9 @@
 }
 
 variant mpich conflicts openmpi description {compile with mpich} {
-    depends_lib-append      path:bin/mpicc:mpich
-    configure.cc            mpicc
-    configure.cxx           mpicxx
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.cc            mpicc-mp
+    configure.cxx           mpicxx-mp
 }
 
 variant mpich2 requires mpich description {Legacy compatibility variant} {}

Modified: users/eborisch/dports/science/netcdf-cxx4/Portfile
===================================================================
--- users/eborisch/dports/science/netcdf-cxx4/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/netcdf-cxx4/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -55,9 +55,9 @@
 }
 
 variant mpich conflicts openmpi description {compile with mpich} {
-    depends_lib-append      path:bin/mpicc:mpich
-    configure.cc            mpicc
-    configure.cxx           mpicxx
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.cc            mpicc-mp
+    configure.cxx           mpicxx-mp
 }
 
 variant mpich2 requires mpich description {Legacy compatibility variant} {}

Modified: users/eborisch/dports/science/netcdf-fortran/Portfile
===================================================================
--- users/eborisch/dports/science/netcdf-fortran/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/netcdf-fortran/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -134,9 +134,9 @@
 }
 
 variant mpich conflicts openmpi description {compile with mpich} {
-    depends_lib-append      path:bin/mpicc:mpich
-    configure.fc            mpif90
-    configure.cc            mpicc
+    depends_lib-append      path:bin/mpicc-mp:mpich-default
+    configure.fc            mpif90-mp
+    configure.cc            mpicc-mp
 }
 
 variant mpich2 requires mpich description {Legacy compatibility variant} {}

Modified: users/eborisch/dports/science/ocaml-mpi/Portfile
===================================================================
--- users/eborisch/dports/science/ocaml-mpi/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/ocaml-mpi/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -21,7 +21,7 @@
                     sha1    4f836f02f7e8852ba72d4293aea43cf7a3438b0f \
                     rmd160  c0a08090073c54e130cd2712c7d1cfbeb8d17793
 
-depends_lib         port:ocaml port:ocaml-findlib path:bin/mpicc:mpich
+depends_lib         port:ocaml port:ocaml-findlib path:bin/mpicc-mp:mpich-default
 
 patchfiles          Makefile.diff
 
@@ -32,7 +32,12 @@
 use_configure       no
 use_parallel_build  no
 
-build.env           MPIINCDIR=${prefix}/include/mpich2 MPILIBDIR=${prefix}/lib
+if {[file exists ${prefix}/lib/mpich-mp]} then {
+   build.env           MPIINCDIR=${prefix}/include MPILIBDIR=${prefix}/lib/mpich-mp
+} else {
+   build.env           MPIINCDIR=${prefix}/include MPILIBDIR=${prefix}/lib/mpich-devel-mp
+}
+
 build.target        all
 
 set ocamlfind_destdir ${destroot}${prefix}/lib/ocaml/site-lib

Modified: users/eborisch/dports/science/octopus/Portfile
===================================================================
--- users/eborisch/dports/science/octopus/Portfile	2013-09-10 23:17:14 UTC (rev 110950)
+++ users/eborisch/dports/science/octopus/Portfile	2013-09-11 00:37:00 UTC (rev 110951)
@@ -136,11 +136,11 @@
 }
 
 variant mpich conflicts gcc46 gcc47 gcc48 openmpi description {Build with MPICH} {
-    configure.cc           mpicc
-    configure.fc           mpif90
+    configure.cc           mpicc-mp
+    configure.fc           mpif90-mp
     configure.args-delete  --disable-mpi
     configure.args-append  --enable-mpi --without-external_zoltan
-    depends_lib-append     path:bin/mpif90:mpich
+    depends_lib-append     path:bin/mpif90-mp:mpich-default
 }
 
 variant newuoa description {Build with internal newuoa library for optimal control} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130910/eaf34a4b/attachment-0001.html>


More information about the macports-changes mailing list