[Adastra-gpu] F77Flags in debug mode should contain -O0, otherwise link fails

    + cleanup

Author: trust-tma

.gitignore

@@ -56,8 +56,6 @@ Outils/ICoCo/ICoCo_src/README.BALTIK
 Outils/ICoCo/ICoCo_src/configure
 Outils/ICoCo/ICoCo_src/env_MEDICoCo.sh
 Outils/ICoCo/ICoCo_src/full_env_MEDICoCo.sh
-Outils/Python_modules/distribute-0.6.28/
-Outils/Python_modules/distribute-0.7.3/
 Outils/ICoCo/ICoCo_src/share/swig/install/
 Outils/ICoCo/ICoCo_src/.tests_ICoCo_opt.html
 Outils/ICoCo/ICoCo_src/ICoCo
@@ -82,6 +80,7 @@ src/Readme_eclipse.pdf
 doc/TRUST/Tutorial/ICoCo_tutorial.pdf
 doc/TRUST/Tutorial/TRUST_tutorial.pdf
 doc/TRUST/Tutorial/Baltik_tutorial.pdf
+doc/TRUST/exercices/Tutorial_solutions/Tutorial_solutions.pdf
 doc/tmp
 doc/tmp_files
 

Outils/VisIt/src/build.sh

@@ -14,8 +14,8 @@ clean()
       [ -d ${paquet%.tar.xz} ] && rm -r -f ${paquet%.tar.xz}
       rm -f $paquet
    done
-   rm -r -f VTK-?.?.? VTK-*-build visit visit?.?.? visit-vtk-?.? visit-vtk-*-build Mesa-?.? Mesa-?.*.? qt-everywhere-opensource-src-?.?.?  
-   rm -f build_visit2_5_2* build_visit*help
+   rm -r -f VTK-?.?.? VTK-*-build visit visit?.?.? visit-vtk-?.? visit-vtk-*-build Mesa-?.? Mesa-?.*.? qt-everywhere-src* llvm-* clang*
+   rm -f build_visit*help
    rm -f build_visit*"_log" *.cmake *.conf tmp* *.py releases
    rm -f visit-install
    echo "OK"

bin/Installer_TRUST

@@ -469,7 +469,6 @@ then
 fi
 echo | tee -a $LOG
 source $TRUST_ROOT/env_TRUST.sh
