[cig-commits] r19899 - short/3D/PyLith/benchmarks/trunk/static/performance/solvertest
brad at geodynamics.org
brad at geodynamics.org
Thu Mar 29 09:13:59 PDT 2012
Author: brad
Date: 2012-03-29 09:13:59 -0700 (Thu, 29 Mar 2012)
New Revision: 19899
Added:
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.py
Removed:
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.sh
Modified:
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np001.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np002.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np004.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np008.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np016.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np032.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np064.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np128.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np001.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np002.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np004.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np008.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np016.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np032.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np064.cfg
short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np128.cfg
Log:
Convert shell script to python script.
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np001.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np001.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np001.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np001.py
+log_summary_python = logs/hex8_np001.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np002.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np002.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np002.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np002.py
+log_summary_python = logs/hex8_np002.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np004.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np004.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np004.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np004.py
+log_summary_python = logs/hex8_np004.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np008.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np008.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np008.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np008.py
+log_summary_python = logs/hex8_np008.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np016.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np016.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np016.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np016.py
+log_summary_python = logs/hex8_np016.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np032.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np032.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np032.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np032.py
+log_summary_python = logs/hex8_np032.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np064.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np064.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np064.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np064.py
+log_summary_python = logs/hex8_np064.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np128.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np128.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/hex8_np128.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = hex8_np128.py
+log_summary_python = logs/hex8_np128.py
# End of file
Added: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.py
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.py (rev 0)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.py 2012-03-29 16:13:59 UTC (rev 19899)
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+#
+# Python script to facilitate running scaling benchmarks using cluster
+# with PBS scheduler.
+
+import os
+import sys
+import subprocess
+
+if len(sys.argv) != 3:
+ raise ValueError("usage: run_scaling.py CELL NPROCS")
+cell = sys.argv[1]
+nprocs = int(sys.argv[2])
+
+if not cell in ["hex8", "tet4"]:
+ raise ValueError("Cell type (%s) must be 'hex8' or 'tet4'." % cell)
+if (nprocs % 2) != 0:
+ raise ValueError("Number of processors (%d) must be a power of 2." % nprocs)
+
+
+for d in ["output", "logs"]:
+ if not os.path.isdir(d):
+ os.mkdir(d)
+
+job = "%s_np%03d" % (cell, nprocs)
+
+pbsfile = os.environ['HOME'] + "/.pyre/pylithapp/pylithapp_pbs.cfg"
+pcfiles = "fieldsplit_mult.cfg custompc.cfg"
+args = pbsfile + " --job.name=%s --job.stdout=logs/%s.log" % (job, job)
+
+if nprocs < 8:
+ ppn = nprocs
+else:
+ ppn = 8
+
+cmd = "pylith %s.cfg %s.cfg " % (cell, job) + \
+ pcfiles + \
+ "--nodes=%d --scheduler.ppn=%d" % (nprocs, ppn) + \
+ args
+
+print cmd
+subprocess.check_call(cmd, shell=True)
Property changes on: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.py
___________________________________________________________________
Name: svn:executable
+ *
Deleted: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.sh
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.sh 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_scaling.sh 2012-03-29 16:13:59 UTC (rev 19899)
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Shell script to facilitate running scaling benchmarks using cluster
-# with PBS scheduler.
-
-if [ $# == 2 ]; then
- cell=$1
- nprocs=$2
-else
- echo "usage: run_scaling.sh CELL NPROCS"
- exit 1
-fi
-
-if [ $cell == "tet4" ] || [ $cell == "hex8" ]; then
- echo "do nothing" > /dev/null
-else
- echo "Unknown cell '$cell'."
- exit 1
-fi
-
-pbsfile="$HOME/.pyre/pylithapp/pylithapp_pbs.cfg"
-pcfiles="fieldsplit_mult.cfg custompc.cfg"
-args="$pbsfile --job.name=${cell}_np${nprocs} --job.stdout=${cell}_np${nprocs}.log"
-
-if [ $nprocs == 1 ]; then
- pylith ${cell}.cfg ${cell}_np00${nprocs}.cfg $pcfiles $args --nodes=1 --scheduler.ppn=1
-
-elif [ $nprocs == 2 ]; then
- pylith ${cell}.cfg ${cell}_np00${nprocs}.cfg $pcfiles $args --nodes=2 --scheduler.ppn=2
-
-elif [ $nprocs == 4 ]; then
- pylith ${cell}.cfg ${cell}_np00${nprocs}.cfg $pcfiles $args --nodes=4 --scheduler.ppn=4
-
-elif [ $nprocs == 8 ]; then
- pylith ${cell}.cfg ${cell}_np00${nprocs}.cfg $pcfiles $args --nodes=8 --scheduler.ppn=8
-
-elif [ $nprocs == 16 ]; then
- pylith ${cell}.cfg ${cell}_np0${nprocs}.cfg $pcfiles $args --nodes=16 --scheduler.ppn=8
-
-elif [ $nprocs == 32 ]; then
- pylith ${cell}.cfg ${cell}_np0${nprocs}.cfg $pcfiles $args --nodes=32 --scheduler.ppn=8
-
-elif [ $nprocs == 64 ]; then
- pylith ${cell}.cfg ${cell}_np0${nprocs}.cfg $pcfiles $args --nodes=64 --scheduler.ppn=8
-
-elif [ $nprocs == 128 ]; then
- pylith ${cell}.cfg ${cell}_np${nprocs}.cfg $pcfiles $args --nodes=128 --scheduler.ppn=8
-
-else
- echo "Unknown number of processors '$nprocs'."
- exit 1
-fi
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np001.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np001.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np001.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np001.py
+log_summary_python = logs/tet4_np001.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np002.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np002.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np002.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np002.py
+log_summary_python = logs/tet4_np002.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np004.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np004.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np004.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np004.py
+log_summary_python = logs/tet4_np004.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np008.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np008.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np008.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np008.py
+log_summary_python = logs/tet4_np008.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np016.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np016.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np016.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np016.py
+log_summary_python = logs/tet4_np016.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np032.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np032.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np032.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np032.py
+log_summary_python = logs/tet4_np032.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np064.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np064.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np064.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np064.py
+log_summary_python = logs/tet4_np064.py
# End of file
Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np128.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np128.cfg 2012-03-29 00:29:25 UTC (rev 19898)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/tet4_np128.cfg 2012-03-29 16:13:59 UTC (rev 19899)
@@ -36,7 +36,7 @@
# ----------------------------------------------------------------------
[pylithapp.petsc]
ksp_monitor_true_residual = False
-log_summary_python = tet4_np128.py
+log_summary_python = logs/tet4_np128.py
# End of file
More information about the CIG-COMMITS
mailing list