Changeset 2319 in /cluster/svnroot


Ignore:
Timestamp:
Apr 8, 2010 1:44:08 PM (11 years ago)
Author:
fitz
Message:

Revert to bash_profile from trunk and amend runmpi function, removing lam (#484) and fixing openmpi (#492)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/fitz-devel/packages/etc/skel/.bash_profile

    r2287 r2319  
    2525
    2626. /usr/local/Modules/3.2.6/init/bash
    27 
    28 # Don't load modules if coming in over rsync
    29 # See /bin/bccd-syncdir.
    30 if [ -z "$RSYNC" ]; then
    31         #module load modules/remote-bccd
    32         module load modules
    33         module load PSC_DX cuda dreamm fftw openmpi jre mcell mpe xmpi
    34 fi
     27#module load modules/remote-bccd
     28module load modules
     29module load PSC_DX cuda dreamm fftw openmpi jre mcell mpe xmpi
    3530
    3631# Alias some MPI commands to get X-forwarding working properly.
     
    4338        module list 2>&1 | egrep -q '[[:space:]]mpich2\/'
    4439        MPICH=$?
    45         module list 2>&1 | egrep -q '[[:space:]]lam\/'
    46         LAM=$?
    4740
    4841        if [ $OMPI -eq 0 ]; then
    49                 'mpirun' -x DISPLAY=`hostname -s`:0.0 $@
    50                 return $?
     42                OPTS="-x DISPLAY=`hostname -s`:0.0"
    5143        elif [ $MPICH -eq 0 ]; then
    52                 'mpiexec' -genv DISPLAY `hostname -s`:0.0 $@
    53                 return $?
    54         elif [ $LAM -eq 0 ]; then
    55                 'mpirun' -x DISPLAY=`hostname -s`:0.0 $@
    56                 return $?
     44                OPTS="-genv DISPLAY `hostname -s`:0.0"
    5745        fi
     46
     47        `which mpirun` $OPTS $@
    5848}
    5949
Note: See TracChangeset for help on using the changeset viewer.