From 6b1ad4fe85afb458d4a766125ec7d777cef6ee12 Mon Sep 17 00:00:00 2001
From: David Robert Verelst <dave@dtu.dk>
Date: Sun, 12 Mar 2017 16:20:41 +0100
Subject: [PATCH] prepost.Simulations: use numactl in find+args mode on Jess
this is used to avoid wine/HAWC2 locking 2 instead 1 thread per sim
---
wetb/prepost/Simulations.py | 18 ++++++++++--------
.../dlc01_demos/dlc01_steady_wsp10_s100.p | 2 +-
.../dlc01_demos/dlc01_steady_wsp11_s101.p | 2 +-
.../dlc01_demos/dlc01_steady_wsp8_noturb.p | 2 +-
.../dlc01_demos/dlc01_steady_wsp9_noturb.p | 2 +-
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index 3ebb7a34..6b80b1b2 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -1942,18 +1942,16 @@ class PBS(object):
self.silent = silent
self.pyenv = pyenv
self.pyenv_cmd = 'source /home/python/miniconda3/bin/activate'
+ self.winebase = 'time WINEARCH=win32 WINEPREFIX=~/.wine32 '
+ self.wine = self.winebase + 'wine'
+ self.winenumactl = self.winebase + 'numactl --physcpubind=$CPU_NR wine'
-# if server == 'thyra':
-# self.maxcpu = 4
-# self.secperiter = 0.020
if server == 'gorm':
self.maxcpu = 1
self.secperiter = 0.012
- self.wine = 'time WINEARCH=win32 WINEPREFIX=~/.wine32 wine'
elif server == 'jess':
self.maxcpu = 1
self.secperiter = 0.012
- self.wine = 'time WINEARCH=win32 WINEPREFIX=~/.wine32 wine'
else:
raise UserWarning('server support only for jess or gorm')
@@ -2296,7 +2294,9 @@ class PBS(object):
self.pbs += '# ' + '-'*78 + '\n'
self.pbs += '# find+xargs mode: 1 PBS job, multiple cases\n'
self.pbs += "else\n"
- param = (self.wine, hawc2_exe, self.htc_dir+case, self.wine_appendix)
+ # numactl --physcpubind=$CPU_NR
+ param = (self.winenumactl, hawc2_exe, self.htc_dir+case,
+ self.wine_appendix)
self.pbs += ' echo "execute HAWC2, do not fork and wait"\n'
self.pbs += " %s %s ./%s %s\n" % param
self.pbs += ' echo "POST-PROCESSING"\n'
@@ -3835,8 +3835,10 @@ class Cases(object):
else:
tmp1, tmp2, tmp3 = self.load_stats()
self.stats_df = self.stats_df.append(tmp1)
- self.Leq_df = self.Leq_df.append(tmp2)
- self.AEP_df = self.AEP_df.append(tmp3)
+ if isinstance(self.Leq_df, pd.DataFrame):
+ self.Leq_df = self.Leq_df.append(tmp2)
+ if isinstance(self.AEP_df, pd.DataFrame):
+ self.AEP_df = self.AEP_df.append(tmp3)
self.cases = cases_merged
self.cases_fail = cases_fail_merged
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
index c04a711b..5fed0716 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
@@ -68,7 +68,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- time WINEARCH=win32 WINEPREFIX=~/.wine32 wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp10_s100.htc
+ time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp10_s100.htc
echo "POST-PROCESSING"
python -c "from wetb.prepost import statsdel; statsdel.logcheck('logfiles/dlc01_demos/dlc01_steady_wsp10_s100.log')"
python -c "from wetb.prepost import statsdel; statsdel.calc('res/dlc01_demos/dlc01_steady_wsp10_s100', no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=20.0, i0=0, i1=None, ftype='.csv')"
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
index 18df76b1..b2db53ba 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
@@ -68,7 +68,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- time WINEARCH=win32 WINEPREFIX=~/.wine32 wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp11_s101.htc
+ time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp11_s101.htc
echo "POST-PROCESSING"
python -c "from wetb.prepost import statsdel; statsdel.logcheck('logfiles/dlc01_demos/dlc01_steady_wsp11_s101.log')"
python -c "from wetb.prepost import statsdel; statsdel.calc('res/dlc01_demos/dlc01_steady_wsp11_s101', no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=20.0, i0=0, i1=None, ftype='.csv')"
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
index d7db435f..4fe00308 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
@@ -68,7 +68,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- time WINEARCH=win32 WINEPREFIX=~/.wine32 wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc
+ time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc
echo "POST-PROCESSING"
python -c "from wetb.prepost import statsdel; statsdel.logcheck('logfiles/dlc01_demos/dlc01_steady_wsp8_noturb.log')"
python -c "from wetb.prepost import statsdel; statsdel.calc('res/dlc01_demos/dlc01_steady_wsp8_noturb', no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=20.0, i0=0, i1=None, ftype='.csv')"
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
index 40d3d16d..237970bb 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
@@ -68,7 +68,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- time WINEARCH=win32 WINEPREFIX=~/.wine32 wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc
+ time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc
echo "POST-PROCESSING"
python -c "from wetb.prepost import statsdel; statsdel.logcheck('logfiles/dlc01_demos/dlc01_steady_wsp9_noturb.log')"
python -c "from wetb.prepost import statsdel; statsdel.calc('res/dlc01_demos/dlc01_steady_wsp9_noturb', no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=20.0, i0=0, i1=None, ftype='.csv')"
--
GitLab