-mklibs >> $LOG
 
 # Message de detection :
 [ ${#TRUST_CC} = 0 ] && echo "Warning : this script did not find C++ compiler : you CANNOT compile TRUST" | tee -a $LOG
@@ -584,10 +583,7 @@ echo | tee -a $LOG
 echo "**************************" | tee -a $LOG
 echo "HOW TO INITIALIZE TRUST ?:" | tee -a $LOG
 echo "**************************" | tee -a $LOG
-echo "Add the following lines in your $HOME/.profile or $HOME/.bashrc file:" | tee -a $LOG
-echo "# TRUST environment:" | tee -a $LOG
-echo "export TRUST_ROOT=$TRUST_ROOT" | tee -a $LOG
-echo "source \$TRUST_ROOT/env_TRUST.sh 1>/dev/null 2>&1" | tee -a $LOG
+echo "export TRUST_ROOT=$TRUST_ROOT/env_TRUST.sh 1>/dev/null 2>&1" | tee -a $LOG
 cd $ROOT
 echo  | tee -a $LOG
 echo "********************" | tee -a $LOG
@@ -596,21 +592,17 @@ echo "********************" | tee -a $LOG
 #echo $ECHO_OPTS "[Fast] Run the command 'trust -check VAHL_DAVIS', if you want to check the TRUST binary on a single test.\n" | tee -a $LOG
 echo $ECHO_OPTS "[Fast] Run the command 'trust -check Kernel', if you want to check the TRUST binary on a single test.\n" | tee -a $LOG
 echo $ECHO_OPTS "[Long] Run the command 'trust -check all', if you want to check the TRUST binary on test cases. It may take several hours." | tee -a $LOG
-echo  | tee -a $LOG
-echo "**********************************" | tee -a $LOG
-echo "HOW TO BUILD TRUST IN DEBUG MODE?" | tee -a $LOG
-echo "**********************************" | tee -a $LOG
-echo $ECHO_OPTS "cd $TRUST_ROOT" | tee -a $LOG
-echo $ECHO_OPTS "make debug" | tee -a $LOG
+echo $ECHO_OPTS "[Fast using ctest] Run the command 'trust -ctest all', if you want to check the TRUST binary using ctest (not adapted for clusters).\n" | tee -a $LOG
 echo  | tee -a $LOG
 echo "************************" | tee -a $LOG
 echo "HOW TO RE-BUILD TRUST ?" | tee -a $LOG
 echo "************************" | tee -a $LOG
 echo $ECHO_OPTS "If you want to build again TRUST, run:" | tee -a $LOG
 echo $ECHO_OPTS "cd $TRUST_ROOT" | tee -a $LOG
 echo $ECHO_OPTS "./configure -help   # Then check and/or change the detected values into the \$TRUST_ROOT/env/machine.env file" | tee -a $LOG
+echo $ECHO_OPTS "./configure \$OPTIONS" | tee -a $LOG
 echo $ECHO_OPTS "source env_TRUST.sh # Initialize the new environment" | tee -a $LOG
-echo $ECHO_OPTS "make clean;make     # Then clean and rebuild TRUST" | tee -a $LOG
+echo $ECHO_OPTS "make     # rebuild TRUST" | tee -a $LOG
 echo | tee -a $LOG
 echo "*******************" | tee -a $LOG
 echo "HOW TO USE TRUST ?" | tee -a $LOG

bin/KSH/Verifie_pere

@@ -4,15 +4,15 @@ test_pere()
    baltik_build_configure -execute
    make optim
    (
-     source env_Verifie_pere.sh && trust nul; 
+     source env_Verifie_pere.sh && trust nul;
      exit $?
    )
    status=$?
 }
 gen_dico()
 {
    $TRUST_Awk 'BEGIN {printf("{ ");}{if ($2!=$1) {printf(" %s ,",$2);}} END {print("fin")}' $TRUST_ROOT/doc/.dico | sed "s/,fin/}/" > dico
-   $TRUST_Awk 'BEGIN {printf("{ ");}{if ($2!=$1) {printf(" %s ,",$1);}} END {print("fin")}' $TRUST_ROOT/doc/.dico | sed "s/,fin/}/" >> dico	
+   $TRUST_Awk 'BEGIN {printf("{ ");}{if ($2!=$1) {printf(" %s ,",$1);}} END {print("fin")}' $TRUST_ROOT/doc/.dico | sed "s/,fin/}/" >> dico
    sed "s?|[^ ]* ? ?g"  dico > dico2; mv dico2 dico
 }
 
@@ -25,7 +25,7 @@ tar xfz $TRUST_ROOT/bin/KSH/Verifie_pere.tgz
 cd Verifie_pere
 
 echo End > nul.data
-echo > LOG 
+echo > LOG
 gen_dico >>LOG 2>&1
 
 # on verifie que les erreurs sont detectees
@@ -40,16 +40,16 @@ rm -f src/Transformer.cpp
 
 # Pierre si je ne fais pas cela , des fois il ne recompile pas l'atelier
 #
-# Je ne veux pas faire rm $exec comme cela si ca ne compile pas on aura comme avant 
-sleep 1 
+# Je ne veux pas faire rm $exec comme cela si ca ne compile pas on aura comme avant
+sleep 1
 
 test_pere >>LOG 2>&1
 ok=$status
 
 if [ $erreur -eq 0 ]
 then
-    echo "The test doesn't run anymore " | tee -a LOG
-    ok=-13
+   echo "The test doesn't run anymore " | tee -a LOG
+   ok=-13
 fi
 #on teste maintenant les bases... en regardant les sources
 ana_base()
@@ -60,37 +60,36 @@ ana_base()
     [ `basename $f` = "MD_Vector.cpp" ] && h=`echo $h| sed "s/Vector/Vector_base/"`
     res=`grep Implemente_base $f | awk -F\( '{print $2}' |sed "s?);?,?;s/ //g"`
     class=`echo $res | awk -F, '{print $1 }'`
-    pere=`echo $res | awk -F, '{print $3 }'`	
-    
+    pere=`echo $res | awk -F, '{print $3 }'`
+
     res2=`grep public $h | grep $class| sed "s/,/ /g"`
     echo $res2 | awk -v pere=$pere 'BEGIN {ok=0}{ for (i=1;i<=NF;i++) { if ($i==pere){ ok=1}}}  END {print ok}'
     [ $mode -eq 1 ] && echo "classe " $class, "pere: " $pere&& echo dans $d/$h $res2
-    
+
 }
 
 for d in `cd $TRUST_ROOT; find src -type d`
-  do
-  
+do
+
   files=`grep -l Implemente_base $TRUST_ROOT/$d/*.cpp 2>/dev/null`
   for f in $files
     do
     okl=`ana_base $f 0`
     if [ $okl -ne 1 ]
-	then
-	ok=-100
- 	echo problem with $f >>LOG
-	ana_base $f 1  >>LOG
+    then
+       ok=-100
+       echo problem with $f >>LOG
+       ana_base $f 1  >>LOG
     fi
-    
   done
 done
 
 
 if [ $ok -ne 0 ]
 then
-    echo "  KO: Problem with a father; See the `pwd`/LOG file" | tee -a LOG
+   echo "  KO: Problem with a father; See the `pwd`/LOG file" | tee -a LOG
 else
-    echo "  OK: See the `pwd`/LOG file" | tee -a LOG
+   echo "  OK"
 fi
 exit $ok
 

bin/KSH/astyle_jdd.sh

