Tpetra: fix compile error

trilinos · Jul 14, 2023 · 93c5176 · 93c5176
1 parent aecac39
commit 93c5176
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp
@@ -8560,8 +8560,6 @@ CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Node>::
          "input Kokkos::DualView was most recently modified on host, but TAFC "
          "needs the device view of the data to be the most recently modified.");
 
-
-
     Details::unpackAndCombineIntoCrsArrays_new(
                                    *this, 
                                    RemoteLIDs,
@@ -8574,7 +8572,6 @@ CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Node>::
                                    MyPID,
                                    CSR_rowptr,
                                    CSR_colind_GID,
-                                   //Teuchos::arcp_reinterpret_cast<impl_scalar_type>(CSR_vals),
                                    CSR_vals,
                                    SourcePids(),
                                    TargetPids);

diff --git a/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_decl.hpp b/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_decl.hpp
@@ -275,8 +275,7 @@ unpackAndCombineIntoCrsArrays_new (
     const int MyTargetPID,
     Teuchos::ArrayRCP<size_t>& CRS_rowptr,
     Teuchos::ArrayRCP<GlobalOrdinal>& CRS_colind,
-    Teuchos::ArrayRCP<typename CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Node>::impl_scalar_type>& CRS_vals,
-    //Teuchos::ArrayRCP<Scalar>& CRS_vals,
+    Teuchos::ArrayRCP<Scalar>& CRS_vals,
     const Teuchos::ArrayView<const int>& SourcePids,
     Teuchos::Array<int>& TargetPids);
 

diff --git a/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp b/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp
@@ -1633,7 +1633,7 @@ unpackAndCombineIntoCrsArrays_new (
     const int MyTargetPID,
     Teuchos::ArrayRCP<size_t>& CRS_rowptr,
     Teuchos::ArrayRCP<GlobalOrdinal>& CRS_colind,
-    Teuchos::ArrayRCP<typename CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Node>::impl_scalar_type>& CRS_vals,
+    Teuchos::ArrayRCP<Scalar>& CRS_vals,
     const Teuchos::ArrayView<const int>& SourcePids,
     Teuchos::Array<int>& TargetPids)
 {
@@ -1704,6 +1704,7 @@ unpackAndCombineIntoCrsArrays_new (
   CRS_rowptr.resize (TargetNumRows+1);
   CRS_colind.resize(TargetNumNonzeros);
   CRS_vals.resize(TargetNumNonzeros);
+  Teuchos::ArrayRCP<ST> const & CRS_vals_impl_scalar_type = Teuchos::arcp_reinterpret_cast<ST>(CRS_vals);
 # ifdef HAVE_TPETRA_MMM_TIMINGS
   tm = Teuchos::null;
 # endif
@@ -1743,12 +1744,11 @@ unpackAndCombineIntoCrsArrays_new (
   auto crs_colind_d =
     create_mirror_view_from_raw_host_array(outputDevice, CRS_colind.getRawPtr(),
         CRS_colind.size(), true, "crs_colidx");
-
 #ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE
   static_assert (! std::is_same<
       typename std::remove_const<
         typename std::decay<
-          decltype (CRS_vals)
+          decltype (CRS_vals_impl_scalar_type)
         >::type::value_type
       >::type,
       std::complex<double> >::value,
@@ -1757,8 +1757,8 @@ unpackAndCombineIntoCrsArrays_new (
 #endif // HAVE_TPETRA_INST_COMPLEX_DOUBLE
 
   auto crs_vals_d =
-    create_mirror_view_from_raw_host_array(outputDevice, CRS_vals.getRawPtr(),
-        CRS_vals.size(), true, "crs_vals");
+    create_mirror_view_from_raw_host_array(outputDevice, CRS_vals_impl_scalar_type.getRawPtr(),
+        CRS_vals_impl_scalar_type.size(), true, "crs_vals");
 
 #ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE
   static_assert (! std::is_same<
@@ -1844,7 +1844,7 @@ unpackAndCombineIntoCrsArrays_new (
   deep_copy(execution_space(), crs_colind_h, crs_colind_d);
 
   typename decltype(crs_vals_d)::HostMirror crs_vals_h(
-      CRS_vals.getRawPtr(), CRS_vals.size());
+      CRS_vals_impl_scalar_type.getRawPtr(), CRS_vals_impl_scalar_type.size());
   // DEEP_COPY REVIEW - DEVICE-TO-HOSTMIRROR
   deep_copy(execution_space(), crs_vals_h, crs_vals_d);
 
@@ -1918,7 +1918,7 @@ unpackAndCombineIntoCrsArrays_new (
     const int, \
     Teuchos::ArrayRCP<size_t>&, \
     Teuchos::ArrayRCP<GO>&, \
-    Teuchos::ArrayRCP<CrsMatrix<ST, LO, GO, NT>::impl_scalar_type>&, \
+    Teuchos::ArrayRCP<ST>&, \
     const Teuchos::ArrayView<const int>&, \
     Teuchos::Array<int>&);