Fix csv generation for pytest

Author: weiya711

Makefile

@@ -9,7 +9,7 @@ IGNORE_FLAGS := $(addprefix --ignore=,$(IGNORE))
 benches_name := $(patsubst %.py,%,$(BENCHES))
 benches_name := $(subst /,_,$(benches_name))
 benches_name := $(subst *,_,$(benches_name))
-NUMPY_OUT = results/numpy/$(benches_name)benches_$(shell date +%Y_%m_%d_%H%M%S).csv
+NUMPY_JSON ?= results/numpy/$(benches_name)benches_$(shell date +%Y_%m_%d_%H%M%S).json
 
 # Taco Specific Flags
 TACO_OUT = results/taco/$(benches_name)benches_$(shell date +%Y_%m_%d_%H%M%S).csv
@@ -24,7 +24,12 @@ export TACO_TENSOR_PATH = data/
 # command above.
 python-bench: results numpy/*.py
 	echo $(benches_name)
-	pytest $(IGNORE_FLAGS) --csv $(NUMPY_OUT) $(BENCHFLAGS) $(BENCHES)
+	pytest $(IGNORE_FLAGS) --benchmark-json=$(NUMPY_JSON) $(BENCHFLAGS) $(BENCHES)@
+	make convert-csv
+	
+.PHONY: convert-csv
+convert-csv:
+	py.test-benchmark compare --csv=$(patsubst %.json,%.csv,$(NUMPY_JSON)) $(NUMPY_JSON)
 
 taco-bench: taco/build/taco-bench
 ifeq ($(BENCHES),"")

numpy/ufuncs.py

@@ -93,6 +93,8 @@ def bench():
 @pytest.mark.parametrize("tensor", FROSTTTensors.getTensors(), ids=FROSTTTensors.getTensorNames())
 @pytest.mark.parametrize("ufunc", [numpy.logical_xor, numpy.ldexp, numpy.right_shift])
 def bench_pydata_frostt_ufunc_sparse(tacoBench, tensor, ufunc):
+    benchmark.extra_info['tensor_str'] = str(tensor)
+    benchmark.extra_info['ufunc_str'] = ufunc.__name__
     frTensor = tensor.load().astype('int64')
     shifter = PydataTensorShifter()
     other = shifter.shiftLastMode(frTensor).astype('int64')
@@ -106,7 +108,7 @@ def bench():
 @pytest.mark.parametrize("tensor", SuiteSparseTensors.getTensors(), ids=SuiteSparseTensors.getTensorNames())
 @pytest.mark.parametrize("ufunc", [numpy.logical_xor, numpy.ldexp, numpy.right_shift])
 def bench_pydata_suitesparse_ufunc_sparse(tacoBench, tensor, ufunc):
-    ssTensor = tensor.load(PydataMatrixMarketTensorLoader()).astype('int64')
+    ssTensor = tensor[1].load(PydataMatrixMarketTensorLoader()).astype('int64')
     shifter = PydataTensorShifter()
     other = shifter.shiftLastMode(ssTensor).astype('int64')
     def bench():

numpy/util.py

@@ -151,6 +151,8 @@ def getTensors(self):
         return self.tensors
     def getTensorNames(self):
         return [str(tensor) for tensor in self.getTensors()]
+    def getTensorsAndNames(self):
+        return [(str(tensor), tensor) for tensor in self.getTensors()]
 
 # PydataTensorShifter shifts all elements in the last mode
 # of the input pydata/sparse tensor by one.
@@ -249,3 +251,5 @@ def getTensors(self):
         return self.tensors
     def getTensorNames(self):
         return [str(tensor) for tensor in self.getTensors()]
+    def getTensorsAndNames(self):
+        return [(str(tensor), tensor) for tensor in self.getTensors()]