From 74a7936e7f44a6bacb71b2eba99c7c992840bd6f Mon Sep 17 00:00:00 2001
From: Nathan Ellingwood <ndellin@sandia.gov>
Date: Fri, 12 Oct 2018 14:28:01 -0600
Subject: [PATCH] Unit test fixes with float enabled

Addresses failing unit test and linking error in issue #322, also -Werror
---
 unit_test/batched/Test_Batched_VectorMath.hpp |  6 +-
 unit_test/blas/Test_Blas1_abs.hpp             | 34 +++++----
 unit_test/blas/Test_Blas1_nrm2.hpp            |  8 +--
 unit_test/blas/Test_Blas1_nrm2_squared.hpp    | 18 +++--
 unit_test/blas/Test_Blas1_reciprocal.hpp      | 31 ++++----
 unit_test/blas/Test_Blas1_scal.hpp            | 64 ++++++++++++-----
 unit_test/blas/Test_Blas1_team_abs.hpp        | 22 +++---
 unit_test/blas/Test_Blas1_team_scal.hpp       | 72 ++++++++++++-------
 unit_test/graph/Test_Graph_graph_color_d2.hpp |  3 +-
 unit_test/sparse/Test_Sparse_trsv.hpp         |  3 +-
 10 files changed, 168 insertions(+), 93 deletions(-)

