Jed Brown avatar Jed Brown committed 0d622fa Merge

Merge branch 'balay/mpich-3.0.4'

Upgrade to v3.0.4-106-g3adb59c. This nighly is used because it fixes
the FreeBSD bug identified in this branch.

* balay/mpich-3.0.4:
mpich: revert workarround on freebsd as its fixed in the current tarball
mpich: update to pre 3.0.5 snapshot. This fixes a malloc bug in mpiexec [this bug is visible on freebsd - but exists on other arches aswell] http://trac.mpich.org/projects/mpich/ticket/1820
mpich: now 3.0.4 breaks on freebsd. [workarround by using 3.0.3 on it] https://trac.mpich.org/projects/mpich/ticket/1820
mpich: 3.0.4 now works on opensloaris - so download_mpich_sol is not needed http://trac.mpich.org/projects/mpich/ticket/1772
mpich: update to mpich-3.0.4.tar.gz

Comments (0)

Files changed (2)

config/BuildSystem/config/packages/MPI.py

     config.package.Package.__init__(self, framework)
     self.download_openmpi   = ['http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.4.tar.gz',
                                'http://ftp.mcs.anl.gov/pub/petsc/externalpackages/openmpi-1.6.4.tar.gz']
-    self.download_mpich     = ['http://www.mpich.org/static/tarballs/3.0.3/mpich-3.0.3.tar.gz',
-                               'http://ftp.mcs.anl.gov/pub/petsc/externalpackages/mpich-3.0.3.tar.gz']
-    self.download_mpich_sol = ['http://ftp.mcs.anl.gov/pub/petsc/externalpackages/mpich2-1.5.tar.gz']
+    self.download_mpich     = ['http://ftp.mcs.anl.gov/pub/petsc/tmp/mpich-master-v3.0.4-106-g3adb59c.tar.gz']
     self.download           = ['redefine']
     self.functions          = ['MPI_Init', 'MPI_Comm_create']
     self.includes           = ['mpi.h']
       if config.setCompilers.Configure.isCygwin() and not config.setCompilers.Configure.isGNU(self.setCompilers.CC):
         raise RuntimeError('Sorry, cannot download-install MPICH on Windows. Sugest installing windows version of MPICH manually')
       self.liblist      = [[]]
-      if config.setCompilers.Configure.isSolaris():
-        self.download         = self.download_mpich_sol
-      else:
-        self.download         = self.download_mpich
+      self.download         = self.download_mpich
       self.downloadname     = 'mpich'
       self.downloadfilename = 'mpich'
       return config.package.Package.checkDownload(self, requireDownload)

config/BuildSystem/config/setCompilers.py

     return 0
   isDarwin = staticmethod(isDarwin)
 
+  def isFreeBSD():
+    '''Returns true if system is FreeBSD'''
+    (output, error, status) = config.base.Configure.executeShellCommand('uname -s')
+    if not status:
+      return output.lower().strip() == 'freebsd'
+    return 0
+  isFreeBSD = staticmethod(isFreeBSD)
+
   def isWindows(compiler):
     '''Returns true if the compiler is a Windows compiler'''
     if compiler in ['icl', 'cl', 'bcc32', 'ifl', 'df']:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.