@@ -45,7 +45,8 @@ do
 	 sed -i "s?//?#?g" $tmp
 	 sed -i "s?twoslashes?//?g" $tmp
 	 sed -i "s?ascii_fieldsplit?ascii:fieldsplit?g" $tmp
-	 cp $tmp $file
+	 cat $tmp > $file
+	 rm $tmp
       fi
    fi
 done

env_src/configurer_env

@@ -504,7 +504,7 @@ then
    cd $TRUST_ROOT
    rm -r -f $TRUST_ROOT/env_TRUST.sh $TRUST_ROOT/env/ $TRUST_ROOT/lib $TRUST_ROOT/exec $TRUST_ROOT/include $TRUST_ROOT/Makefile $TRUST_ROOT/MonoDir* $TRUST_ROOT/build
    rm -f $TRUST_ROOT/configure.log
-   rm -f  $TRUST_ROOT/tags $TRUST_ROOT/TAGS  $TRUST_ROOT/compile*log $TRUST_ROOT/License.txt_*
+   rm -f  $TRUST_ROOT/tags $TRUST_ROOT/TAGS  $TRUST_ROOT/compile*log
    rm -f $TRUST_ROOT/.toto
    # Plus on efface le $TRUST_TMP
    rm -r -f $TRUST_TMP
@@ -513,10 +513,17 @@ then
    rm -f $(find $TRUST_ROOT/src -name instancie_src_*)
    rm -f $TRUST_ROOT/src/MAIN/instancie_appel*
    rm -f $(find $TRUST_ROOT/src -name CMakeLists.txt)
-   rm -f $(find $TRUST_ROOT/Validation/Rapports_automatiques -name .form.md5sum)
    rm -f $(find $TRUST_ROOT/src -name .check_sources.ok)
+   # on efface aussi les fichiers ignores et log
+   rm -f $(find $TRUST_ROOT/Validation/Rapports_automatiques -name .form.md5sum)
    rm -f $TRUST_ROOT/Validation/Rapports_automatiques/.check_of_all_validation_forms
    rm -rf $(find $TRUST_ROOT/Validation -name build)
+   rm -rf $(find $TRUST_ROOT/Validation -name Run.log)
+   rm -f $(find $TRUST_ROOT/Outils/VisIt/ -name visit-install"*" | grep -v 3_3_3)
+   rm -f $TRUST_ROOT/doc/TRUST/exercices/Tutorial_solutions/Tutorial_solutions.pdf
+   rm -f $TRUST_ROOT/doc/TRUST/Tutorial/*_tutorial.pdf
+   rm -f $TRUST_ROOT/Outils/TRIOXDATA/test_complet/lance_test_modif
+
    exit 0
 else
    rm -f prog.log
@@ -1832,7 +1839,7 @@ case $TRUST_ARCH_CC in
 	[ "$TRUST_ARCH_CC" = "linux_crayCC" ] && SYSLIBS="-L$GCC_PREFIX/snos/lib64 -lstdc++ -lgfortran -lrt" # EXTP GNU
         SYSLIBS=$SYSLIBS" ${PE_MPICH_GTL_DIR_amd_gfx90a} ${PE_MPICH_GTL_LIBS_amd_gfx90a}" # Librairie GTL necessaire pour activer GPU-Direct
         F77Flags="-O3 -fPIC"
-        F77Flags="-O1 -fPIC" # Sinon _dger_ undefined reference dans dlsode.f !
+        F77Flags="-O1 -fPIC" # Sinon _dger_ undefined reference dans dlsode.f ! en debug il faut -g -O0 sinon meme erreur !
         [ "$TRUST_INT64" = "1" ] && [ "$TRUST_ARCH_CC" = "linux_crayCC" ]     && F77Flags=$F77Flags" -default64"          # crayftn
         [ "$TRUST_INT64" = "1" ] && [ "$TRUST_ARCH_CC" = "linux_amdclang++" ] && F77Flags=$F77Flags" -fdefault-integer-8" # flang
         ccFLAGS="-O3 -fPIC"
@@ -2311,6 +2318,8 @@ LINK_MALIB = $LINK_MALIB" > $tmp
    CppFlags=`echo $CppFlags | sed "1,$ s?-O[0-9]?-g -O0?g"`
    ### Sur gcc >= 11, -g utilise dwarf5 qui empeche addr2line des versions < 2.35.2 de binutils de convertir les adresses des binaires en numero ligne du code source
    [[ $(echo $TRUST_VERSION_GNU | cut -d '.' -f 1) -ge 11 ]] && CppFlags=${CppFlags/-g /-gdwarf-4 }
+   ### sur Adastra-gpu avec crayftn, il faut passer -O0 sinon make debug passe pas( _dger_ undefined reference dans dlsode.f)
+   [ "$TRUST_ARCH_CC" = "linux_crayCC" ] && F77Flags=`echo $F77Flags | sed "1,$ s?-g?-g -O0?g"`
    #############################
    # Creation du fichier profile
    #############################