Commit 6711ae40 authored by Hamilton, Steven P.'s avatar Hamilton, Steven P.
Browse files

Modifying tests for runtime.

parent 653c8aca

Profugus/CPU_1node/Scripts/lsf.template.x

+9 −9
Original line number Diff line number Diff line
@@ -115,23 +115,23 @@ cp -rf $WORKDIR/* $RESULTSDIR && rm -rf $WORKDIR 
# Move the batch file name to  $RESULTSDIR           -

#                                                    -

#-----------------------------------------------------

#mv __batchfilename__ $RESULTSDIR

mv __batchfilename__ $RESULTSDIR



#-----------------------------------------------------

# Check the final results.                           -

#                                                    -

#-----------------------------------------------------

#check_executable_driver.py -p $RESULTSDIR -i $UNIQUE_ID_STRING

check_executable_driver.py -p $RESULTSDIR -i $UNIQUE_ID_STRING



#-----------------------------------------------------

# The script now determines if we are to resubmit    -

# itself.                                            -

#                                                    -

#-----------------------------------------------------

#case __resubmitme__ in

#    0) 

#       test_harness_driver.py -r;;

#

#    1) 

#       echo "No resubmit";;

#esac 
case __resubmitme__ in

    0) 

       test_harness_driver.py -r;;



    1) 

       echo "No resubmit";;

esac

Profugus/GPU_1node/Scripts/lsf.template.x

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ WORKDIR="__workdir__" 
RESULTSDIR="__resultsdir__"

UNIQUE_ID_STRING="__unique_id_string__"

INPUTDIR=${STARTINGDIRECTORY}/../Inputs

NUMPROCS="__numberprocessors__"



echo "EXECUTABLE"

echo ${EXECUTABLE}
@@ -38,6 +39,8 @@ echo "INPUTDIR" 
echo ${INPUTDIR}

echo "STARTINGDIRECTORY"

echo ${STARTINGDIRECTORY}

echo "NUMPROCS"

echo ${NUMPROCS}



#-----------------------------------------------------

# Ensure that we are in the correct starting         -
@@ -91,7 +94,7 @@ ln -s ${INPUTDIR}/c5g7_252g.xml . 
#-----------------------------------------------------

log_binary_execution_time.py --scriptsdir $STARTINGDIRECTORY --uniqueid $UNIQUE_ID_STRING --mode start



mpirun --oversubscribe -np 4 ${EXECUTABLE} -i c5g7_3d_gpu_1node.xml | tee stdout.txt

__joblaunchcommand__



log_binary_execution_time.py --scriptsdir $STARTINGDIRECTORY --uniqueid $UNIQUE_ID_STRING --mode final

Profugus/GPU_1node/Scripts/submit_executable.x

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ def make_batch_script(batch_recursive_mode,path_to_workspace,test_id_string,sche 
    rgtenvironmentalfile = os.environ["RGT_ENVIRONMENTAL_FILE"]

    jobname = "profugus_gpu_1node"

    nodes = "1"

    ppn = "4"

    ppn = "20"

    ranks = str(int(nodes) * int(ppn))

    batchqueue = "batch"

    pbsaccountid = os.environ["RGT_PBS_JOB_ACCNT_ID"]
@@ -109,7 +109,7 @@ def make_batch_script(batch_recursive_mode,path_to_workspace,test_id_string,sche 
    workdir = os.path.join(path_to_workspace,"workdir") 

    resubmitme = batch_recursive_mode

    walltime = "01:00"

    joblaunchcommand = "mpirun --oversubscribe -np ${NUMPROCS} ${EXECUTABLE} -i c5g7_3d_gpu_1node.xml | tee stdout.txt"

    joblaunchcommand = "mpirun --oversubscribe --map-by ppr:4:node ${EXECUTABLE} -i c5g7_3d_gpu_1node.xml | tee stdout.txt"



    rg_array = [ 

                (re.compile("__jobname__"),jobname),

Profugus/GPU_32node/Correct_Results

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../Source/Correct_Results
 
 No newline at end of file

Profugus/GPU_32node/Inputs

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../Source/Inputs
 
 No newline at end of file