From 8d3f416d447bb970be93fd0fd6060193982966e5 Mon Sep 17 00:00:00 2001
From: Gonzalo Brito Gadeschi <gonzalob@nvidia.com>
Date: Wed, 5 Jun 2024 06:50:06 -0700
Subject: [PATCH] fixup

---
 src/main.cpp          | 13 +++++++------
 src/std/STDStream.cpp |  1 -
 src/std/model.cmake   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 604e14a2..af9fac6c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -332,13 +332,13 @@ void check_solution(const size_t num_times, T const* a, T const* b, T const* c,
   size_t failed = 0;
   T max_rel = std::numeric_limits<T>::epsilon() * T(100.0);
   T max_rel_dot = std::numeric_limits<T>::epsilon() * T(10000000.0);
-  auto check = [&](const char* name, T is, T should, T max_rel, size_t i = size_t(-1)) {
+  auto check = [&](const char* name, T is, T should, T mrel, size_t i = size_t(-1)) {
     // Relative difference:
     T diff = std::abs(is - should);
     T abs_is = std::abs(is);
     T abs_sh = std::abs(should);
     T largest = std::max(abs_is, abs_sh);
-    T same = diff <= largest * max_rel;
+    T same = diff <= largest * mrel;
     if (!same || std::isnan(is)) {
       ++failed;
       if (failed > 10) return;
@@ -346,7 +346,8 @@ void check_solution(const size_t num_times, T const* a, T const* b, T const* c,
       if (i != size_t(-1)) std::cerr << "[" << i << "]";
       std::cerr << ": " << is << " (is) != " << should
 		<< " (should)" << ", diff=" << diff << " > "
-		<< largest * max_rel << std::endl;
+		<< largest * mrel << " (largest=" << largest
+		<< ", max_rel=" << mrel << ")" << std::endl;
     }
   };
 
@@ -360,9 +361,9 @@ void check_solution(const size_t num_times, T const* a, T const* b, T const* c,
 
   // Calculate the L^infty-norm relative error
   for (size_t i = 0; i < array_size; ++i) {
-    check("a", a[i], goldA, i, max_rel);
-    check("b", b[i], goldB, i, max_rel);
-    check("c", c[i], goldC, i, max_rel);
+    check("a", a[i], goldA, max_rel, i);
+    check("b", b[i], goldB, max_rel, i);
+    check("c", c[i], goldC, max_rel, i);
   }
 
   if (failed > 0 && !silence_errors)
diff --git a/src/std/STDStream.cpp b/src/std/STDStream.cpp
index 47b1ebce..484ecda2 100644
--- a/src/std/STDStream.cpp
+++ b/src/std/STDStream.cpp
@@ -160,7 +160,6 @@ void STDStream<T>::nstream()
   auto as = std::ranges::subrange(a, a + array_size);
   auto bs = std::ranges::subrange(b, b + array_size);
   auto cs = std::ranges::subrange(c, c + array_size);
-  auto r = std::views::zip(as, bs, cs);
   std::transform(exe_policy, r.begin(), r.end(), a, [](auto vs) {
       auto [a, b, c] = vs;
       return a + b + startScalar * c;
diff --git a/src/std/model.cmake b/src/std/model.cmake
index 382d7998..2c24015b 100644
--- a/src/std/model.cmake
+++ b/src/std/model.cmake
@@ -60,7 +60,7 @@ macro(setup)
         register_append_link_flags(${NVHPC_FLAGS})
     endif ()
     if (USE_TBB)
-        register_link_library(TBB::tbb)
+      register_link_library(TBB::tbb)
     endif ()
     if (USE_ONEDPL)
         register_definitions(USE_ONEDPL)