Skip to content
Snippets Groups Projects
Commit 68bcb83d authored by Martin Sauter's avatar Martin Sauter
Browse files

* added function calls for new data

parent e43662a3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
NaviXMon.py
+ 6
− 3
View file @ 68bcb83d
......@@ -34,15 +34,18 @@ def __init__():
monitor_dict = dict()
df_file = pd.DataFrame()
# export_as = '.pdf'
export_as = '.png'
export_as = '.pdf'
# export_as = '.png'
# workflow = 'copy60sg'
# workflow = 'higgs60sg'
# workflow = 'copy60topas'
# workflow = 'copy_tsy_v1'
# workflow = 'copy_tsy_v2'
workflow = 'jec_topas'
# workflow = 'jec_topas'
# workflow = 'copy_topas'
# workflow = 'jec_sg'
workflow = 'jec_nemo'
input_data = InputData(workflow)
print('Loading file list:')
......
navimon/inputData.py
+ 21
− 3
View file @ 68bcb83d
......@@ -18,6 +18,12 @@ class InputData:
self.copy_tsy_v2()
elif workflow == 'jec_topas':
self.jec_topas()
elif workflow == 'copy_topas':
self.copy_topas()
elif workflow == 'jec_sg':
self.jec_sg()
elif workflow == 'jec_nemo':
self.jec_nemo()
else:
print_with_color("WARNING: Input data for " + str(workflow) + " not found!\n Using default values!",
color='yellow')
......@@ -42,10 +48,11 @@ class InputData:
# self.navix_monitor_file_list = [r'data/skimming/04-tuned-SSDs-Raid0/NaviX.mon',
# r'data/skimming/04-tuned-SSDs-Raid0/NaviX2.mon']
# -> 5. test: first monitoring file was split since it contained unknown manual tests (60 jobs, 10 files/job)
self.navix_monitor_file_list = [r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon.Skimming.180817.2.newlog',
r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon.Skimming.180818.newlog',
r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon']
# self.navix_monitor_file_list = [r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon.Skimming.180817.2.newlog',
# r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon.Skimming.180818.newlog',
# r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon']
self.navix_monitor_file_list = [r'data/skimming/05-tuned-SSDs-Raid0/NaviX.mon.Skimming.180827.run1']
# Default copy:
# self.navix_monitor_file_list = [r'data/copy/NaviX.mon.Copy.180818',
# r'data/copy/NaviX.mon.Copy.180819']
......@@ -91,3 +98,14 @@ class InputData:
def jec_topas(self):
self.navix_monitor_file_list = [r'data/jec/topas/NaviX_TOPAS_JEC_v1.mon']
def jec_sg(self):
self.navix_monitor_file_list = [r'data/jec/sg/NaviX.mon']
def jec_nemo(self):
self.navix_monitor_file_list = [r'data/jec/nemo/NaviX.mon']
def copy_topas(self):
# self.navix_monitor_file_list = [r'data/copy/topas/NaviX_TOPAS_small.mon']
# self.navix_monitor_file_list = [r'data/copy/topas/NaviX_to_big.mon']
self.navix_monitor_file_list = [r'data/copy/topas/NaviX.mon.copyJob80Hold.20190111']
navimon/predictionScenario.py
+ 27
− 14
View file @ 68bcb83d
......@@ -23,6 +23,10 @@ class Prediction:
self.copy_tsy_v2()
elif workflow == 'jec_topas':
self.jec_topas()
elif workflow == 'jec_sg':
self.jec_sg()
elif workflow == 'copy_topas':
self.copy60topas()
else:
print_with_color("WARNING: Prediction model " + str(workflow) + " not found!\n Using default values!",
color='yellow')
......@@ -38,21 +42,21 @@ class Prediction:
def higgs60sg(self):
# Higgs test jobs with 60 jobs on SG/SM machines
self.data_total = 500 * 10 * 60 # about 500MB per file for Higgs skimming
self.number_nodes = 10
self.number_slots_per_node = 52 / 2 * 1.5 # (12+24+24)/3 HTCondor slots
self.remote_rate_total = 200000 / 8 # 3Gb/s converted to MB/s
self.cache_rate_per_node = 16 * 120 # Cache speed in MB/s
self.workflow_rate_max = 250000 # Maximum speed the workflow allows per core
self.data_total = 1900 * 10 * 60 # about 500MB per file for Higgs skimming
self.number_nodes = 3
self.number_slots_per_node = 20 # (12+24+24)/3 HTCondor slots
self.remote_rate_total = 6000 / 8 # 3Gb/s converted to MB/s
self.cache_rate_per_node = 1200 # Cache speed in MB/s
self.workflow_rate_max = 25 # Maximum speed the workflow allows per core
def copy60topas(self):
# Copy jobs with 60 jobs on SG/SM machines:
self.data_total = 1600 * 10 * 60 # about 500MB per file for Higgs skimming, 3.3GB per file for /dev/null tests
self.number_nodes = 3
self.number_slots_per_node = 20 # HTCondor slots
self.remote_rate_total = 5000 / 8 # 5Gb/s converted to MB/s
self.cache_rate_per_node = 1000 # Cache speed in MB/s
self.workflow_rate_max = 2000 # Maximum speed the workflow allows per core
self.data_total = 3600 * 10 * 420 # about 500MB per file for Higgs skimming, 3.3GB per file for /dev/null tests
self.number_nodes = 8
self.number_slots_per_node = 42 # HTCondor slots
self.remote_rate_total = 140000 / 8 # 5Gb/s converted to MB/s
self.cache_rate_per_node = 2700 # Cache speed in MB/s
self.workflow_rate_max = 900 # Maximum speed the workflow allows per core
def higgs60topas(self):
pass
......@@ -77,9 +81,18 @@ class Prediction:
self.workflow_rate_max = 2000. # Maximum speed the workflow allows per core
def jec_topas(self):
self.data_total = 1600 * 10 * 60 # about 500MB per file for Higgs skimming, 3.3GB per file for /dev/null tests
self.data_total = 1400 * 10 * 60 # about 500MB per file for Higgs skimming, 3.3GB per file for /dev/null tests
self.number_nodes = 3
self.number_slots_per_node = 20 # HTCondor slots
self.remote_rate_total = 5000 / 8 # 5Gb/s converted to MB/s
self.cache_rate_per_node = 1000 # Cache speed in MB/s
self.workflow_rate_max = 2000 # Maximum speed the workflow allows per core
def jec_sg(self):
self.data_total = 1.2 * 1000000 # about 1.2TB in MB
self.number_nodes = 3
self.number_slots_per_node = 20 # (12+24+24)/3 HTCondor slots
self.remote_rate_total = 3000 / 8 # 3Gb/s converted to MB/s
self.cache_rate_per_node = 1200 # Cache speed in MB/s
self.workflow_rate_max = 9.5 #Maximum speed the workflow allows per core
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment