Merge branch 'master' into im_to_col

5 files changed, 58 insertions, 33 deletions

diff --git a/test/correctness/misc/override_parameters.cpp b/test/correctness/misc/override_parameters.cpp
index 4283c039..535d9286 100644
--- a/test/correctness/misc/override_parameters.cpp
+++ b/test/correctness/misc/override_parameters.cpp
@@ -15,6 +15,7 @@
 #include <vector>
 #include <unordered_map>
 #include <random>
+#include <iostream>
 
 #include "utilities/utilities.hpp"
 #include "test/routines/level3/xgemm.hpp"
@@ -120,9 +121,9 @@ size_t RunOverrideTests(int argc, char *argv[], const bool silent, const std::st
   }
 
   // Prints and returns the statistics
-  fprintf(stdout, "    %zu test(s) passed\n", passed);
-  fprintf(stdout, "    %zu test(s) failed\n", errors);
-  fprintf(stdout, "\n");
+  std::cout << "    " << passed << " test(s) passed" << std::endl;
+  std::cout << "    " << errors << " test(s) failed" << std::endl;
+  std::cout << std::endl;
   return errors;
 }
 
diff --git a/test/correctness/testblas.cpp b/test/correctness/testblas.cpp
index edd9d4ea..659131c5 100644
--- a/test/correctness/testblas.cpp
+++ b/test/correctness/testblas.cpp
@@ -198,12 +198,12 @@ void TestBlas<T,U>::TestRegular(std::vector<Arguments<U>> &test_vector, const st
         if (!TestSimilarity(result1[index], result2[index])) {
           if (l2error >= kErrorMarginL2) { errors++; }
           if (verbose_) {
-            if (get_id2_(args) == 1) { fprintf(stdout, "\n   Error at index %zu: ", id1); }
-            else { fprintf(stdout, "\n   Error at %zu,%zu: ", id1, id2); }
-            fprintf(stdout, " %s (reference) versus ", ToString(result1[index]).c_str());
-            fprintf(stdout, " %s (CLBlast)", ToString(result2[index]).c_str());
+            if (get_id2_(args) == 1) { std::cout << std::endl << "   Error at index " << id1 << ": "; }
+            else { std::cout << std::endl << "   Error at " << id1 << "," << id2 << ": "; }
+            std::cout << " " << ToString(result1[index]) << " (reference) versus ";
+            std::cout << " " << ToString(result2[index]) << " (CLBlast)";
             if (l2error < kErrorMarginL2) {
-              fprintf(stdout, " - error suppressed by a low total L2 error\n");
+              std::cout << " - error suppressed by a low total L2 error" << std::endl;
             }
           }
         }
diff --git a/test/correctness/testblas.hpp b/test/correctness/testblas.hpp
index 577a289e..1c0cf9e3 100644
--- a/test/correctness/testblas.hpp
+++ b/test/correctness/testblas.hpp
@@ -391,6 +391,12 @@ size_t RunTests(int argc, char *argv[], const bool silent, const std::string &na
                 auto i_args = args;
                 i_args.m = i_args.n = i_args.k = i_args.kl = i_args.ku = tester.kBufferSize;
                 i_args.a_ld = i_args.b_ld = i_args.c_ld = tester.kBufferSize;
+                i_args.batch_count = 3;
+                i_args.alphas = std::vector<U>(i_args.batch_count);
+                i_args.betas = std::vector<U>(i_args.batch_count);
+                i_args.a_offsets = std::vector<size_t>(i_args.batch_count);
+                i_args.b_offsets = std::vector<size_t>(i_args.batch_count);
+                i_args.c_offsets = std::vector<size_t>(i_args.batch_count);
                 for (auto &x_size: x_sizes) { i_args.x_size = x_size;
                   for (auto &y_size: y_sizes) { i_args.y_size = y_size;
                     for (auto &a_size: a_sizes) { i_args.a_size = a_size;
diff --git a/test/correctness/tester.cpp b/test/correctness/tester.cpp
index 1581fbfb..648aef6e 100644
--- a/test/correctness/tester.cpp
+++ b/test/correctness/tester.cpp
@@ -185,14 +185,14 @@ Tester<T,U>::Tester(const std::vector<std::string> &arguments, const bool silent
 template <typename T, typename U>
 Tester<T,U>::~Tester() {
   if (PrecisionSupported<T>(device_)) {
-    fprintf(stdout, "* Completed all test-cases for this routine. Results:\n");
-    fprintf(stdout, "   %zu test(s) passed\n", tests_passed_);
-    if (tests_skipped_ > 0) { fprintf(stdout, "%s", kPrintWarning.c_str()); }
-    fprintf(stdout, "   %zu test(s) skipped%s\n", tests_skipped_, kPrintEnd.c_str());
-    if (tests_failed_ > 0) { fprintf(stdout, "%s", kPrintError.c_str()); }
-    fprintf(stdout, "   %zu test(s) failed%s\n", tests_failed_, kPrintEnd.c_str());
+    std::cout << "* Completed all test-cases for this routine. Results:" << std::endl;
+    std::cout << "   " << tests_passed_ << " test(s) passed" << std::endl;
+    if (tests_skipped_ > 0) { std::cout << kPrintWarning; }
+    std::cout << "   " << tests_skipped_ << " test(s) skipped" << kPrintEnd << std::endl;
+    if (tests_failed_ > 0) { std::cout << kPrintError; }
+    std::cout << "   " << tests_failed_ << " test(s) failed" << kPrintEnd << std::endl;
   }
-  fprintf(stdout, "\n");
+  std::cout << std::endl;
 
   // Cleans-up clBLAS
   #ifdef CLBLAST_REF_CLBLAS
@@ -238,18 +238,18 @@ void Tester<T,U>::TestEnd() {
   // Prints a test summary
   auto pass_rate = 100*num_passed_ / static_cast<float>(num_passed_ + num_skipped_ + num_failed_);
   fprintf(stdout, "   Pass rate %s%5.1lf%%%s:", kPrintMessage.c_str(), pass_rate, kPrintEnd.c_str());
-  fprintf(stdout, " %zu passed /", num_passed_);
+  std::cout << " " << num_passed_ << " passed /";
   if (num_skipped_ != 0) {
-    fprintf(stdout, " %s%zu skipped%s /", kPrintWarning.c_str(), num_skipped_, kPrintEnd.c_str());
+    std::cout << " " << kPrintWarning << num_skipped_ << " skipped" << kPrintEnd << " /";
   }
   else {
-    fprintf(stdout, " %zu skipped /", num_skipped_);
+    std::cout << " " << num_skipped_ << " skipped /";
   }
   if (num_failed_ != 0) {
-    fprintf(stdout, " %s%zu failed%s\n", kPrintError.c_str(), num_failed_, kPrintEnd.c_str());
+    std::cout << " " << kPrintError << num_failed_ << " failed" << kPrintEnd << std::endl;
   }
   else {
-    fprintf(stdout, " %zu failed\n", num_failed_);
+    std::cout << " " << num_failed_ << " failed" << std::endl;
   }
 }
 
diff --git a/test/correctness/tester.hpp b/test/correctness/tester.hpp
index e544f776..caf03787 100644
--- a/test/correctness/tester.hpp
+++ b/test/correctness/tester.hpp
@@ -22,7 +22,7 @@
 #include <vector>
 #include <memory>
 
-#include "utilities/utilities.hpp"
+#include "test/test_utilities.hpp"
 
 // The libraries
 #ifdef CLBLAST_REF_CLBLAS
@@ -153,20 +153,38 @@ template <typename T, typename U> const size_t Tester<T,U>::kResultsPerLine = si
 template <typename T, typename U> const float Tester<T,U>::kStatusError = -1.0f;
 
 // Constants holding start and end strings for terminal-output in colour
-template <typename T, typename U> const std::string Tester<T,U>::kPrintError = "\x1b[31m";
-template <typename T, typename U> const std::string Tester<T,U>::kPrintSuccess = "\x1b[32m";
-template <typename T, typename U> const std::string Tester<T,U>::kPrintWarning = "\x1b[35m";
-template <typename T, typename U> const std::string Tester<T,U>::kPrintMessage = "\x1b[1m";
-template <typename T, typename U> const std::string Tester<T,U>::kPrintEnd = "\x1b[0m";
+#if defined(_WIN32)
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintError = "";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintSuccess = "";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintWarning = "";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintMessage = "";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintEnd = "";
+#else
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintError = "\x1b[31m";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintSuccess = "\x1b[32m";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintWarning = "\x1b[35m";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintMessage = "\x1b[1m";
+  template <typename T, typename U> const std::string Tester<T,U>::kPrintEnd = "\x1b[0m";
+#endif
 
 // Sets the output error coding
-template <typename T, typename U> const std::string Tester<T,U>::kSuccessData = "\x1b[32m:\x1b[0m"; // success
-template <typename T, typename U> const std::string Tester<T,U>::kSuccessStatus = "\x1b[32m.\x1b[0m"; // success
-template <typename T, typename U> const std::string Tester<T,U>::kErrorData = "\x1b[31mX\x1b[0m"; // error
-template <typename T, typename U> const std::string Tester<T,U>::kErrorStatus = "\x1b[31m/\x1b[0m"; // error
-template <typename T, typename U> const std::string Tester<T,U>::kSkippedCompilation = "\x1b[35m\\\x1b[0m"; // warning
-template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedPrecision = "\x1b[35mo\x1b[0m"; // warning
-template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedReference = "\x1b[35m-\x1b[0m"; // warning
+#if defined(_WIN32)
+  template <typename T, typename U> const std::string Tester<T,U>::kSuccessData = ":"; // success
+  template <typename T, typename U> const std::string Tester<T,U>::kSuccessStatus = "."; // success
+  template <typename T, typename U> const std::string Tester<T,U>::kErrorData = "X"; // error
+  template <typename T, typename U> const std::string Tester<T,U>::kErrorStatus = "/"; // error
+  template <typename T, typename U> const std::string Tester<T,U>::kSkippedCompilation = "\\"; // warning
+  template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedPrecision = "o"; // warning
+  template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedReference = "-"; // warning
+#else
+  template <typename T, typename U> const std::string Tester<T,U>::kSuccessData = "\x1b[32m:\x1b[0m"; // success
+  template <typename T, typename U> const std::string Tester<T,U>::kSuccessStatus = "\x1b[32m.\x1b[0m"; // success
+  template <typename T, typename U> const std::string Tester<T,U>::kErrorData = "\x1b[31mX\x1b[0m"; // error
+  template <typename T, typename U> const std::string Tester<T,U>::kErrorStatus = "\x1b[31m/\x1b[0m"; // error
+  template <typename T, typename U> const std::string Tester<T,U>::kSkippedCompilation = "\x1b[35m\\\x1b[0m"; // warning
+  template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedPrecision = "\x1b[35mo\x1b[0m"; // warning
+  template <typename T, typename U> const std::string Tester<T,U>::kUnsupportedReference = "\x1b[35m-\x1b[0m"; // warning
+#endif
 
 // =================================================================================================
 // Below are the non-member functions (separated because of otherwise required partial class