Changeset 1224 for palm/trunk

Timestamp:

Sep 16, 2013 7:27:23 AM (11 years ago)

Author:

raasch

Message:

First adjustments for HLRN-III system (lccrayb).
Dummy interface added to avoid compiler warnings.

Location:

palm/trunk

Files:

• SCRIPTS/.mrun.config.hlrnIII (added)
• SCRIPTS/mrun (modified) (8 diffs)
• SCRIPTS/subjob (modified) (6 diffs)
• SOURCE/cuda_fft_interfaces.f90 (modified) (2 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# first adjustments for lccrayb
 #
 # Former revisions:
@@ -569 +569 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|nech|necriam|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|nech|necriam|lccrayb|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -740 +740 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+                       (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lccrayb|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
                        (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
                             printf "\n      is not available"
@@ -1017 +1017 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lccrayb|lccrayf|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -2858 +2858 @@
              [[ ! -f a.out ]]  &&  compile_error=true
              continue   # ANDERENFALLS IST STATUS=1, FALLS A.OUT VORHANDEN
-          elif [[ $localhost = lccrayf ]]
+          elif [[ $localhost = lccrayb  ||  $localhost = lccrayf ]]
           then
              make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
@@ -3584 +3584 @@
                 # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                 # DOES NOT EXIST
-             if [[ $host != lccrayf  &&  $host != lcsgih  &&  $host != lcsgib  &&  $host != lckyuh  &&  $host != lckyut ]]
+             if [[  $host != lccrayb  &&$host != lccrayf  &&  $host != lcsgih  &&  $host != lcsgib  &&  $host != lckyuh  &&  $host != lckyut ]]
              then
                 if [[ -f $hostfile ]]
@@ -3691 +3691 @@
                       mpirun -np $ii inspxe-cl -r result -collect mi3 -- ./a.out  <  runfile_atmos
                    fi
+                elif [[ $host = lccrayb ]]
+                then
+                    echo "--- aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS  < runfile_atmos"
+                    aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS  < runfile_atmos
+#                    aprun  -n $ii  -ss  -r2  -j1  a.out  $ROPTS  < runfile_atmos
                 elif [[ $host = lccrayf ]]
                 then
@@ -4839 +4844 @@
        # BEREITSTELLUNG VON QUELLTEXTEN, MRUN-SCRIPTS UND KONFIGURATIONS-
        # DATEI FUER DEN JOB
-    if [[ $( echo $host | cut -c1-5 ) = lcsgi  ||  $host = ibmkisti  ||  $host = lccrayf ]]
+    if [[ $( echo $host | cut -c1-5 ) = lcsgi  ||  $host = ibmkisti  ||  $host = lccrayb  ||  $host = lccrayf ]]
     then
 

palm/trunk/SCRIPTS/subjob

@@ -23 +23 @@
 # Current revisions:
 # ------------------
-#
+# first adjustments for lccrayb
 #
 # Former revisions:
@@ -138 +138 @@
      (bicegate2)             local_addres=130.73.232.103; local_host=lcsgib;;
      (blizzard1)             local_addres=136.172.40.15;  local_host=ibmh;;
+     (blogin*)               local_addres=130.73.233.1;   local_host=lccrayb;;
      (breva)                 local_addres=130.75.105.98;  local_host=lcmuk;;
      (buran)                 local_addres=130.75.105.58;  local_host=lcmuk;;
@@ -324 +325 @@
         (ibms)    queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmy)    queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (lccrayb) queue=testq; remote_addres=130.73.233.1; submcom=/opt/torque/4.2.4.1/bin/qsub;;
         (lccrayf) queue=small; remote_addres=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;;
         (lcfimm)  remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
@@ -378 +380 @@
         (ibmy)   case  $ndq  in
                      (parallel)                              error=false;;
+                     (*)                                     error=true;;
+                 esac;;
+        (lccrayb) case  $ndq  in
+                     (mpp1q|mpp1testq|testq)                 error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -767 +773 @@
 %%END%%
 
+ elif [[ $remote_host = lccrayb ]]
+ then
+
+    if [[ $numprocs != 0 ]]
+    then
+       cat > $job_to_send << %%END%%
+#!/bin/bash --login
+#PBS -N $job_name
+#PBS -l walltime=$timestring
+#PBS -l mppwidth=$numprocs
+#PBS -l mppnppn=$processes_per_node
+#PBS -o $remote_dayfile
+#PBS -j oe
+#PBS -q $queue
+
+$module_calls
+export ATP_ENABLED=0
+export MPICH_GNI_BTE_MULTI_CHANNEL=disabled
+
+%%END%%
+
+    else
+
+       continue
+
+    fi
+
  elif [[ $remote_host = lccrayf ]]
  then
@@ -1640 +1673 @@
     else
        cd  $job_catalog
-       if [[ $(echo $local_host | cut -c1-5) = lcsgi  ||  $(echo $local_host | cut -c1-3) = ibm  ||  $local_host = lccrayf ]]
+       if [[ $(echo $local_host | cut -c1-5) = lcsgi  ||  $(echo $local_host | cut -c1-3) = ibm  ||  $(echo $local_host | cut -c1-6) = lccray ]]
        then
           eval  $submcom  $job_on_remhost

palm/trunk/SOURCE/cuda_fft_interfaces.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! dummy interface added to avoid compiler warnings
 !
 ! Former revisions:
@@ -120 +120 @@
     END INTERFACE CUFFTEXECD2Z
 
+#else
+
+!
+!-- Dummy interface to avoid compiler warnings in case of no bublic objects
+!-- declared
+    INTERFACE CUFFTdummy
+
+       SUBROUTINE CUFFTdummy( dummy )
+
+          REAL ::  dummy
+
+       END SUBROUTINE CUFFTdummy
+
+    END INTERFACE CUFFTdummy
+
 #endif
+
  END MODULE cuda_fft_interfaces