adjust to taurus

* taskset shall be done externaly
* move to paper fitting

Author: AndreasGocht

benchmark/compare.py

@@ -1,7 +1,6 @@
 import argparse
 import pickle
 import numpy
-from scipy.stats import linregress
 
 parser = argparse.ArgumentParser(description='Compare two benchmarks.',
                                  formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -42,9 +41,9 @@
             if len(left_val)!=len(right_val):
                 raise ValueError("Different Repetitons")
 
-            Y_left.append(left_val)
-            Y_right.append(right_val)
-            X.append(numpy.full([len(left_val)], it))
+            Y_left.append(numpy.mean(left_val))
+            Y_right.append(numpy.mean(right_val))
+            X.append(numpy.full([1], it))
 
             if args.s:
                 print("\t\tInterations {}".format(it))
@@ -56,13 +55,13 @@
         Y_right = numpy.asarray(Y_right,dtype=float).flatten()
         X = numpy.asarray(X,dtype=float).flatten()
 
-        cost_left = linregress(X, Y_left)
-        cost_right = linregress(X, Y_right)
+        cost_left = numpy.polyfit(X, Y_left, 1)
+        cost_right = numpy.polyfit(X, Y_right, 1)
 
         if args.s:
             print("")
-        print("\tSlope     {:>7.4f} ns {:>7.4f} ns".format(cost_left.slope * 1e6, cost_right.slope* 1e6))
-        print("\tIntercept {:>7.4f} s  {:>7.4f} s".format(cost_left.intercept, cost_right.intercept))
+        print("\tSlope     {:>7.4f} us {:>7.4f} us".format(cost_left[0] * 1e6, cost_right[0] * 1e6))
+        print("\tIntercept {:>7.4f} s  {:>7.4f} s".format(cost_left[1], cost_right[1]))
 
 
 

benchmark/compare_commits.sh

@@ -12,7 +12,7 @@ function benchmark_branch {
 	head=`git rev-parse --short HEAD`
 	pip install .
 	cd $wd
-	taskset -c 0 python benchmark.py -o result-$1-$head.pkl
+	python benchmark.py -o result-$1-$head.pkl
 }
 
 sleep 5

benchmark/run.sh

@@ -9,12 +9,17 @@
 #SBATCH --comment=no_monitoring
 #SBATCH --job-name benchmark_python
 
-module load Python/3.6.4-intel-2018a
-module unload intel
-module load intel
+module load Python/3.8.6-GCCcore-10.2.0
+module load Score-P/7.0-gompic-2020b
 
-export PATH=/scratch/rschoene/scorep-6-inst/bin:$PATH
+env_dir=~/virtenv/p-3.8.6-GCCcore-10.2.0-scorep-7.0-gompic-2020b/
 
-. ~/scorep_binding_python/test/bin/activate
+if [ ! -d $env_dir ]
+then
+	echo "Please create virtual env under: $env_dir"
+	exit -1
+fi
 
-srun python benchmark.py
+source $env_dir/bin/activate
+
+srun compare_commits.sh master faster