Bug fix on new time iterator feature.

cea-hpc · Sep 16, 2020 · 98ad161 · 98ad161
1 parent a5b9bd5
commit 98ad161
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 20 deletions.
diff --git a/plugins/fr.cea.nabla.ir/src/fr/cea/nabla/ir/generator/java/JobContentProvider.xtend b/plugins/fr.cea.nabla.ir/src/fr/cea/nabla/ir/generator/java/JobContentProvider.xtend
@@ -13,7 +13,6 @@ import fr.cea.nabla.ir.ir.InstructionJob
 import fr.cea.nabla.ir.ir.IrModule
 import fr.cea.nabla.ir.ir.Job
 import fr.cea.nabla.ir.ir.TimeLoop
-import fr.cea.nabla.ir.ir.TimeLoopContainer
 import fr.cea.nabla.ir.ir.TimeLoopCopyJob
 import fr.cea.nabla.ir.ir.TimeLoopJob
 
@@ -108,12 +107,9 @@ class JobContentProvider
 		}
 	}
 
-	private static def String getIndentation(TimeLoopContainer it)
+	private static def String getIndentation(TimeLoop it)
 	{
-		switch it
-		{
-			IrModule: ''
-			TimeLoop: getIndentation(container) + '\t'
-		}
+		if (container instanceof IrModule) ''
+		else getIndentation(container as TimeLoop) + '\t'
 	}
 }
diff --git a/plugins/fr.cea.nabla.ir/src/fr/cea/nabla/ir/interpreter/JobInterpreter.xtend b/plugins/fr.cea.nabla.ir/src/fr/cea/nabla/ir/interpreter/JobInterpreter.xtend
@@ -14,7 +14,6 @@ import fr.cea.nabla.ir.ir.InstructionJob
 import fr.cea.nabla.ir.ir.IrModule
 import fr.cea.nabla.ir.ir.Job
 import fr.cea.nabla.ir.ir.TimeLoop
-import fr.cea.nabla.ir.ir.TimeLoopContainer
 import fr.cea.nabla.ir.ir.TimeLoopCopyJob
 import fr.cea.nabla.ir.ir.TimeLoopJob
 import fr.cea.nabla.javalib.mesh.PvdFileWriter2D
@@ -164,12 +163,9 @@ class JobInterpreter
 		}
 	}
 
-	private static def String getIndentation(TimeLoopContainer it)
+	private static def String getIndentation(TimeLoop it)
 	{
-		switch it
-		{
-			IrModule: ''
-			TimeLoop: getIndentation(container) + '\t'
-		}
+		if (container instanceof IrModule) ''
+		else getIndentation(container as TimeLoop) + '\t\t'
 	}
 }
diff --git a/...amples/NablaExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc b/...amples/NablaExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc
@@ -562,7 +562,7 @@ void ImplicitHeatEquation::simulate()
 	executeTimeLoopN();
 
 	std::cout << __YELLOW__ << "\n\tDone ! Took " << __MAGENTA__ << __BOLD__ << globalTimer.print() << __RESET__ << std::endl;
-	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / n << std::endl;
+	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / cg_info.m_nb_call << std::endl;
 }
 
 /******************** Module definition ********************/

diff --git a/...ui/examples/NablaExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc b/...ui/examples/NablaExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc
@@ -464,7 +464,7 @@ void ImplicitHeatEquation::simulate()
 	executeTimeLoopN(); // @4.0
 
 	std::cout << __YELLOW__ << "\n\tDone ! Took " << __MAGENTA__ << __BOLD__ << globalTimer.print() << __RESET__ << std::endl;
-	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / n << std::endl;
+	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / cg_info.m_nb_call << std::endl;
 }
 
 /******************** Module definition ********************/

diff --git a/...ui/examples/NablaExamples/src-gen-cpp/openmp/implicitheatequation/ImplicitHeatEquation.cc b/...ui/examples/NablaExamples/src-gen-cpp/openmp/implicitheatequation/ImplicitHeatEquation.cc
@@ -454,7 +454,7 @@ void ImplicitHeatEquation::simulate()
 	executeTimeLoopN(); // @4.0
 
 	std::cout << __YELLOW__ << "\n\tDone ! Took " << __MAGENTA__ << __BOLD__ << globalTimer.print() << __RESET__ << std::endl;
-	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / n << std::endl;
+	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / cg_info.m_nb_call << std::endl;
 }
 
 /******************** Module definition ********************/

diff --git a/...xamples/NablaExamples/src-gen-cpp/sequential/implicitheatequation/ImplicitHeatEquation.cc b/...xamples/NablaExamples/src-gen-cpp/sequential/implicitheatequation/ImplicitHeatEquation.cc
@@ -446,7 +446,7 @@ void ImplicitHeatEquation::simulate()
 	executeTimeLoopN(); // @4.0
 
 	std::cout << __YELLOW__ << "\n\tDone ! Took " << __MAGENTA__ << __BOLD__ << globalTimer.print() << __RESET__ << std::endl;
-	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / n << std::endl;
+	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / cg_info.m_nb_call << std::endl;
 }
 
 /******************** Module definition ********************/

diff --git a/...xamples/NablaExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc b/...xamples/NablaExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc
@@ -447,7 +447,7 @@ void ImplicitHeatEquation::simulate()
 	executeTimeLoopN(); // @4.0
 
 	std::cout << __YELLOW__ << "\n\tDone ! Took " << __MAGENTA__ << __BOLD__ << globalTimer.print() << __RESET__ << std::endl;
-	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / n << std::endl;
+	std::cout << "[CG] average iteration: " << cg_info.m_nb_it / cg_info.m_nb_call << std::endl;
 }
 
 /******************** Module definition ********************/

diff --git a/plugins/fr.cea.nabla/src/fr/cea/nabla/scoping/NablaScopeProvider.xtend b/plugins/fr.cea.nabla/src/fr/cea/nabla/scoping/NablaScopeProvider.xtend
@@ -189,7 +189,7 @@ class NablaScopeProvider extends AbstractDeclarativeScopeProvider
 				val iterators = module.iteration.eAllContents.filter(TimeIterator).toList
 				val iteratorsAndVars = new ArrayList<ArgOrVar>
 				iteratorsAndVars += module.allVars
-				iteratorsAndVars += iterators
+				iteratorsAndVars += subList(iterators, context)
 				iteratorsAndVars += context
 				Scopes::scopeFor(iteratorsAndVars)
 			}