batched/eti: ETI host-level interfaces

CMakeLists.txt

@@ -308,7 +308,6 @@ ELSE()
   # This doesn't change pre-existing behavior before the ETI changes
   #LIST(APPEND HEADERS ${ETI_HEADERS})
   #-----------------------------------------------------------------------------
-
   KOKKOSKERNELS_ADD_LIBRARY(
     kokkoskernels
     HEADERS ${HEADERS}

batched/CMakeLists.txt

@@ -19,3 +19,53 @@ ENDIF()
 # Adding unit-tests
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/batched)
 KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/batched)
+
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_nt_nt_bll Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_nt_t_bll Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_t_nt_bll Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_t_t_bll Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_nt_nt_blr Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_nt_t_blr Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_t_nt_blr Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)
+KOKKOSKERNELS_GENERATE_ETI(Batched_Gemm_t_t_blr Gemm
+  COMPONENTS  batched
+  HEADER_LIST ETI_HEADERS
+  SOURCE_LIST SOURCES
+  TYPE_LISTS  FLOATS LAYOUTS DEVICES
+)

batched/dense/unit_test/Test_Batched_BatchedGemm.hpp

@@ -290,11 +290,13 @@ void impl_test_batched_gemm(const int N, const int matAdim1, const int matAdim2,
             ViewType a_actual("a_actual", N, matAdim1, matAdim2);
             ViewType b_actual("b_actual", N, matBdim1, matBdim2);
             ViewType c_actual("c_actual", N, matCdim1, matCdim2);
-            using ta = typename ParamTagType::transA;
-            using tb = typename ParamTagType::transB;
-            using bl = typename ParamTagType::batchLayout;
-            BatchedGemm<ta, tb, bl>(&batchedGemmHandle, 0.34, a_actual,
-                                    b_actual, 0.43, c_actual);
+            using ta         = typename ParamTagType::transA;
+            using tb         = typename ParamTagType::transB;
+            using bl         = typename ParamTagType::batchLayout;
+            ScalarType alpha = 0.34;
+            ScalarType beta  = 0.43;
+            BatchedGemm<ta, tb, bl>(&batchedGemmHandle, alpha, a_actual,
+                                    b_actual, beta, c_actual);
             std::string fmsg = kk_failure_str(__FILE__, __FUNCTION__, __LINE__);
             FAIL() << fmsg;
           } catch (const std::runtime_error& error) {

batched/dense/unit_test/Test_Batched_BatchedGemm_Real.hpp

@@ -13,7 +13,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //@HEADER
-#if defined(KOKKOS_BHALF_T_IS_FLOAT)
+
+// We do not ETI half-types. Only test this if ETI ONLY is off
+// and bhalf_t is not an alias to float.
+#if !defined(KOKKOSKERNELS_ETI_ONLY) &&             \
+    !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) && \
+    defined(KOKKOS_BHALF_T_IS_FLOAT) && !KOKKOS_BHALF_T_IS_FLOAT
 /********************* BatchLayout::Left *********************/
 TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_bhalf_bhalf_left) {
   typedef ::Test::SharedParamTag<Trans::NoTranspose, Trans::NoTranspose,
@@ -98,7 +103,11 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_bhalf_bhalf_right) {
 }
 #endif  // KOKKOS_BHALF_T_IS_FLOAT
 
-#if defined(KOKKOS_HALF_T_IS_FLOAT)
+// We do not ETI half-types. Only test this if ETI ONLY is off
+// and half_t is not an alias to float.
+#if !defined(KOKKOSKERNELS_ETI_ONLY) &&             \
+    !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) && \
+    defined(KOKKOS_HALF_T_IS_FLOAT) && !KOKKOS_HALF_T_IS_FLOAT
 /********************* BatchLayout::Left *********************/
 TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_half_half_left) {
   typedef ::Test::SharedParamTag<Trans::NoTranspose, Trans::NoTranspose,

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_nt_nt_bll_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_NT_NT_BLL_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_nt_nt_blr_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_NT_NT_BLR_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_nt_t_bll_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_NT_T_BLL_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_nt_t_blr_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_NT_T_BLR_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_t_nt_bll_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_T_NT_BLL_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_t_nt_blr_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_T_NT_BLR_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_t_t_bll_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_T_T_BLL_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

batched/eti/generated_specializations_cpp/Gemm/KokkosBatched_Gemm_t_t_blr_eti_spec_inst.cpp.in

@@ -0,0 +1,23 @@
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 4.0
+//       Copyright (2022) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
+// See https://kokkos.org/LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//@HEADER
+#define KOKKOSKERNELS_IMPL_COMPILE_LIBRARY true
+#include "KokkosBatched_Gemm_Decl.hpp"
+namespace KokkosBatched {
+namespace Impl {
+using KokkosBlas::Trans;
+@BATCHED_GEMM_T_T_BLR_ETI_INST_BLOCK@
+}  // namespace Impl
+}  // namespace KokkosBatched

graph/impl/KokkosGraph_Distance2MIS_impl.hpp

@@ -829,6 +829,7 @@ struct D2_MIS_FixedPriority {
                          InitWorklistFunctor(worklist1));
     lno_t workRemain = numVerts;
     int numIter      = 0;
+    (void)numIter;
     while (workRemain) {
       // do another iteration
       Kokkos::parallel_for(