From 99d42182fbc2ee54603b415c59b52a722ad7808e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20=C4=8Cejka?= <cejkaluk@gp1.fjfi.cvut.cz>
Date: Sun, 24 Mar 2019 16:44:26 +0100
Subject: [PATCH] Commented out MatrixMarket2 benchmark launch, MatrixReader
couldn't load those matrices. Added matrix file name to log file output, to
avoid overwriting data.
---
src/Benchmarks/scripts/run-tnl-benchmark-spmv | 53 ++++++++++---------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/Benchmarks/scripts/run-tnl-benchmark-spmv b/src/Benchmarks/scripts/run-tnl-benchmark-spmv
index 1bdffbc330..1935e45654 100755
--- a/src/Benchmarks/scripts/run-tnl-benchmark-spmv
+++ b/src/Benchmarks/scripts/run-tnl-benchmark-spmv
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-DEBUG="yes"
+DEBUG="no"
STOP_TIME="1"
export CUDA_PROFILE=0
@@ -12,31 +12,32 @@ BENCHMARK_DBG="tnl-benchmark-spmv-dbg"
export CUDA_PROFILE_CONFIG="$IWD/cuda-profiler.conf"
PROCESS_CUDA_PROFILE="$IWD/process-cuda-profile.pl"
-source matrix-market
+#source matrix-market
source florida-matrix-market
-for link in $MM_MATRICES;
-do
- echo "======================================================================================================"
- matrix=matrices`echo $link | sed 's/ftp:\/\/math.nist.gov\/pub//'`
- unzipped_matrix=`echo $matrix | sed 's/.gz//'`
- if test ! -e $matrix;
- then
- echo "Matrix $matrix is missing !!! Run the script 'get-matrices' first."
- #echo "Matrix $matrix is missing !!! Run the script 'get-matrices' first." >> sparse-matrix-benchmark.log
- else
- gunzip -c ${matrix} > ${unzipped_matrix}
- echo "Benchmarking with the matrix $unzipped_matrix ..."
- export CUDA_PROFILE_LOG=$unzipped_matrix.float.log
- if test x$DEBUG = xyes;
- then
- gdb --args ${BENCHMARK_DBG} --input-file $unzipped_matrix --log-file sparse-matrix-benchmark.log --verbose 1
- else
- $BENCHMARK --input-file $unzipped_matrix --log-file sparse-matrix-benchmark.log --verbose 1
- fi
- #perl $PROCESS_CUDA_PROFILE $unzipped_matrix.float.log sparse-matrix-profiling-float.log
- fi
-done
+# !!!Matrices in MatrixMarket2 don't load properly, formatting issues with every file. MatrixReader fails.
+#for link in $MM_MATRICES;
+#do
+# echo "======================================================================================================"
+# matrix=matrices`echo $link | sed 's/ftp:\/\/math.nist.gov\/pub//'`
+# unzipped_matrix=`echo $matrix | sed 's/.gz//'`
+# if test ! -e $matrix;
+# then
+# echo "Matrix $matrix is missing !!! Run the script 'get-matrices' first."
+# #echo "Matrix $matrix is missing !!! Run the script 'get-matrices' first." >> sparse-matrix-benchmark.log
+# else
+# gunzip -c ${matrix} > ${unzipped_matrix}
+# echo "Benchmarking with the matrix $unzipped_matrix ..."
+# export CUDA_PROFILE_LOG=$unzipped_matrix.float.log
+# if test x$DEBUG = xyes;
+# then
+# gdb --args ${BENCHMARK_DBG} --input-file $unzipped_matrix --log-file sparse-matrix-benchmark.log --verbose 1
+# else
+# $BENCHMARK --input-file $unzipped_matrix --log-file sparse-matrix-benchmark.log --verbose 1
+# fi
+# #perl $PROCESS_CUDA_PROFILE $unzipped_matrix.float.log sparse-matrix-profiling-float.log
+# fi
+#done
for link in $FLORIDA_MM_MATRICES;
do
@@ -59,9 +60,9 @@ do
echo "Benchmarking with the matrix $file ..."
if test x$DEBUG = xyes;
then
- gdb --args $BENCHMARK --input-file $file --log-file sparse-matrix-benchmark.log --verbose 1
+ gdb --args $BENCHMARK --input-file $file --log-file log-files/sparse-matrix-benchmark::$SUBDIRNAME.log --verbose 1
else
- $BENCHMARK --input-file $file --log-file sparse-matrix-benchmark.log --verbose 1
+ $BENCHMARK --input-file $file --log-file log-files/sparse-matrix-benchmark::$SUBDIRNAME.log --verbose 1
fi
done
fi
--
GitLab