Final fixes for image and minimax bench

Author: Olivia W Hsu

numpy/image.py

@@ -235,7 +235,8 @@ def dense_bench():
         print("Dense xor NNZ = ", np.sum(xor_img != 0))
         assert(sparse_xor_img.nnz == np.sum(xor_img != 1))
 
-@pytest.mark.skip(reason="for getting the input matrices statistics only")
+
+#@pytest.mark.skip(reason="for getting the input matrices statistics only")
 @pytest.mark.parametrize("num", list(range(1, 253))) 
 @pytest.mark.parametrize("pt1", [0.75])
 def bench_edge_detection_statistics(tacoBench, num, pt1):

numpy/minmax.py

@@ -1,4 +1,4 @@
-mport numpy as np
+import numpy as np
 from scipy.sparse import random, csr_matrix
 import sparse
 import pytest

scripts/image_runner.sh

@@ -8,11 +8,11 @@ set -u
 
 source /data/scratch/rohany/array-programming-benchmarks/venv/bin/activate
 
-out=image-bench/numpy
+out=image-bench/
 
 mkdir -p "$out"
 mkdir -p "data/image/tensors"
 
-jsonout="$out/result-numpy.json"
+jsonout="$out/image-bench-statistics-all.json"
 
-LANKA=ON NUMPY_JSON="$jsonout" make python-bench BENCHES="numpy/image.py"
+LANKA=ON NUMPY_JSON="$jsonout" make python-bench BENCHES="numpy/image.py::bench_edge_detection_statistics"

scripts/image_taco_runner.sh

@@ -10,7 +10,7 @@ out=image-bench/taco
 
 mkdir -p "$out"
 
-for i in {1..98} 
+for i in {1..253} 
 do
 	csvout="$out/result-taco-img$i.csv"
 	LANKA=ON IMAGE_NUM="$i" TACO_TENSOR_PATH="data/" TACO_OUT="$csvout" make -j8 taco-bench BENCHES="bench_image"

scripts/minimax_runner.sh

@@ -13,6 +13,6 @@ out=minmax-bench/numpy
 mkdir -p "$out"
 mkdir -p "data/minmax"
 
-jsonout="$out/statistics-numpy.json"
+jsonout="$out/results-scipy-only.json"
 
-LANKA=ON NUMPY_JSON="$jsonout" make python-bench BENCHES="numpy/minmax.py::bench_pydata_minmax" 
+LANKA=ON NUMPY_JSON="$jsonout" make python-bench BENCHES="numpy/minmax.py::bench_scipy_minmax" 

taco/minimax.cpp

@@ -92,9 +92,6 @@ static void bench_minimax(benchmark::State& state) {
 //    std::cout << result.getSource() << std::endl;
     state.ResumeTiming();
     result.compute();
-    state.PauseTiming();
-    return_value = result();
   }
-  state.counters["return"] = return_value;
 }
 TACO_BENCH(bench_minimax);