Changeset 1762 for XIOS

Timestamp:

10/21/19 11:37:04 (5 years ago)

Author:

yushan

Message:

Generic_testcase : flag --omp is used to enable EP_lib. Tested on Irene with generic_testcase and test_omp (ep+intelmpi, ep+openmpi, mpi+intelmpi, mpi+openmpi)

Location:

XIOS/dev/dev_trunk_omp

Files:

• GENERIC_TESTCASE/job_irene.sh (modified) (3 diffs)
• extern/src_ep_dev/ep_fortran.cpp (modified) (1 diff)
• inputs/job_irene_openmpi.sh (modified) (1 diff)
• make_xios (modified) (4 diffs)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_irene.sh

@@ -123 +123 @@
 touch setup.sh
 >setup.sh
+
 for i in $(ls -d test_*/)
 do
@@ -130 +131 @@
   echo "echo \"setup.py called from " ${i%%/} "\"">> setup.sh
 done
-
 export output=$(python user_config.py 2>&1 >/dev/null)
 
@@ -162 +162 @@
 cp report.txt report_mpi_intelmpi.txt
 cp report.html report_mpi_intelmpi.html
+
+

XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_fortran.cpp

@@ -34 +34 @@
       }
     }
-    
     
     return fint;

XIOS/dev/dev_trunk_omp/inputs/job_irene_openmpi.sh

@@ -45 +45 @@
 
 
-export build_dir=build_ep_openmpi_prod
+export build_dir=build_mpi_openmpi_prod
 ccc_mprun ../$build_dir/bin/test_omp.exe 4
 

XIOS/dev/dev_trunk_omp/make_xios

@@ -19 +19 @@
 arch_path_defined="FALSE"
 use_ep="FALSE"
-use_ep2="FALSE"
+#use_ep2="FALSE"
 # Traitement de la ligne de commande
 while (($# > 0))
@@ -66 +66 @@
          "--memtrack")  use_memtrack="true" memtrack=$2  ; shift ; shift ;;
          "--omp")   use_ep="true" ; shift ;;
-         "--omp2")   use_ep2="true" ; shift ;;
+#         "--omp2")   use_ep2="true" ; shift ;;
          *)         code="$1"           ; shift ;;
       esac
@@ -166 +166 @@
     if [[ "$compil_mode" == "prod" ]]
         then
-        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_intelmpi"
-        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_intelmpi"
+        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP "
+        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP "
     elif [[ "$compil_mode" == "dev" ]]
         then 
-        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_intelmpi"
-        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_intelmpi"
+        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP "
+        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP "
     elif [[ "$compil_mode" == "debug" ]]
         then
-        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_intelmpi"
-        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_intelmpi"
+        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP "
+        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP "
     fi
 
@@ -198 +198 @@
 
 
-if [[ "$use_ep2" == "true" ]]; then
-
-    if [[ "$compil_mode" == "prod" ]]
-        then
-        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_openmpi"
-        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_openmpi"
-    elif [[ "$compil_mode" == "dev" ]]
-        then 
-        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_openmpi"
-        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_openmpi"
-    elif [[ "$compil_mode" == "debug" ]]
-        then
-        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_openmpi"
-        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_openmpi"
-    fi
-
-else
-
-    if [[ "$compil_mode" == "prod" ]]
-        then
-        COMPIL_CFLAGS="%PROD_CFLAGS"
-        COMPIL_FFLAGS="%PROD_FFLAGS"
-    elif [[ "$compil_mode" == "dev" ]]
-        then 
-        COMPIL_CFLAGS="%DEV_CFLAGS"
-        COMPIL_FFLAGS="%DEV_FFLAGS"
-    elif [[ "$compil_mode" == "debug" ]]
-        then
-        COMPIL_CFLAGS="%DEBUG_CFLAGS"
-        COMPIL_FFLAGS="%DEBUG_FFLAGS"
-    fi
-
-fi
+#if [[ "$use_ep2" == "true" ]]; then
+
+#    if [[ "$compil_mode" == "prod" ]]
+#        then
+#        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_openmpi"
+#        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_openmpi"
+#    elif [[ "$compil_mode" == "dev" ]]
+#        then 
+#        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_openmpi"
+#        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_openmpi"
+#    elif [[ "$compil_mode" == "debug" ]]
+#        then
+#        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_openmpi"
+#        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_openmpi"
+#    fi
+#
+#else
+
+#    if [[ "$compil_mode" == "prod" ]]
+#        then
+#        COMPIL_CFLAGS="%PROD_CFLAGS"
+#        COMPIL_FFLAGS="%PROD_FFLAGS"
+#    elif [[ "$compil_mode" == "dev" ]]
+#        then 
+#        COMPIL_CFLAGS="%DEV_CFLAGS"
+#        COMPIL_FFLAGS="%DEV_FFLAGS"
+#    elif [[ "$compil_mode" == "debug" ]]
+#        then
+#        COMPIL_CFLAGS="%DEBUG_CFLAGS"
+#        COMPIL_FFLAGS="%DEBUG_FFLAGS"
+#    fi
+
+#fi