Changeset 547

Timestamp:

09/18/17 12:08:22 (7 years ago)

Author:

dubos

Message:

Testing : renamed build directories + minor fixes

Location:

configs/testing

Files:

• bash/X64_CURIE.sh (modified) (1 diff)
• bash/build.sh (modified) (2 diffs)
• bash/post.sh (modified) (2 diffs)
• setup.sh (modified) (5 diffs)

configs/testing/bash/X64_CURIE.sh

@@ -91 +91 @@
 date > gcm.log
 ulimit -s unlimited
-$4 ./gcm.exe >> gcm.log
+$4 >> gcm.log
 date >> gcm.log
 

configs/testing/bash/build.sh

@@ -4 +4 @@
 {
     NAME=$1 ; shift
-    BUILD=$ROOT/DYNAMICO_$NAME
+    BUILD=$ROOT/build_$NAME
     LOGFILE=$ROOT/logs/dynamico_${NAME}.log
-    cd $ROOT/DYNAMICO_$NAME
+    cd $ROOT/build_$NAME
     echo "In $PWD : building DYNAMICO with options $*"
     echo "Watch logfile $LOGFILE"
@@ -23 +23 @@
     cd $ROOT
     # compile all variants in parallel
-    build_dynamico serial -parallel none $FULL &
-    build_dynamico mpi -parallel mpi -with_xios $FULL &
-    build_dynamico mpi_omp -parallel mpi_omp -with_xios $FULL &
+#    build_dynamico serial -parallel none $FULL &
+    build_dynamico mpi -parallel mpi -with_xios $other $FULL &
+    build_dynamico mpi_omp -parallel mpi_omp -with_xios $other $FULL &
     wait
     # check success
-    ls bin/icosa_serial.exe || exit 1
+#    ls bin/icosa_serial.exe || exit 1
     ls bin/icosa_mpi.exe || exit 1
     ls bin/icosa_mpi_omp.exe || exit 1

configs/testing/bash/post.sh

@@ -18 +18 @@
     hostname ; echo '\\'
     pwd ; echo '\\'
+    ls -l DYNAMICO ; echo '\\'
     svn_info $ROOT/XIOS
     svn_info $ROOT/DYNAMICO
@@ -29 +30 @@
         NAME=$(to_latex $TEST)
         echo "\subsection{$NAME}"
+        grep Elapsed logs/gcm.log
+        echo
         for GRAPH in $(ls $TEST/*.png) ; do
             cat <<EOF

configs/testing/setup.sh

@@ -11 +11 @@
 ICOSA_LIB=""
 
-while (($# > 0))
-  do
+while (($# > 0)) ; do
   case $1 in
       "-h") cat <<EOF
 Usage :
-setup [options] -arch nom_arch
+setup [options]
 [-h]                       : help
  -arch nom_arch            : nom de l\'architecture cible
+ -job N                    : parallel compilation
+ -full                     : full compilation
+extra options will be passed to make_icosa
 EOF
           exit;;
-
       "-arch")
           arch=$2 ; arch_defined="TRUE"; shift ; shift ;;
@@ -29 +30 @@
           full_defined="TRUE" ; shift ;;
       *)
-          echo "Unknown argument : $*"
-          echo "Try $0 -h"
-          exit 1
+          echo "Unknown options < $* > will be passed to make_icosa"
+          other="$*"
+          break
   esac
 done
@@ -43 +44 @@
 arch="$arch"
 job="$job"
+other="$other"
 EOF
 
@@ -48 +50 @@
   cat current_args
   # create separate build dirs sharing the same src/ and tools/ subdirs to save disk and time
-  BUILD=$ROOT/DYNAMICO_serial
+  BUILD=$ROOT/build_serial
   echo "Creating build directory $BUILD"
   rm -rf $BUILD
@@ -58 +60 @@
   for NAME in mpi mpi_omp ; do
       echo "Creating build directory $ROOT/DYNAMICO_$NAME"
-      rm -rf $ROOT/DYNAMICO_$NAME
-      cp -pr $BUILD $ROOT/DYNAMICO_$NAME
+      rm -rf $ROOT/build_$NAME
+      cp -pr $BUILD $ROOT/build_$NAME
   done
   
-  echo "You may now run ./build.sh"
+  echo "You may now run bash/build.sh"
 else
   echo "Please define a target architecture"