Hotfixes psy2dawn

dawn/src/dawn/CodeGen/CodeGen.cpp

@@ -298,19 +298,19 @@ void CodeGen::generateStencilWrapperSyncMethod(Class& stencilWrapperClass) const
   syncStoragesMethod.commit();
 }
 
-std::string CodeGen::getStorageType(const ast::FieldDimensions& dimensions) {
+std::string CodeGen::getStorageType(const ast::FieldDimensions& dimensions, std::string prefix, std::string suffix) {
   DAWN_ASSERT_MSG(
       ast::dimension_isa<ast::CartesianFieldDimension>(dimensions.getHorizontalFieldDimension()),
       "Storage type requested for a non cartesian horizontal dimension");
   auto const& cartesianDimensions =
       dawn::ast::dimension_cast<dawn::ast::CartesianFieldDimension const&>(
           dimensions.getHorizontalFieldDimension());
 
-  std::string storageType = "storage_";
+  std::string storageType = prefix == "" ? "" : prefix + "_";
   storageType += cartesianDimensions.I() ? "i" : "";
   storageType += cartesianDimensions.J() ? "j" : "";
   storageType += dimensions.K() ? "k" : "";
-  storageType += "_t";
+  storageType += suffix;
   return storageType;
 }
 
@@ -338,10 +338,10 @@ void CodeGen::addTmpStorageDeclaration(
     Structure& stencilClass,
     IndexRange<const std::map<int, iir::Stencil::FieldInfo>>& tempFields) const {
   if(!(tempFields.empty())) {
-    stencilClass.addMember(tmpMetadataTypename_, tmpMetadataName_);
+    stencilClass.addMember("static " + tmpMetadataTypename_, tmpMetadataName_);
 
     for(const auto& field : tempFields) {
-      stencilClass.addMember(tmpStorageTypename_, "m_" + field.second.Name);
+      stencilClass.addMember("static " + tmpStorageTypename_, "m_" + field.second.Name);
     }
   }
 }
@@ -448,16 +448,16 @@ void CodeGen::generateGlobalIndices(const iir::Stencil& stencil, Structure& sten
                                     bool genCheckOffset) const {
   for(auto& stage : iterateIIROver<iir::Stage>(stencil)) {
     if(stage->getIterationSpace()[0].has_value()) {
-      stencilClass.addMember("std::array<int, 2>",
+      stencilClass.addMember("static std::array<int, 2>",
                              "stage" + std::to_string(stage->getStageID()) + "GlobalIIndices");
     }
     if(stage->getIterationSpace()[1].has_value()) {
-      stencilClass.addMember("std::array<int, 2>",
+      stencilClass.addMember("static std::array<int, 2>",
                              "stage" + std::to_string(stage->getStageID()) + "GlobalJIndices");
     }
   }
 
-  stencilClass.addMember("std::array<unsigned int, 2>", "globalOffsets");
+  stencilClass.addMember("static std::array<unsigned int, 2>", "globalOffsets");
   auto globalOffsetFunc =
       stencilClass.addMemberFunction("static std::array<unsigned int, 2>", "computeGlobalOffsets");
   globalOffsetFunc.addArg("int rank, const " + c_dgt + "domain& dom, int xcols, int ycols");

dawn/src/dawn/CodeGen/CodeGen.h

@@ -84,7 +84,7 @@ class CodeGen {
 
   static std::string getStorageType(const sir::Field& field);
   static std::string getStorageType(const iir::Stencil::FieldInfo& field);
-  static std::string getStorageType(const ast::FieldDimensions& dimensions);
+  static std::string getStorageType(const ast::FieldDimensions& dimensions, std::string prefix="storage", std::string suffix="_t");
 
   void generateBoundaryConditionFunctions(
       Class& stencilWrapperClass,

dawn/src/dawn/CodeGen/Cuda-ico/CudaIcoCodeGen.cpp

@@ -1704,7 +1704,8 @@ generateF90InterfaceSI(FortranInterfaceModuleGen& fimGen,
   runWrapper.addACCLine("host_data use_device( &");
   auto fieldArgs = getFieldArgs(/*includeSavedState*/ true);
   for(int i = 0; i < fieldArgs.size(); ++i) {
-    runWrapper.addACCLine(fortranIndent + fieldArgs[i] + (i == (fieldArgs.size() - 1) ? " &" : ", &"));
+    runWrapper.addACCLine(fortranIndent + fieldArgs[i] +
+                          (i == (fieldArgs.size() - 1) ? " &" : ", &"));
   }
   runWrapper.addACCLine(")");
   runWrapper.addBodyLine("#ifdef __DSL_VERIFY", /*withIndentation*/ false);
@@ -1722,7 +1723,7 @@ generateF90InterfaceSI(FortranInterfaceModuleGen& fimGen,
   for(auto fieldID : getUsedFields(stencil, {dawn::iir::Field::IntendKind::Output,
                                              dawn::iir::Field::IntendKind::InputOutput})) {
     verticalBoundNames.push_back(stencilInstantiation->getMetaData().getNameFromAccessID(fieldID) +
-                                  "_kvert_max");
+                                 "_kvert_max");
   }
 
   // memory management functions for production interface
@@ -1787,7 +1788,8 @@ generateF90InterfaceSI(FortranInterfaceModuleGen& fimGen,
     setupWrapper.addBodyLine(fortranIndent + verticalBoundNames[i] + ", &");
   }
 
-  setupWrapper.addBodyLine(fortranIndent + verticalBoundNames[verticalBoundNames.size() - 1] + " &");
+  setupWrapper.addBodyLine(fortranIndent + verticalBoundNames[verticalBoundNames.size() - 1] +
+                           " &");
 
   setupWrapper.addBodyLine(")");
 

dawn/src/dawn/CodeGen/Cuda/CodeGeneratorHelper.cpp

@@ -99,7 +99,50 @@ std::vector<std::string> CodeGeneratorHelper::generateStrideArguments(
       }
     }
   }
-  if(!tempFields.empty()) {
+  if(!tempFields.empty() && nonTempFields.empty()) {
+    const auto& firstTmpField = *(tempFields.begin());
+    std::string fieldName = metadata.getFieldNameFromAccessID(firstTmpField.second.getAccessID());
+    if(funArg == CodeGeneratorHelper::FunctionArgType::FT_Caller) {
+      strides.push_back("m_" + fieldName + ".strides()[3]," + "m_" + fieldName + ".strides()[4]," +  "m_" + fieldName + ".get_storage_info_ptr()->template begin<0>()," + "m_" +
+                        fieldName + ".get_storage_info_ptr()->template begin<1>()," + "m_" +
+                        fieldName + ".get_storage_info_ptr()->template stride<1>()," + "m_" +
+                        fieldName + ".get_storage_info_ptr()->template stride<4>()");
+    }
+
+    Array3i dims{-1, -1, -1};
+    for(const auto& fieldInfo : ms->getParent()->getFields()) {
+      if(fieldInfo.second.field.getAccessID() == firstTmpField.second.getAccessID()) {
+        DAWN_ASSERT_MSG(
+            dawn::ast::dimension_isa<dawn::ast::CartesianFieldDimension>(
+                fieldInfo.second.field.getFieldDimensions().getHorizontalFieldDimension()),
+            "Field has non cartesian horizontal dimension");
+        auto const& dimCartesian =
+            dawn::ast::dimension_cast<dawn::ast::CartesianFieldDimension const&>(
+                fieldInfo.second.field.getFieldDimensions().getHorizontalFieldDimension());
+        dims[0] = dimCartesian.I() == 1;
+        dims[1] = dimCartesian.J() == 1;
+        dims[2] = fieldInfo.second.field.getFieldDimensions().K() == 1;
+        break;
+      }
+    }
+
+    int usedDim = 0;
+    for(int i = 0; i < dims.size(); ++i) {
+      if(!dims[i])
+        continue;
+      if(!(usedDim++))
+        continue;
+      if(funArg == CodeGeneratorHelper::FunctionArgType::FT_Callee) {        
+        strides.push_back("const int stride_" + CodeGeneratorHelper::indexIteratorName(dims) + "_" +
+                          std::to_string(i));
+      }
+    }
+    if(funArg == CodeGeneratorHelper::FunctionArgType::FT_Callee) {        
+          strides.push_back("const int tmpBeginIIndex, const int tmpBeginJIndex, const int "
+                        "jstride_tmp, const int kstride_tmp");
+    }
+  }
+  else if(!tempFields.empty()) {
     const auto& firstTmpField = *(tempFields.begin());
     std::string fieldName = metadata.getFieldNameFromAccessID(firstTmpField.second.getAccessID());
     if(funArg == CodeGeneratorHelper::FunctionArgType::FT_Caller) {