/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6572 by caltinay, Sun May 7 11:44:34 2017 UTC revision 6573 by jfenwick, Wed May 17 00:02:42 2017 UTC
# Line 156  vars.AddVariables( Line 156  vars.AddVariables(
156    ('papi_libs', 'PAPI libraries to link with', ['papi']),    ('papi_libs', 'PAPI libraries to link with', ['papi']),
157    BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False),    BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False),
158    BoolVariable('osx_dependency_fix', 'Fix dependencies for libraries to have absolute paths (OSX)', False),    BoolVariable('osx_dependency_fix', 'Fix dependencies for libraries to have absolute paths (OSX)', False),
159    BoolVariable('stdlocationisprefix', 'Set the prefix as escript root in the launcher', False)    BoolVariable('stdlocationisprefix', 'Set the prefix as escript root in the launcher', False),
160      BoolVariable('mpi_no_host', 'Do not specify --host in run-escript launcher (only OPENMPI)', False)
161  )  )
162    
163  ##################### Create environment and help text #######################  ##################### Create environment and help text #######################
# Line 514  if env['launcher'] == 'default': Line 515  if env['launcher'] == 'default':
515      if env['mpi'] == 'INTELMPI':      if env['mpi'] == 'INTELMPI':
516          env['launcher'] = "mpirun -hostfile %f -n %N -ppn %p %b"          env['launcher'] = "mpirun -hostfile %f -n %N -ppn %p %b"
517      elif env['mpi'] == 'OPENMPI':      elif env['mpi'] == 'OPENMPI':
518            if env['mpi_no_host']:
519                hostoptionstr=''
520            else:
521                hostoptionstr='--host %h'
522          # default to OpenMPI version 1.10 or higher          # default to OpenMPI version 1.10 or higher
523          env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} --host %h --map-by node:pe=%t -bind-to core -np %N %b"          env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} "+hostoptionstr+" --map-by node:pe=%t -bind-to core -np %N %b"
524          if 'orte_version' in env:          if 'orte_version' in env:
525              major,minor,point = [int(i) for i in env['orte_version'].split('.')]              major,minor,point = [int(i) for i in env['orte_version'].split('.')]
526              if major == 1 and minor < 10:              if major == 1 and minor < 10:
527                  env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} --host %h --cpus-per-rank %t -np %N %b"                  env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} "+hostoptionstr+" --cpus-per-rank %t -np %N %b"
528      elif env['mpi'] == 'MPT':      elif env['mpi'] == 'MPT':
529          env['launcher'] = "mpirun %h -np %p %b"          env['launcher'] = "mpirun %h -np %p %b"
530      elif env['mpi'] == 'MPICH':      elif env['mpi'] == 'MPICH':

Legend:
Removed from v.6572  
changed lines
  Added in v.6573

  ViewVC Help
Powered by ViewVC 1.1.26