Merge pull request #120 from vincentcasseau/main

Converter: remove script tracing in kpython: set +/-x
onera · Aug 1, 2024 · 8ed716c · 8ed716c
2 parents 3d80088 + b8e9892
commit 8ed716c
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/Cassiopee/Converter/Converter/kpython b/Cassiopee/Converter/Converter/kpython
@@ -143,106 +143,76 @@ else
     export OMP_NUM_THREADS=$NTHREADS
     if [ "$ELSAPROD" = 'x86_r8' ] # eos
     then
-        set -x
         # intelMpi
         mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     elif [ "$ELSAPROD" = 'ld' ] || [ "$ELSAPROD" = 'ld_i8' ] || [ "$ELSAPROD" = 'ld_DBG' ] || [ "$ELSAPROD" = 'ld_i8_DBG' ] # ld
     then
         # openMpi    
         if [ $SANITIZE = '1' ]
         then
-            set -x
             mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -x LD_PRELOAD=$ASAN_LIB -np $NPROCS $PYTHONEXE $SCRIPT
-            set +x
         else
-            set -x
             mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
-            set +x
         fi
         [ $? != 0 ] && exit 1;
     elif [ "$ELSAPROD" = 'visung_r8' ] || [ "$ELSAPROD" = 'visung_r8_i8' ] # visung
     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
         # intelMpi
         mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     elif [ "$ELSAPROD" = 'sat_r8' ] # sator
     then
-        set -x
         # intelMpi
         mpirun $ARGS -n $NPROCS -l -ordered-output $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     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_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' ] || [ "$ELSAPROD" = 'juno_i8' ] || [ "$ELSAPROD" = 'juno_DBG' ] || [ "$ELSAPROD" = 'juno_i8_DBG' ] # 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" = 'juno_gcc' ] || [ "$ELSAPROD" = 'juno_gcc_i8' ] || [ "$ELSAPROD" = 'juno_gcc_DBG' ] || [ "$ELSAPROD" = 'juno_gcc_i8_DBG' ] # juno gcc
     then
         # openMpi
         if [ $SANITIZE = '1' ]
         then
-            set -x
             mpirun $ARGS -x LD_PRELOAD=$ASAN_LIB -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
-            set +x
         else
-            set -x
             mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
-            set +x
         fi
         [ $? != 0 ] && exit 1;    
     elif [ "$ELSAPROD" = 'cob_r8' ] # cobalt
     then
-        set -x
         export OMP_NUM_THREADS=$NTHREADS
         ccc_mprun -n $NPROCS $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     elif [ "$ELSAPROD" = 'msys64' ] # MSYS 2 With Win64 production
     then
-        set -x
 	    # MSMPI
 	    mpiexec $ARGS -np $NPROCS $PYTHONEXE $SCRIPT
-        set +x    
         [ $? != 0 ] && exit 1;
     elif [ "$ELSAPROD" = 'win64' ] # MSYS 2 With Win64 production
     then
-        set -x
 	    # MSMPI
 	    mpiexec $ARGS -np $NPROCS $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     else # default 
-        set -x
         mpirun $ARGS -np $NPROCS $PYTHONEXE $SCRIPT
-        set +x
         [ $? != 0 ] && exit 1;
     fi
     unset MPIRUN