Merge Pull Request #8114 from ZUUL42/Trilinos/cuda9c14

Automatically Merged using Trilinos Pull Request AutoTester PR Title: Framework/ifpack2/kokkos-kernels: Set standard to C++14 for CUDA 9.2 PR build PR Author: ZUUL42
trilinos · Sep 30, 2020 · b1ba3b5 · b1ba3b5
2 parents cee1a25 + f67907b
commit b1ba3b5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake
@@ -6,6 +6,8 @@
 
 # Usage: cmake -C PullRequestLinuxCUDA9.2TestingSettings.cmake
 
+set (CMAKE_CXX_STANDARD "14" CACHE STRING "Set C++ standard to C++14")
+
 # Misc options typically added by CI testing mode in TriBITS
 
 # Use the below option only when submitting to the dashboard

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestBlockTriDiContainerUtil.hpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestBlockTriDiContainerUtil.hpp
@@ -242,7 +242,7 @@ struct BlockTriDiContainerTester {
         T_bare->initialize();
         T_bare->compute(T_bare->createDefaultComputeParameters());
       }
-      auto apply = [&] (const Tpetra_MultiVector& B, Tpetra_MultiVector& X,
+      auto apply = [=] (const Tpetra_MultiVector& B, Tpetra_MultiVector& X,
                         const bool norm_based) -> int {
         if ( ! T_br.is_null()) {
           T_br->apply(B, X);

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestOverlappingRowMatrix.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestOverlappingRowMatrix.cpp
@@ -184,7 +184,7 @@ void localReducedMatvec(const MatrixClass & A_lcl,
         // NOTE: It looks like I should be able to get this data up above, but if I try to
         // we get internal compiler errors.  Who knew that gcc tried to "gimplify"?
         const LO numVectors = static_cast<LO>(X_lcl.extent(1));
-        Kokkos::parallel_for(Kokkos::TeamThreadRange (dev, 0, rows_per_team),[&] (const LO loop) {
+        Kokkos::parallel_for(Kokkos::TeamThreadRange (dev, 0, rows_per_team),[=] (const LO loop) {
             const LO lclRow = static_cast<LO> (dev.league_rank ()) * rows_per_team + loop;
 
             if (lclRow >= numLocalRows) {

diff --git a/packages/kokkos-kernels/src/batched/KokkosBatched_SetTriangular_Internal.hpp b/packages/kokkos-kernels/src/batched/KokkosBatched_SetTriangular_Internal.hpp
@@ -50,7 +50,7 @@ namespace KokkosBatched {
 	   const int jdist = j+ dist;
 	   Kokkos::parallel_for
 	     (Kokkos::ThreadVectorRange(member, m),
-	      [&](const int &i) {
+	      [=](const int &i) {
 		if (i >= jdist)
 		  A[i*as0+j*as1] = alpha;
 	      });

diff --git a/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorSolveUTV.hpp b/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorSolveUTV.hpp
@@ -74,7 +74,7 @@ namespace Test {
       } else {
 	Kokkos::parallel_for
 	  (Kokkos::TeamVectorRange(member, m*m),
-	   [&](const int &ij) {
+	   [=](const int &ij) {
             const int i = ij/m, j = ij%m;
             value_type tmp(0);
             for (int l=0;l<r;++l)

diff --git a/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorSolveUTV2.hpp b/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorSolveUTV2.hpp
@@ -75,7 +75,7 @@ namespace Test {
       } else {
 	Kokkos::parallel_for
 	  (Kokkos::TeamVectorRange(member, m*m),
-	   [&](const int &ij) {
+	   [=](const int &ij) {
             const int i = ij/m, j = ij%m;
             value_type tmp(0);
             for (int l=0;l<r;++l)

diff --git a/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorUTV.hpp b/packages/kokkos-kernels/unit_test/batched/Test_Batched_TeamVectorUTV.hpp
@@ -73,7 +73,7 @@ namespace Test {
       } else {
 	Kokkos::parallel_for
 	  (Kokkos::TeamVectorRange(member, m*m),
-	   [&](const int &ij) {
+	   [=](const int &ij) {
             const int i = ij/m, j = ij%m;
             value_type tmp(0);
             for (int l=0;l<r;++l)