Merge pull request #31 from SCOREC/minimal-Clang-Error

Fixed clang compiler error
SCOREC · Feb 14, 2024 · 862efbd · 862efbd
2 parents 8f507ae + c5f5722
commit 862efbd
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 64 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        compiler: [g++]
+        compiler: [g++,clang++]
         language: ['cpp']
         build_type: [Debug, Release]
     # Permissions needed for codeql analysis 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,9 +49,6 @@ target_link_libraries(Main PRIVATE meshFields)
 add_executable(KokkosTests test/testKokkos.cpp)
 target_link_libraries(KokkosTests PRIVATE meshFields)
 
-add_executable(ClangTests test/testClangMinimal.cpp)
-target_link_libraries(ClangTests PRIVATE meshFields)
-
 add_executable(CabanaTests test/testCabana.cpp)
 target_link_libraries(CabanaTests PRIVATE meshFields)
 
@@ -60,7 +57,6 @@ target_link_libraries(LogicTests PRIVATE meshFields)
 
 add_test(MainTests ./Main)
 add_test(KokkosTests ./KokkosTests)
-add_test(ClangTests ./ClangTests)
 add_test(CabanaTests ./CabanaTests)
 add_test(logicTests ./LogicTests)
 

diff --git a/src/KokkosController.hpp b/src/KokkosController.hpp
@@ -14,6 +14,7 @@
 #include "MeshField_Utility.hpp"
 #include "MeshField_Macros.hpp"
 
+
 namespace Controller {
 
 template <class SliceType, class T>
@@ -83,8 +84,7 @@ class KokkosController {
 
   template<typename... Tx>
   auto construct( std::vector<int> &dims ) {
-    // Note: the '...' expansion will traverse <Tx...> backwards!
-    return std::make_tuple( create_view<Tx>("view", dims)... );
+    return std::tuple<Kokkos::View<Tx>...>{create_view<Tx>("view", dims)...};
   }
 
   template<typename Tx>
@@ -99,29 +99,29 @@ class KokkosController {
     Kokkos::View<Tx,MemorySpace> rt;
     switch( dynamic ) {
       case 1:
-        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[dims.size()-1] );
+        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[0] );
         break;
       case 2:
-        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[dims.size()-2],
-                                               dims[dims.size()-1] );
+        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[0],
+                                               dims[1] );
         break;
       case 3:
-        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[dims.size()-3],
-                                               dims[dims.size()-2],
-                                               dims[dims.size()-1]);
+        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[0],
+                                               dims[1],
+                                               dims[2]);
         break;
       case 4:
-        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[dims.size()-4],
-                                               dims[dims.size()-3],
-                                               dims[dims.size()-2],
-                                               dims[dims.size()-1]);
+        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[0],
+                                               dims[1],
+                                               dims[2],
+                                               dims[3]);
         break;
       case 5:
-        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[dims.size()-5],
-                                               dims[dims.size()-4],
-                                               dims[dims.size()-3],
-                                               dims[dims.size()-2],
-                                               dims[dims.size()-1]);
+        rt = Kokkos::View<Tx,MemorySpace>(tag, dims[0],
+                                               dims[1],
+                                               dims[2],
+                                               dims[3],
+                                               dims[4]);
         break;
       default:
         rt = Kokkos::View<Tx,MemorySpace>(tag);
@@ -130,10 +130,10 @@ class KokkosController {
 
     // Places all of the dyanmic ranks into the extent_sizes
     for( int i = 0; i < dynamic; i++ ) {
-      this->extent_sizes[theta][i] = dims[dims.size()-dynamic+i];
+      this->extent_sizes[theta][i] = dims[i];
     }
-    this->theta-=1;
-    dims.erase( dims.end()-dynamic, dims.end());
+    this->theta+=1;
+    dims.erase( dims.begin(), dims.begin()+dynamic );
     return rt;
   }
 
@@ -183,7 +183,7 @@ class KokkosController {
   // member vaiables
   const int num_types = sizeof...(Ts);
   unsigned short delta = 0;
-  unsigned short theta = num_types-1; 
+  unsigned short theta = 0; 
   int extent_sizes[sizeof...(Ts)][5];
   std::tuple<Kokkos::View<Ts,MemorySpace>...> values_;
 

diff --git a/test/testClangMinimal.cpp b/test/testClangMinimal.cpp
diff --git a/test/testMain.cpp b/test/testMain.cpp
@@ -175,9 +175,30 @@ void testSetField() {
   printf("== END testSetField ==\n");
 }
 
+void testSetCorrect() {
+
+  printf("== START testSetCorrect ==\n");
+
+  const int N = 10;
+
+  using kok1 = Controller::KokkosController<MemorySpace,ExecutionSpace, int**, int***,int****, int*****>;
+  kok1 c1({N,1,
+            N,N,N,
+            N,N,15,N,
+            N,N,N,N,6});
+
+  // Checking that sizes are loaded correctly
+  assert(c1.size(0,1) == 1);
+  assert(c1.size(2,2) == 15);
+  assert(c1.size(3,4) == 6);
+
+  printf("== END testSetCorrect ==\n");
+}
+
 int main(int argc, char *argv[]) {
   Kokkos::ScopeGuard scope_guard(argc, argv);
   testParallelScan();
   testSetField();
+  testSetCorrect();
   return 0;
 }