diff --git a/unit_test/batched/Test_Batched_VectorMath.hpp b/unit_test/batched/Test_Batched_VectorMath.hpp
index 9e330e9b37..0cdb25f634 100644
--- a/unit_test/batched/Test_Batched_VectorMath.hpp
+++ b/unit_test/batched/Test_Batched_VectorMath.hpp
@@ -24,7 +24,9 @@ namespace Test {
     typedef typename ats::mag_type mag_type;
 
     vector_type a, b, aref, bref;
+    const value_type one(1.0);
     const value_type half(0.5);
+    const value_type maxmin(1.0e-7);
     const mag_type eps = 1.0e3 * ats::epsilon();
 
     Random<value_type> random;
@@ -33,8 +35,8 @@ namespace Test {
         const auto aval = (random.value() + half);
         const auto bval = (random.value() + half);
         
-        aref[k] = max(min(aval, 1.0), 1.0e-7);
-        bref[k] = max(min(bval, 1.0), 1.0e-7);
+        aref[k] = max(min(aval, one), maxmin);
+        bref[k] = max(min(bval, one), maxmin);
       }
 
       {
diff --git a/unit_test/blas/Test_Blas1_abs.hpp b/unit_test/blas/Test_Blas1_abs.hpp
index 63d23488f9..aebdc2bceb 100644
--- a/unit_test/blas/Test_Blas1_abs.hpp
+++ b/unit_test/blas/Test_Blas1_abs.hpp
@@ -42,8 +42,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::deep_copy(b_org_y,b_y);
 
@@ -52,16 +52,20 @@ namespace Test {
 
     ScalarA expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += AT::abs(h_x(i)) * AT::abs(h_x(i));
+    { expected_result += AT::abs(h_x(i)) * AT::abs(h_x(i)); }
 
     KokkosBlas::abs(y,x);
-    ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( nonconst_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
+      EXPECT_NEAR_KK( nonconst_nonconst_result, expected_result, eps*expected_result);
+    }
  
     Kokkos::deep_copy(b_y,b_org_y);
     KokkosBlas::abs(y,c_x);
-    ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( const_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
+      EXPECT_NEAR_KK( const_nonconst_result, expected_result, eps*expected_result);
+    }
   }
 
   template<class ViewTypeA, class ViewTypeB, class Device>
@@ -92,8 +96,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::deep_copy(b_org_y,b_y);
 
@@ -106,10 +110,10 @@ namespace Test {
     for(int j=0;j<K;j++) {
       expected_result[j] = ScalarA();
       for(int i=0;i<N;i++)
-        expected_result[j] += AT::abs(h_x(i,j)) * AT::abs(h_x(i,j));
+      { expected_result[j] += AT::abs(h_x(i,j)) * AT::abs(h_x(i,j)); }
     }
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     Kokkos::View<ScalarB*,Kokkos::HostSpace> r("Dot::Result",K);
 
@@ -117,7 +121,9 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA nonconst_result = r(k);
-      EXPECT_NEAR_KK( nonconst_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
@@ -125,7 +131,9 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA const_result = r(k);
-      EXPECT_NEAR_KK( const_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     delete [] expected_result;
diff --git a/unit_test/blas/Test_Blas1_nrm2.hpp b/unit_test/blas/Test_Blas1_nrm2.hpp
index 420e907eb4..3d2233d051 100644
--- a/unit_test/blas/Test_Blas1_nrm2.hpp
+++ b/unit_test/blas/Test_Blas1_nrm2.hpp
@@ -27,7 +27,7 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_a,rand_pool,ScalarA(10));
+    Kokkos::fill_random(b_a,rand_pool,ScalarA(1));
 
     Kokkos::fence();
 
@@ -38,7 +38,7 @@ namespace Test {
 
     typename AT::mag_type expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += AT::abs(h_a(i))*AT::abs(h_a(i));
+    { expected_result += AT::abs(h_a(i))*AT::abs(h_a(i)); }
     expected_result = Kokkos::Details::ArithTraits<typename AT::mag_type>::sqrt(expected_result);
 
     typename AT::mag_type nonconst_result = KokkosBlas::nrm2(a);
@@ -69,7 +69,7 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_a,rand_pool,ScalarA(10));
+    Kokkos::fill_random(b_a,rand_pool,ScalarA(1));
 
     Kokkos::fence();
 
@@ -81,7 +81,7 @@ namespace Test {
     for(int j=0;j<K;j++) {
       expected_result[j] = typename AT::mag_type();
       for(int i=0;i<N;i++)
-        expected_result[j] += AT::abs(h_a(i,j))*AT::abs(h_a(i,j));
+      { expected_result[j] += AT::abs(h_a(i,j))*AT::abs(h_a(i,j)); }
       expected_result[j] = Kokkos::Details::ArithTraits<typename AT::mag_type>::sqrt(expected_result[j]);
     }
 
diff --git a/unit_test/blas/Test_Blas1_nrm2_squared.hpp b/unit_test/blas/Test_Blas1_nrm2_squared.hpp
index 8eea18e5f5..b4f6dc7f10 100644
--- a/unit_test/blas/Test_Blas1_nrm2_squared.hpp
+++ b/unit_test/blas/Test_Blas1_nrm2_squared.hpp
@@ -27,7 +27,7 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_a,rand_pool,ScalarA(10));
+    Kokkos::fill_random(b_a,rand_pool,ScalarA(1));
 
     Kokkos::fence();
 
@@ -38,7 +38,7 @@ namespace Test {
 
     typename AT::mag_type expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += AT::abs(h_a(i))*AT::abs(h_a(i));
+    { expected_result += AT::abs(h_a(i))*AT::abs(h_a(i)); }
 
     typename AT::mag_type nonconst_result = KokkosBlas::nrm2_squared(a);
     EXPECT_NEAR_KK( nonconst_result, expected_result, eps*expected_result);
@@ -68,7 +68,7 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_a,rand_pool,ScalarA(10));
+    Kokkos::fill_random(b_a,rand_pool,ScalarA(1));
 
     Kokkos::fence();
 
@@ -80,23 +80,27 @@ namespace Test {
     for(int j=0;j<K;j++) {
       expected_result[j] = typename AT::mag_type();
       for(int i=0;i<N;i++)
-        expected_result[j] += AT::abs(h_a(i,j))*AT::abs(h_a(i,j));
+      { expected_result[j] += AT::abs(h_a(i,j))*AT::abs(h_a(i,j)); }
     }
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     Kokkos::View<typename AT::mag_type*,Kokkos::HostSpace> r("Dot::Result",K);
 
     KokkosBlas::nrm2_squared(r,a);
     for(int k=0;k<K;k++) {
       typename AT::mag_type nonconst_result = r(k);
-      EXPECT_NEAR_KK( nonconst_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs(nonconst_result - expected_result[k])/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     KokkosBlas::nrm2_squared(r,c_a);
     for(int k=0;k<K;k++) {
       typename AT::mag_type const_result = r(k);
-      EXPECT_NEAR_KK( const_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs(const_result - expected_result[k])/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     delete [] expected_result;
diff --git a/unit_test/blas/Test_Blas1_reciprocal.hpp b/unit_test/blas/Test_Blas1_reciprocal.hpp
index e9249b00e7..375c8082b3 100644
--- a/unit_test/blas/Test_Blas1_reciprocal.hpp
+++ b/unit_test/blas/Test_Blas1_reciprocal.hpp
@@ -23,7 +23,7 @@ namespace Test {
                 Kokkos::LayoutRight, Kokkos::LayoutLeft>::type,Device> BaseTypeB;
 
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*2000;
 
     BaseTypeA b_x("X",N);
     BaseTypeB b_y("Y",N);
@@ -42,8 +42,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -54,16 +54,19 @@ namespace Test {
 
     ScalarA expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += AT::abs(AT::one()/h_x(i)) * AT::abs(AT::one()/h_x(i));
+    { expected_result += AT::abs(AT::one()/h_x(i)) * AT::abs(AT::one()/h_x(i)); }
 
     KokkosBlas::reciprocal(y,x);
     ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( nonconst_nonconst_result, expected_result, eps*expected_result);
+    typename AT::mag_type divisor = expected_result == AT::zero() ? AT::one() : expected_result;
+    typename AT::mag_type diff = AT::abs( nonconst_nonconst_result - expected_result )/divisor;
+    EXPECT_NEAR_KK( diff, AT::zero(), eps );
  
     Kokkos::deep_copy(b_y,b_org_y);
     KokkosBlas::reciprocal(y,c_x);
     ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( const_nonconst_result, expected_result, eps*expected_result);
+    diff = AT::abs( const_nonconst_result - expected_result )/divisor;
+    EXPECT_NEAR_KK( diff, AT::zero(), eps );
   }
 
   template<class ViewTypeA, class ViewTypeB, class Device>
@@ -94,8 +97,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -110,10 +113,10 @@ namespace Test {
     for(int j=0;j<K;j++) {
       expected_result[j] = ScalarA();
       for(int i=0;i<N;i++)
-        expected_result[j] += AT::abs(AT::one()/h_x(i,j)) * AT::abs(AT::one()/h_x(i,j));
+      { expected_result[j] += AT::abs(AT::one()/h_x(i,j)) * AT::abs(AT::one()/h_x(i,j)); }
     }
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*2000;
 
     Kokkos::View<ScalarB*,Kokkos::HostSpace> r("Dot::Result",K);
 
@@ -121,7 +124,9 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA nonconst_result = r(k);
-      EXPECT_NEAR_KK( nonconst_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
@@ -129,7 +134,9 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA const_result = r(k);
-      EXPECT_NEAR_KK( const_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     delete [] expected_result;
diff --git a/unit_test/blas/Test_Blas1_scal.hpp b/unit_test/blas/Test_Blas1_scal.hpp
index 9774ed20e6..618dba2e72 100644
--- a/unit_test/blas/Test_Blas1_scal.hpp
+++ b/unit_test/blas/Test_Blas1_scal.hpp
@@ -11,6 +11,7 @@ namespace Test {
 
     typedef typename ViewTypeA::value_type ScalarA;
     typedef typename ViewTypeB::value_type ScalarB;
+    typedef Kokkos::Details::ArithTraits<ScalarA> AT;
 
     typedef Kokkos::View<ScalarA*[2],
        typename std::conditional<
@@ -22,8 +23,8 @@ namespace Test {
                 Kokkos::LayoutRight, Kokkos::LayoutLeft>::type,Device> BaseTypeB;
 
 
-    ScalarA a = 3;
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    ScalarA a(3);
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     BaseTypeA b_x("X",N);
     BaseTypeB b_y("Y",N);
@@ -43,8 +44,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -55,16 +56,24 @@ namespace Test {
 
     ScalarA expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += ScalarB(a*h_x(i)) * ScalarB(a*h_x(i));
+    { expected_result += ScalarB(a*h_x(i)) * ScalarB(a*h_x(i)); }
 
     KokkosBlas::scal(y,a,x);
-    ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( nonconst_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
+      typename AT::mag_type divisor = expected_result == AT::zero() ? AT::one() : expected_result;
+      typename AT::mag_type diff = AT::abs( nonconst_nonconst_result - expected_result )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
+    }
  
     Kokkos::deep_copy(b_y,b_org_y);
     KokkosBlas::scal(y,a,c_x);
-    ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( const_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
+      typename AT::mag_type divisor = expected_result == AT::zero() ? AT::one() : expected_result;
+      typename AT::mag_type diff = AT::abs( const_nonconst_result - expected_result )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
+    }
   }
 
   template<class ViewTypeA, class ViewTypeB, class Device>
@@ -72,6 +81,7 @@ namespace Test {
 
     typedef typename ViewTypeA::value_type ScalarA;
     typedef typename ViewTypeB::value_type ScalarB;
+    typedef Kokkos::Details::ArithTraits<ScalarA> AT;
 
     typedef multivector_layout_adapter<ViewTypeA> vfA_type;
     typedef multivector_layout_adapter<ViewTypeB> vfB_type;
@@ -94,8 +104,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -104,7 +114,7 @@ namespace Test {
     Kokkos::deep_copy(h_b_x,b_x);
     Kokkos::deep_copy(h_b_y,b_y);
 
-    ScalarA a = 3;
+    ScalarA a(3.0);
     typename ViewTypeA::const_type c_x = x;
 
     ScalarA* expected_result = new ScalarA[K];
@@ -114,7 +124,7 @@ namespace Test {
         expected_result[j] += ScalarB(a*h_x(i,j)) * ScalarB(a*h_x(i,j));
     }
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     Kokkos::View<ScalarB*,Kokkos::HostSpace> r("Dot::Result",K);
 
@@ -122,7 +132,9 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA nonconst_scalar_result = r(k);
-      EXPECT_NEAR_KK( nonconst_scalar_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_scalar_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
@@ -130,28 +142,42 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA const_scalar_result = r(k);
-      EXPECT_NEAR_KK( const_scalar_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_scalar_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
+    // Generate 'params' view with dimension == number of multivectors; each entry will be different scalar to scale y
     Kokkos::View<ScalarA*,Device> params("Params",K);
     for(int j=0; j<K; j++) {
       Kokkos::View<ScalarA,Device> param_j(params,j);
       Kokkos::deep_copy(param_j,ScalarA(3+j));
     }
 
+    // Update expected_result for next 3 vector tests
+    for(int j=0;j<K;j++) {
+      expected_result[j] = ScalarA();
+      for(int i=0;i<N;i++)
+        expected_result[j] += ScalarB((3.0+j)*h_x(i,j)) * ScalarB((3.0+j)*h_x(i,j));
+    }
+
     KokkosBlas::scal(y,params,x);
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA nonconst_vector_result = r(k)/((3+k)*(3+k))*a*a;
-      EXPECT_NEAR_KK( nonconst_vector_result, expected_result[k], eps*expected_result[k]);
+      ScalarA nonconst_vector_result = r(k);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_vector_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
     KokkosBlas::scal(y,params,c_x);
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA const_vector_result = r(k)/((3+k)*(3+k))*a*a;
-      EXPECT_NEAR_KK( const_vector_result, expected_result[k], eps*expected_result[k]);
+      ScalarA const_vector_result = r(k);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_vector_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     delete [] expected_result;
diff --git a/unit_test/blas/Test_Blas1_team_abs.hpp b/unit_test/blas/Test_Blas1_team_abs.hpp
index 2610bea7f5..59d24f277b 100644
--- a/unit_test/blas/Test_Blas1_team_abs.hpp
+++ b/unit_test/blas/Test_Blas1_team_abs.hpp
@@ -50,8 +50,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::deep_copy(b_org_y,b_y);
 
@@ -117,8 +117,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::deep_copy(b_org_y,b_y);
 
@@ -144,9 +144,12 @@ namespace Test {
        KokkosBlas::Experimental::abs(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), Kokkos::subview(x,Kokkos::ALL(),teamId));
     } );
 
-    KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA nonconst_result = r(k);
+      auto yk = Kokkos::subview(y, Kokkos::ALL(), k);
+      ScalarA nonconst_result(0);
+      for ( size_t i = 0; i < yk.extent(0); ++i ) {
+        nonconst_result += yk(i)*yk(i);
+      }
       EXPECT_NEAR_KK( nonconst_result, expected_result[k], eps*expected_result[k]);
     }
 
@@ -158,9 +161,12 @@ namespace Test {
        KokkosBlas::Experimental::abs(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), Kokkos::subview(c_x,Kokkos::ALL(),teamId));
     } );
 
-    KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA const_result = r(k);
+      auto yk = Kokkos::subview(y, Kokkos::ALL(), k);
+      ScalarA const_result(0);
+      for ( size_t i = 0; i < yk.extent(0); ++i ) {
+        const_result += yk(i)*yk(i);
+      }
       EXPECT_NEAR_KK( const_result, expected_result[k], eps*expected_result[k]);
     }
 
diff --git a/unit_test/blas/Test_Blas1_team_scal.hpp b/unit_test/blas/Test_Blas1_team_scal.hpp
index 0b2fa3b95f..c63fe9f767 100644
--- a/unit_test/blas/Test_Blas1_team_scal.hpp
+++ b/unit_test/blas/Test_Blas1_team_scal.hpp
@@ -19,6 +19,7 @@ namespace Test {
 
     typedef typename ViewTypeA::value_type ScalarA;
     typedef typename ViewTypeB::value_type ScalarB;
+    typedef Kokkos::Details::ArithTraits<ScalarA> AT;
 
     typedef Kokkos::View<ScalarA*[2],
        typename std::conditional<
@@ -30,8 +31,8 @@ namespace Test {
                 Kokkos::LayoutRight, Kokkos::LayoutLeft>::type,Device> BaseTypeB;
 
 
-    ScalarA a = 3;
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    ScalarA a(3);
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     BaseTypeA b_x("X",N);
     BaseTypeB b_y("Y",N);
@@ -51,8 +52,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -63,27 +64,33 @@ namespace Test {
 
     ScalarA expected_result = 0;
     for(int i=0;i<N;i++)
-      expected_result += ScalarB(a*h_x(i)) * ScalarB(a*h_x(i));
+    { expected_result += ScalarB(a*h_x(i)) * ScalarB(a*h_x(i)); }
 
-    //KokkosBlas::scal(y,a,x);
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::make_pair(teamId*team_data_siz,(teamId < M-1)?(teamId+1)*team_data_siz:N)), a, Kokkos::subview(x,Kokkos::make_pair(teamId*team_data_siz,(teamId < M-1)?(teamId+1)*team_data_siz:N)));
     } );
 
-    ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( nonconst_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB nonconst_nonconst_result = KokkosBlas::dot(y,y);
+      typename AT::mag_type divisor = expected_result == AT::zero() ? AT::one() : expected_result;
+      typename AT::mag_type diff = AT::abs( nonconst_nonconst_result - expected_result )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
+    }
  
     Kokkos::deep_copy(b_y,b_org_y);
     
-    //KokkosBlas::scal(y,a,c_x);
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::make_pair(teamId*team_data_siz,(teamId < M-1)?(teamId+1)*team_data_siz:N)), a, Kokkos::subview(c_x,Kokkos::make_pair(teamId*team_data_siz,(teamId < M-1)?(teamId+1)*team_data_siz:N)));
     } );
 
-    ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
-    EXPECT_NEAR_KK( const_nonconst_result, expected_result, eps*expected_result);
+    {
+      ScalarB const_nonconst_result = KokkosBlas::dot(y,y);
+      typename AT::mag_type divisor = expected_result == AT::zero() ? AT::one() : expected_result;
+      typename AT::mag_type diff = AT::abs( const_nonconst_result - expected_result )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
+    }
   }
 
   template<class ViewTypeA, class ViewTypeB, class Device>
@@ -97,6 +104,7 @@ namespace Test {
 
     typedef typename ViewTypeA::value_type ScalarA;
     typedef typename ViewTypeB::value_type ScalarB;
+    typedef Kokkos::Details::ArithTraits<ScalarA> AT;
 
     typedef multivector_layout_adapter<ViewTypeA> vfA_type;
     typedef multivector_layout_adapter<ViewTypeB> vfB_type;
@@ -119,8 +127,8 @@ namespace Test {
 
     Kokkos::Random_XorShift64_Pool<typename Device::execution_space> rand_pool(13718);
 
-    Kokkos::fill_random(b_x,rand_pool,ScalarA(10));
-    Kokkos::fill_random(b_y,rand_pool,ScalarB(10));
+    Kokkos::fill_random(b_x,rand_pool,ScalarA(1));
+    Kokkos::fill_random(b_y,rand_pool,ScalarB(1));
 
     Kokkos::fence();
 
@@ -129,7 +137,7 @@ namespace Test {
     Kokkos::deep_copy(h_b_x,b_x);
     Kokkos::deep_copy(h_b_y,b_y);
 
-    ScalarA a = 3;
+    ScalarA a(3);
     typename ViewTypeA::const_type c_x = x;
 
     ScalarA* expected_result = new ScalarA[K];
@@ -139,11 +147,10 @@ namespace Test {
         expected_result[j] += ScalarB(a*h_x(i,j)) * ScalarB(a*h_x(i,j));
     }
 
-    double eps = std::is_same<ScalarA,float>::value?2*1e-5:1e-7;
+    typename AT::mag_type eps = AT::epsilon()*1000;
 
     Kokkos::View<ScalarB*,Kokkos::HostSpace> r("Dot::Result",K);
 
-    //KokkosBlas::scal(y,a,x);
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), a, Kokkos::subview(x,Kokkos::ALL(),teamId));
@@ -152,12 +159,13 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA nonconst_scalar_result = r(k);
-      EXPECT_NEAR_KK( nonconst_scalar_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_scalar_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
 
-    //KokkosBlas::scal(y,a,c_x);
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), a, Kokkos::subview(c_x,Kokkos::ALL(),teamId));
@@ -166,16 +174,25 @@ namespace Test {
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
       ScalarA const_scalar_result = r(k);
-      EXPECT_NEAR_KK( const_scalar_result, expected_result[k], eps*expected_result[k]);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_scalar_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
+    // Generate 'params' view with dimension == number of multivectors; each entry will be different scalar to scale y
     Kokkos::View<ScalarA*,Device> params("Params",K);
     for(int j=0; j<K; j++) {
       Kokkos::View<ScalarA,Device> param_j(params,j);
       Kokkos::deep_copy(param_j,ScalarA(3+j));
     }
 
-    //KokkosBlas::scal(y,params,x);
+    // Update expected_result for next 3 vector tests
+    for(int j=0;j<K;j++) {
+      expected_result[j] = ScalarA();
+      for(int i=0;i<N;i++)
+        expected_result[j] += ScalarB((3.0+j)*h_x(i,j)) * ScalarB((3.0+j)*h_x(i,j));
+    }
+
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), params(teamId), Kokkos::subview(x,Kokkos::ALL(),teamId));
@@ -183,22 +200,25 @@ namespace Test {
 
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA nonconst_vector_result = r(k)/((3+k)*(3+k))*a*a;
-      EXPECT_NEAR_KK( nonconst_vector_result, expected_result[k], eps*expected_result[k]);
+      ScalarA nonconst_vector_result = r(k);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( nonconst_vector_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     Kokkos::deep_copy(b_y,b_org_y);
     
-    //KokkosBlas::scal(y,params,c_x);
     Kokkos::parallel_for( policy, KOKKOS_LAMBDA ( const team_member &teamMember ) {
        const int teamId = teamMember.league_rank();
        KokkosBlas::Experimental::scal(teamMember, Kokkos::subview(y,Kokkos::ALL(),teamId), params(teamId), Kokkos::subview(c_x,Kokkos::ALL(),teamId));
     } );
-        
+
     KokkosBlas::dot(r,y,y);
     for(int k=0;k<K;k++) {
-      ScalarA const_vector_result = r(k)/((3+k)*(3+k))*a*a;
-      EXPECT_NEAR_KK( const_vector_result, expected_result[k], eps*expected_result[k]);
+      ScalarA const_vector_result = r(k);
+      typename AT::mag_type divisor = expected_result[k] == AT::zero() ? AT::one() : expected_result[k];
+      typename AT::mag_type diff = AT::abs( const_vector_result - expected_result[k] )/divisor;
+      EXPECT_NEAR_KK( diff, AT::zero(), eps );
     }
 
     delete [] expected_result;
diff --git a/unit_test/graph/Test_Graph_graph_color_d2.hpp b/unit_test/graph/Test_Graph_graph_color_d2.hpp
index 29729b3763..0cfd10ead6 100644
--- a/unit_test/graph/Test_Graph_graph_color_d2.hpp
+++ b/unit_test/graph/Test_Graph_graph_color_d2.hpp
@@ -225,7 +225,7 @@ TEST_F( TestCategory, graph ## _ ## graph_color_d2 ## _ ## SCALAR ## _ ## ORDINA
   test_coloring_d2<SCALAR,ORDINAL,OFFSET,DEVICE>(50000, 50000 * 30, 200, 10); \
   test_coloring_d2<SCALAR,ORDINAL,OFFSET,DEVICE>(50000, 50000 * 30, 100, 10); \
 }
-
+#if defined(KOKKOSKERNELS_INST_DOUBLE)
 #if (defined (KOKKOSKERNELS_INST_ORDINAL_INT) \
  && defined (KOKKOSKERNELS_INST_OFFSET_INT) ) || (!defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
  EXECUTE_TEST(double, int, int, TestExecSpace)
@@ -245,3 +245,4 @@ TEST_F( TestCategory, graph ## _ ## graph_color_d2 ## _ ## SCALAR ## _ ## ORDINA
  && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) ) || (!defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS))
  EXECUTE_TEST(double, int64_t, size_t, TestExecSpace)
 #endif
+#endif
diff --git a/unit_test/sparse/Test_Sparse_trsv.hpp b/unit_test/sparse/Test_Sparse_trsv.hpp
index 697d0b1708..169ed84bad 100644
--- a/unit_test/sparse/Test_Sparse_trsv.hpp
+++ b/unit_test/sparse/Test_Sparse_trsv.hpp
@@ -22,7 +22,8 @@ void check_trsv_mv(crsMat_t input_mat, x_vector_type x, y_vector_type b, y_vecto
   //typedef typename crsMat_t::StaticCrsGraphType graph_t;
   typedef typename crsMat_t::values_type::non_const_type scalar_view_t;
   typedef typename scalar_view_t::value_type ScalarA;
-  double eps = std::is_same<ScalarA,float>::value?2*1e-2:1e-7;
+  double eps = (std::is_same<ScalarA,float>::value ? 2*1e-2
+               : (std::is_same<ScalarA,std::complex<float>>::value || std::is_same<ScalarA,Kokkos::complex<float>>::value )? 2*1e-1 : 1e-7 );
 
   Kokkos::fence();
   KokkosSparse::trsv(uplo, "N", "N", input_mat, b, x);