Style fixes

Exawind · Dec 21, 2022 · 00452bf · 00452bf
1 parent 22127c4
commit 00452bf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/src/Simulation.C b/src/Simulation.C
@@ -51,26 +51,25 @@ Simulation::Simulation(const YAML::Node& root_node)
   cudaDeviceGetLimit(&default_stack_size, cudaLimitStackSize);
   cudaDeviceSetLimit(cudaLimitStackSize, nalu_stack_size);
 #elif defined(KOKKOS_ENABLE_HIP)
-  hipError_t err = hipDeviceGetLimit(&default_stack_size, hipLimitMallocHeapSize);
-  if (err!=hipSuccess)
-  {
-	  /*
-		 This might be useful at some point so keeping it and commenting out.
-
-		 printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
-		 __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
-	  */
+  hipError_t err =
+    hipDeviceGetLimit(&default_stack_size, hipLimitMallocHeapSize);
+  if (err != hipSuccess) {
+    /*
+     This might be useful at some point so keeping it and commenting out.
+
+     printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
+     __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
+    */
   }
 
   err = hipDeviceSetLimit(hipLimitMallocHeapSize, nalu_stack_size);
-  if (err!=hipSuccess)
-  {
-	  /*
-		 This might be useful at some point so keeping it and commenting out.
-
-		 printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
-		 __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
-	  */
+  if (err != hipSuccess) {
+    /*
+     This might be useful at some point so keeping it and commenting out.
+
+     printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
+     __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
+    */
   }
 #endif
 }
@@ -84,15 +83,15 @@ Simulation::~Simulation()
 #if defined(KOKKOS_ENABLE_CUDA)
   cudaDeviceSetLimit(cudaLimitStackSize, default_stack_size);
 #elif defined(KOKKOS_ENABLE_HIP)
-  hipError_t err = hipDeviceSetLimit(hipLimitMallocHeapSize, default_stack_size);
-  if (err!=hipSuccess)
-  {
-	  /*
-		 This might be useful at some point so keeping it and commenting out.
-
-		 printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
-		 __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
-	  */
+  hipError_t err =
+    hipDeviceSetLimit(hipLimitMallocHeapSize, default_stack_size);
+  if (err != hipSuccess) {
+    /*
+     This might be useful at some point so keeping it and commenting out.
+
+     printf("%s %s %d : Failure %s in hipDeviceSetLimit\n",
+     __FILE__,__FUNCTION__,__LINE__,hipGetErrorString(err));
+    */
   }
 #endif
 }

diff --git a/unit_tests.C b/unit_tests.C
@@ -31,16 +31,15 @@ main(int argc, char** argv)
 #elif defined(KOKKOS_ENABLE_HIP)
   const size_t nalu_stack_size = 16384;
   hipError_t err = hipDeviceSetLimit(hipLimitMallocHeapSize, nalu_stack_size);
-  if (err!=hipSuccess)
-  {
-	  /*
-		 This might be useful at some point so keeping it and commenting out.
+  if (err != hipSuccess) {
+    /*
+     This might be useful at some point so keeping it and commenting out.
 
-		 sierra::nalu::NaluEnv::self().naluOutputP0()
-		 << __FILE__ << " " << __FUNCTION__ << " " << __LINE__
-		 << " : Failure " << hipGetErrorString(err) << " in hipDeviceSetLimit\n"
-		 << std::endl;
-	  */
+     sierra::nalu::NaluEnv::self().naluOutputP0()
+     << __FILE__ << " " << __FUNCTION__ << " " << __LINE__
+     << " : Failure " << hipGetErrorString(err) << " in hipDeviceSetLimit\n"
+     << std::endl;
+    */
   }
 #endif
   // Create a dummy nested scope to ensure destructors are called before

diff --git a/unit_tests/UnitTestBasicKokkos.C b/unit_tests/UnitTestBasicKokkos.C
@@ -159,7 +159,8 @@ run_nested_parallel_for_thread_teams_test()
   // host_view2D, and the deep_copy is a no-op. That means that the parallel_for
   // which comes next, is updating the values of host_view2D.
   Kokkos::parallel_for(
-    Kokkos::TeamPolicy<Kokkos::DefaultExecutionSpace>(N, NTHREADS_PER_DEVICE_TEAM),
+    Kokkos::TeamPolicy<Kokkos::DefaultExecutionSpace>(
+      N, NTHREADS_PER_DEVICE_TEAM),
     KOKKOS_LAMBDA(const TeamHandleType& team) {
       size_t i = team.league_rank();
       Kokkos::parallel_for(