put default types in KokkosKernels namespace

Signed-off-by: Carl Pearson <cwpears@sandia.gov>

Author: cwpearson

blas/src/KokkosBlas1_dot.hpp

@@ -77,9 +77,9 @@ typename Kokkos::Details::InnerProductSpaceTraits<typename XVector::non_const_va
   // These special cases are to maintain accuracy.
   using result_type = typename KokkosBlas::Impl::DotAccumulatingScalar<dot_type>::type;
   using RVector_Internal =
-      Kokkos::View<dot_type, default_layout, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
-  using RVector_Result =
-      Kokkos::View<result_type, default_layout, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
+      Kokkos::View<dot_type, KokkosKernels::default_layout, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
+  using RVector_Result = Kokkos::View<result_type, KokkosKernels::default_layout, Kokkos::HostSpace,
+                                      Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
 
   XVector_Internal X = x;
   YVector_Internal Y = y;

blas/src/KokkosBlas1_nrm1.hpp

@@ -49,8 +49,8 @@ typename Kokkos::Details::InnerProductSpaceTraits<typename XVector::non_const_va
                                         typename KokkosKernels::Impl::GetUnifiedLayout<XVector>::array_layout,
                                         typename XVector::device_type, Kokkos::MemoryTraits<Kokkos::Unmanaged> >;
 
-  using RVector_Internal =
-      Kokkos::View<mag_type, default_layout, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >;
+  using RVector_Internal = Kokkos::View<mag_type, KokkosKernels::default_layout, Kokkos::HostSpace,
+                                        Kokkos::MemoryTraits<Kokkos::Unmanaged> >;
 
   mag_type result;
   RVector_Internal R = RVector_Internal(&result);

blas/src/KokkosBlas1_nrm2_squared.hpp

@@ -55,7 +55,8 @@ typename Kokkos::Details::InnerProductSpaceTraits<typename XVector::non_const_va
                        typename XVector::device_type, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
       XVector_Internal;
 
-  typedef Kokkos::View<mag_type, default_layout, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+  typedef Kokkos::View<mag_type, KokkosKernels::default_layout, Kokkos::HostSpace,
+                       Kokkos::MemoryTraits<Kokkos::Unmanaged> >
       RVector_Internal;
 
   mag_type result;

common/src/KokkosKernels_default_types.hpp

@@ -20,6 +20,15 @@
 #include "Kokkos_Core.hpp"         //for LayoutLeft/LayoutRight
 #include <KokkosKernels_config.h>  //for all the ETI #cmakedefine macros
 
