Converter: update kpython for new prods

onera · Jun 20, 2024 · ebbc64f · ebbc64f
1 parent b937674
commit ebbc64f
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/Cassiopee/Converter/Converter/kpython b/Cassiopee/Converter/Converter/kpython
@@ -128,12 +128,17 @@ else
  if [ "$ELSAPROD" = 'x86_r8' ] # eos
  then
  set -x
- # openMpi
- #mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
  # intelMpi
  mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
+ elif [ "$ELSAPROD" = 'ld' ] || [ "$ELSAPROD" = 'ld_i8' ] # ld
+ then
+ set -x
+ # openMpi
+ mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
+ set +x
+ [ $? != 0 ] && exit 1;
  elif [ "$ELSAPROD" = 'aus_r8' ] # austri
  then
  set -x
@@ -148,34 +153,34 @@ else
  mpirun $ARGS -n $NPROCS -l -ordered-output $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
- elif [ "$ELSAPROD" = 'sat_cas_r8' ] # sator-new
+ elif [ "$ELSAPROD" = 'sat_cas_r8' ] || [ "$ELSAPROD" = 'sat_cas_r8_i8' ] # sator-new
  then
  set -x
  # intelMpi
  mpirun $ARGS -n $NPROCS -l -ordered-output $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
- elif [ "$ELSAPROD" = 'spiro_el8' ] || [ "$ELSAPROD" = 'spiro_amdrm_r8' ] || [ "$ELSAPROD" = 'spiro_amdnp_r8' ] || [ "$ELSAPROD" = 'spiro_sky_r8' ] || [ "$ELSAPROD" = 'spiro_cas_r8' ] # spiro
+ elif [ "$ELSAPROD" = 'spiro_el8' ] || [ "$ELSAPROD" = 'spiro_el8_i8' ] || [ "$ELSAPROD" = 'spiro_amdrm_r8' ] || [ "$ELSAPROD" = 'spiro_amdnp_r8' ] || [ "$ELSAPROD" = 'spiro_sky_r8' ] || [ "$ELSAPROD" = 'spiro_cas_r8' ] # spiro
  then
  set -x
  # intelMpi
  mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l -ordered-output $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
- elif [ "$ELSAPROD" = 'juno' ] # juno
+ elif [ "$ELSAPROD" = 'juno' ] || [ "$ELSAPROD" = 'juno_i8' ] # juno
  then
  set -x
  # intelMpi
  mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l -ordered-output $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
- elif [ "$ELSAPROD" = 'stv_r8' ] # stelvio
+ elif [ "$ELSAPROD" = 'juno_gcc' ] || [ "$ELSAPROD" = 'juno_gcc_i8' ] # juno gcc
  then
-  set -x
- # intelMpi
- mptrun $ARGS -omp $NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
+ set -x
+ # openMpi
+ mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
  set +x
- [ $? != 0 ] && exit 1;
+ [ $? != 0 ] && exit 1; 
  elif [ "$ELSAPROD" = 'cob_r8' ] # cobalt
  then
  set -x
@@ -197,7 +202,7 @@ else
  mpiexec $ARGS -np $NPROCS $PYTHONEXE $SCRIPT
  set +x
  [ $? != 0 ] && exit 1;
- else
+ else # default 
  set -x
  mpirun $ARGS -np $NPROCS $PYTHONEXE $SCRIPT
  set +x