diff --git a/Cassiopee/Converter/Converter/kpython b/Cassiopee/Converter/Converter/kpython index fe78d1d73..2d215b004 100755 --- a/Cassiopee/Converter/Converter/kpython +++ b/Cassiopee/Converter/Converter/kpython @@ -148,7 +148,7 @@ else mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l $PYTHONEXE $SCRIPT set +x [ $? != 0 ] && exit 1; - elif [ "$ELSAPROD" = 'ld' ] || [ "$ELSAPROD" = 'ld_i8' ] # ld + elif [ "$ELSAPROD" = 'ld' ] || [ "$ELSAPROD" = 'ld_i8' ] || [ "$ELSAPROD" = 'ld_DBG' ] || [ "$ELSAPROD" = 'ld_i8_DBG' ] # ld then # openMpi if [ $SANITIZE = '1' ] @@ -197,14 +197,14 @@ else 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' ] # juno + 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' ] # juno gcc + elif [ "$ELSAPROD" = 'juno_gcc' ] || [ "$ELSAPROD" = 'juno_gcc_i8' ] || [ "$ELSAPROD" = 'juno_gcc_DBG' ] || [ "$ELSAPROD" = 'juno_gcc_i8_DBG' ] # juno gcc then # openMpi if [ $SANITIZE = '1' ] diff --git a/Cassiopee/KCore/Dist.py b/Cassiopee/KCore/Dist.py index 8b0ddb068..d1e38e9ae 100644 --- a/Cassiopee/KCore/Dist.py +++ b/Cassiopee/KCore/Dist.py @@ -83,9 +83,12 @@ def getenv(name): def getDataFolderName(name='Data'): elsaprod = os.getenv("ELSAPROD") if elsaprod is not None: - if not elsaprod.endswith('_i8') and EDOUBLEINT: + if not '_i8' in elsaprod and EDOUBLEINT: print("Warning: ELSAPROD {} compiled in i8 but recommended suffix " "'_i8' is missing".format(elsaprod)) + if not elsaprod.endswith('_DBG') and DEBUG: + print("Warning: ELSAPROD {} compiled in DEBUG but recommended " + "suffix '_DBG' is missing".format(elsaprod)) name += '_' + elsaprod else: name += '_xx' diff --git a/Cassiopee/KCore/config.py b/Cassiopee/KCore/config.py index 36b2d6f47..87e08dae5 100644 --- a/Cassiopee/KCore/config.py +++ b/Cassiopee/KCore/config.py @@ -29,6 +29,7 @@ key = '' # prod est tout d'abord cherche dans le dictionnaire if prod is not None: + if prod.endswith('_DBG'): prod = prod[:-4] if prod.endswith('_i8'): prod = prod[:-3] for i in dict: if re.compile(i).search(prod) is not None: diff --git a/Cassiopee/KCore/switchIntSize.py b/Cassiopee/KCore/switchIntSize.py index 4ccd81fb1..77d89d5fe 100644 --- a/Cassiopee/KCore/switchIntSize.py +++ b/Cassiopee/KCore/switchIntSize.py @@ -77,9 +77,14 @@ def check_elsaprod(intSize): elsaprod = os.getenv("ELSAPROD") if elsaprod is not None: if intSize == 4 and "_i8" in elsaprod: - print("Remove '_i8' suffix from $ELSAPROD: {}".format(elsaprod[:-3])) + print("Remove '_i8' suffix from $ELSAPROD: {}".format( + elsaprod.replace('_i8', ''))) elif intSize == 8 and "_i8" not in elsaprod: - print("Add '_i8' suffix to $ELSAPROD: {}_i8".format(elsaprod)) + if elsaprod.endswith('_DBG'): + print("Add '_i8_DBG' suffix to $ELSAPROD: {}_i8_DBG".format( + elsaprod[:-4])) + else: + print("Add '_i8' suffix to $ELSAPROD: {}_i8".format(elsaprod)) return if __name__ == '__main__':