Skip to content

Commit e2b38f6

Browse files
committed
Deprecate global namespace default type aliases
Signed-off-by: Carl Pearson <cwpears@sandia.gov>
1 parent f6a6dfc commit e2b38f6

File tree

4 files changed

+108
-90
lines changed

4 files changed

+108
-90
lines changed

common/src/KokkosKernels_default_types.hpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,58 +30,58 @@
3030
}
3131

3232
#if defined(KOKKOSKERNELS_INST_ORDINAL_INT)
33-
using default_lno_t = int;
33+
KK_IMPL_MAKE_TYPE_ALIAS(default_lno_t, int)
3434
#elif defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T)
35-
using default_lno_t = int64_t;
35+
KK_IMPL_MAKE_TYPE_ALIAS(default_lno_t, int64_t)
3636
#else
3737
// Non-ETI build: default to int
38-
using default_lno_t = int;
38+
KK_IMPL_MAKE_TYPE_ALIAS(default_lno_t, int)
3939
#endif
4040
// Prefer int as the default offset type, because cuSPARSE doesn't support
4141
// size_t for rowptrs.
4242
#if defined(KOKKOSKERNELS_INST_OFFSET_INT)
43-
using default_size_type = int;
43+
KK_IMPL_MAKE_TYPE_ALIAS(default_size_type, int)
4444
#elif defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)
45-
using default_size_type = size_t;
45+
KK_IMPL_MAKE_TYPE_ALIAS(default_size_type, size_t)
4646
#else
4747
// Non-ETI build: default to int
48-
using default_size_type = int;
48+
KK_IMPL_MAKE_TYPE_ALIAS(default_size_type, int)
4949
#endif
5050

5151
#if defined(KOKKOSKERNELS_INST_LAYOUTLEFT)
52-
using default_layout = Kokkos::LayoutLeft;
52+
KK_IMPL_MAKE_TYPE_ALIAS(default_layout, Kokkos::LayoutLeft)
5353
#elif defined(KOKKOSKERNELS_INST_LAYOUTRIGHT)
54-
using default_layout = Kokkos::LayoutRight;
54+
KK_IMPL_MAKE_TYPE_ALIAS(default_layout, Kokkos::LayoutRight)
5555
#else
56-
using default_layout = Kokkos::LayoutLeft;
56+
KK_IMPL_MAKE_TYPE_ALIAS(default_layout, Kokkos::LayoutLeft)
5757
#endif
5858

5959
#if defined(KOKKOSKERNELS_INST_DOUBLE)
60-
using default_scalar = double;
60+
KK_IMPL_MAKE_TYPE_ALIAS(default_scalar, double)
6161
#elif defined(KOKKOSKERNELS_INST_FLOAT)
62-
using default_scalar = float;
62+
KK_IMPL_MAKE_TYPE_ALIAS(default_scalar, float)
6363
#elif defined(KOKKOSKERNELS_INST_HALF)
64-
using default_scalar = Kokkos::Experimental::half_t;
64+
KK_IMPL_MAKE_TYPE_ALIAS(default_scalar, Kokkos::Experimental::half_t)
6565
#elif defined(KOKKOSKERNELS_INST_BHALF)
66-
using default_scalar = Kokkos::Experimental::bhalf_t;
66+
KK_IMPL_MAKE_TYPE_ALIAS(default_scalar, Kokkos::Experimental::bhalf_t)
6767
#else
68-
using default_scalar = double;
68+
KK_IMPL_MAKE_TYPE_ALIAS(default_scalar, double)
6969
#endif
7070

7171
#if defined(KOKKOS_ENABLE_CUDA)
72-
using default_device = Kokkos::Cuda;
72+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::Cuda)
7373
#elif defined(KOKKOS_ENABLE_HIP)
74-
using default_device = Kokkos::HIP;
74+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::HIP)
7575
#elif defined(KOKKOS_ENABLE_OPENMPTARGET)
76-
using default_device = Kokkos::Experimental::OpenMPTarget;
76+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::Experimental::OpenMPTarget)
7777
#elif defined(KOKKOS_ENABLE_OPENMP)
78-
using default_device = Kokkos::OpenMP;
78+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::OpenMP)
7979
#elif defined(KOKKOS_ENABLE_THREADS)
80-
using default_device = Kokkos::Threads;
80+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::Threads)
8181
#else
82-
using default_device = Kokkos::Serial;
82+
KK_IMPL_MAKE_TYPE_ALIAS(default_device, Kokkos::Serial)
8383
#endif
8484

85-
} // namespace KokkosKernels
85+
#undef KK_IMPL_MAKE_TYPE_ALIAS
8686

8787
#endif // KOKKOSKERNELS_DEFAULT_TYPES_H

0 commit comments

Comments
 (0)