Merge pull request #129 from stuart-knock/benchmark-headers

Benchmark headers

benchmarks/ei-default.conf

@@ -1,6 +1,6 @@
 Benchmark file - EI model - duplicate of ei-cortical.conf
 
-Time: 1 Deltat: 1e-4
+Time: 1 Deltat: 0.0001
 Nodes: 2048 Longside nodes: 64
 
 Connection matrix:

benchmarks/ei-nodes-4096.conf

@@ -1,6 +1,6 @@
 Benchmark file - EI model - spatial resolution higher than default value of 2048 nodes
 
-Time: 1 Deltat: 1e-4
+Time: 1 Deltat: 0.0001
 Nodes: 4096 Longside nodes: 128
 
 Connection matrix:

benchmarks/ei-time-100.conf

@@ -1,6 +1,6 @@
 Benchmark file - EI model - simulation length (Time) two orders of magnitude larger than default value of 1
 
-Time: 100 Deltat: 1e-4
+Time: 100 Deltat: 0.0001
 Nodes: 2048 Longside nodes: 64
 
 Connection matrix:

benchmarks/ei-traces-16.conf

@@ -5,7 +5,7 @@ Benchmark file - EI model - Writes 16 traces for nodes 1 2 (all internal
                           - (population 4, wave propagator 1 4, dendrite 5 
                           - coupling 3)
 
-Time: 1 Deltat: 1e-4
+Time: 1 Deltat: 0.0001
 Nodes: 2048 Longside nodes: 64
 
 Connection matrix:

benchmarks/ei-wavepropagators-6.conf

@@ -1,7 +1,7 @@
 Benchmark file - EI model - number of wave propagators larger than the default value of 2
                - Values for range and gamma in propagators 1,3,4,6 are not physiologically meaningful
 
-Time: 1 Deltat: 1e-4
+Time: 1 Deltat: 0.0001
 Nodes: 2048 Longside nodes: 64
 
 Connection matrix:

benchmarks/nf_benchmarks

@@ -29,6 +29,10 @@
 #  #Benchmark all .conf files in ./benchmarks with output to memory.
 #  nf_benchmarks --to-mem
 #
+#  #Quickly view benchmarks database table for simulation_resources.csv.
+#  column -s, -t < benchmarks/results/simulation_resources.csv | less -N
+#  #and equivalent for simulation_conf.csv, code_info.csv, system_info.csv.
+#
 #REQUIRES:
 #  /usr/bin/time
 #
@@ -293,25 +297,56 @@ gather_conf_info(){
 #
 write_db_entry(){
   #Add an entry to the Simulation Resource Information file -- csv.
+  local sim_res_db="$RESULTS_DIR/simulation_resources.csv"
+  if [[ ! -f "$sim_res_db" ]]; then
+    {
+      printf '%s,' 'USER_TIME' 'USER_TIME_UNITS' 'SYSTEM_TIME' 'SYSTEM_TIME_UNITS' 'PERCENTAGE_OF_CPU' 'MAX_RES_SIZE' 'MAX_RES_SIZE_UNITS' 'FILE_SIZE' 'FILE_SIZE_UNITS'
+      printf '%s\n' 'DATE_AND_TIME'
+    } > "$sim_res_db"
+  fi
   {
     printf '%s,' "$USER_TIME" "$USER_TIME_UNITS" "$SYSTEM_TIME" "$SYSTEM_TIME_UNITS" "$PERCENTAGE_OF_CPU" "$MAX_RES_SIZE" "$MAX_RES_SIZE_UNITS" "$file_size_kb" 'kbytes'
     printf '%s\n' "$TODAY $CURRENT_TIME"
-  } >> "$RESULTS_DIR/simulation_resources.csv"
+  } >> "$sim_res_db"
+
   #Add an entry to the System Information file -- csv.
+  local sim_inf_db="$RESULTS_DIR/system_info.csv"
+  if [[ ! -f "$sim_inf_db" ]]; then
+    {
+      printf '%s,' 'HOSTNAME' 'PLATFORM' 'CPU_MODEL_NAME' 'CPU_CACHE_SIZE' 'CPU_CORE_COUNT' 'RAM_TOTAL' 'RAM_FREE' 'RAM_AVAILABLE' 'CALLER' 'COMPILER' 'COMPILER_VERSION'
+      printf '%s\n' 'DATE_AND_TIME'
+    } > "$sim_inf_db"
+  fi
   {
     printf '%s,' "$HOSTNAME" "$PLATFORM" "$CPU_MODEL_NAME" "$CPU_CACHE_SIZE" "$CPU_CORE_COUNT" "$RAM_TOTAL" "$RAM_FREE" "$RAM_AVAILABLE" "$CALLER" "$COMPILER" "$COMPILER_VERSION"
     printf '%s\n' "$TODAY $CURRENT_TIME"
-  } >> "$RESULTS_DIR/system_info.csv"
+  } >> "$sim_inf_db"
+
   #Add an entry to the Code Information file -- csv.
+  local code_inf_db="$RESULTS_DIR/code_info.csv"
+  if [[ ! -f "$code_inf_db" ]]; then
+    {
+      printf '%s,' 'GIT_BRANCH' 'GIT_COMMIT' 'GIT_LATEST_RELEASE'
+      printf '%s\n' 'DATE_AND_TIME'
+    } > "$code_inf_db"
+  fi
   {
     printf '%s,' "$GIT_BRANCH" "$GIT_COMMIT" "$GIT_LATEST_RELEASE"
     printf '%s\n' "$TODAY $CURRENT_TIME"
-  } >> "$RESULTS_DIR/code_info.csv"
+  } >> "$code_inf_db"
+
   #Add an entry to the Simulation Configuration file -- csv.
+  local sim_conf_db="$RESULTS_DIR/simulation_conf.csv"
+  if [[ ! -f "$sim_conf_db" ]]; then
+    {
+      printf '%s,' 'SIMULATION_LENGTH' 'TIME_STEP_SIZE' 'NUMBER_OF_NODES' 'NUMBER_OF_PROPAGATORS' 'NUMBER_OF_WAVE_PROPAGATORS' 'MAX_TAU' 'OUTPUT_NODES' 'OUTPUT_START' 'OUTPUT_INTERVAL'
+      printf '%s\n' 'DATE_AND_TIME'
+    } > "$sim_conf_db"
+  fi
   {
     printf '%s,' "$SIMULATION_LENGTH" "$TIME_STEP_SIZE" "$NUMBER_OF_NODES" "$NUMBER_OF_PROPAGATORS" "$NUMBER_OF_WAVE_PROPAGATORS" "$MAX_TAU" "$OUTPUT_NODES" "$OUTPUT_START" "$OUTPUT_INTERVAL"
     printf '%s\n' "$TODAY $CURRENT_TIME"
-  } >> "$RESULTS_DIR/simulation_conf.csv"
+  } >> "$sim_conf_db"
 } #function write_db_entry()
 
 write_timing_file(){