+// define a deprecated symbol = type in the global namespace
+// and a non-deprecated version in Kokkos Kernels
+// these deprecations were done in 4.4.
+#define KK_IMPL_MAKE_TYPE_ALIAS(symbol, type)                            \
+  using symbol [[deprecated("use KokkosKernels::" #symbol ".")]] = type; \
+  namespace KokkosKernels {                                              \
+  using symbol = type;                                                   \
+  }
+
 #if defined(KOKKOSKERNELS_INST_ORDINAL_INT)
 using default_lno_t = int;
 #elif defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T)
@@ -73,4 +82,6 @@ using default_device = Kokkos::Threads;
 using default_device = Kokkos::Serial;
 #endif
 
+}  // namespace KokkosKernels
+
 #endif  // KOKKOSKERNELS_DEFAULT_TYPES_H

common/unit_test/Test_Common_IOUtils.hpp

@@ -42,7 +42,7 @@ class ViewPrintHelper {
 
 template <typename exec_space>
 void testPrintView() {
-  using scalar_t   = default_scalar;
+  using scalar_t   = KokkosKernels::default_scalar;
   using Unmanaged  = Kokkos::MemoryTraits<Kokkos::Unmanaged>;
   using rank0_view = Kokkos::View<scalar_t, Kokkos::HostSpace, Unmanaged>;
   using rank1_view = Kokkos::View<scalar_t *, Kokkos::HostSpace, Unmanaged>;

example/half/xpy.cpp

@@ -94,7 +94,7 @@ int main(int argc, char **argv) {
     return 1;
   }
   using LayoutType = Kokkos::LayoutLeft;
-  using DeviceType = default_device;
+  using DeviceType = KokkosKernels::default_device;
   size_t n         = atoi(argv[1]);
   bool time_only   = static_cast<bool>(atoi(argv[2]));
   do_xpy<float, DeviceType, LayoutType>(n, time_only);

example/wiki/graph/KokkosGraph_wiki_9pt_stencil.hpp

@@ -25,16 +25,16 @@
 #include <cmath>
 #include <sstream>
 
-using Ordinal     = default_lno_t;
-using Offset      = default_size_type;
-using Layout      = default_layout;
+using Ordinal     = KokkosKernels::default_lno_t;
+using Offset      = KokkosKernels::default_size_type;
+using Layout      = KokkosKernels::default_layout;
 using ExecSpace   = Kokkos::DefaultExecutionSpace;
 using DeviceSpace = typename ExecSpace::memory_space;
 using Kokkos::HostSpace;
 using RowmapType  = Kokkos::View<Offset*, DeviceSpace>;
 using ColindsType = Kokkos::View<Ordinal*, DeviceSpace>;
-using Handle = KokkosKernels::Experimental::KokkosKernelsHandle<Offset, Ordinal, default_scalar, ExecSpace, DeviceSpace,
-                                                                DeviceSpace>;
+using Handle      = KokkosKernels::Experimental::KokkosKernelsHandle<Offset, Ordinal, KokkosKernels::default_scalar,
+                                                                ExecSpace, DeviceSpace, DeviceSpace>;
 
 namespace GraphDemo {
 Ordinal gridX       = 15;

example/wiki/sparse/KokkosSparse_wiki_bsrmatrix.cpp

@@ -23,10 +23,10 @@
 #include "KokkosSparse_BsrMatrix.hpp"
 #include "KokkosSparse_CrsMatrix.hpp"
 
-using Scalar  = default_scalar;
-using Ordinal = default_lno_t;
-using Offset  = default_size_type;
-using Layout  = default_layout;
+using Scalar  = KokkosKernels::default_scalar;
+using Ordinal = KokkosKernels::default_lno_t;
+using Offset  = KokkosKernels::default_size_type;
+using Layout  = KokkosKernels::default_layout;
 
 int main() {
   Kokkos::initialize();

example/wiki/sparse/KokkosSparse_wiki_bsrmatrix_2.cpp

@@ -23,10 +23,10 @@
 #include "KokkosKernels_default_types.hpp"
 #include "KokkosSparse_BsrMatrix.hpp"
 
-using Scalar  = default_scalar;
-using Ordinal = default_lno_t;
-using Offset  = default_size_type;
-using Layout  = default_layout;
+using Scalar  = KokkosKernels::default_scalar;
+using Ordinal = KokkosKernels::default_lno_t;
+using Offset  = KokkosKernels::default_size_type;
+using Layout  = KokkosKernels::default_layout;
 
 template <class bsrmatrix_type>
 struct bsr_fill {

example/wiki/sparse/KokkosSparse_wiki_crsmatrix.cpp

@@ -21,10 +21,10 @@
 #include "KokkosSparse_CrsMatrix.hpp"
 #include "KokkosSparse_spmv.hpp"
 
-using Scalar  = default_scalar;
-using Ordinal = default_lno_t;
-using Offset  = default_size_type;
-using Layout  = default_layout;
+using Scalar  = KokkosKernels::default_scalar;
+using Ordinal = KokkosKernels::default_lno_t;
+using Offset  = KokkosKernels::default_size_type;
+using Layout  = KokkosKernels::default_layout;
 
 int main() {
   Kokkos::initialize();