Fix AA access pattern for some of the examples.

darthez · Dec 24, 2013 · 34634ea · 34634ea
1 parent 8d9b353
commit 34634ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/examples/entropic_utils.mako b/examples/entropic_utils.mako
@@ -3,7 +3,9 @@
 ${kernel} void ComputeEntropy(
 	${global_ptr} ${const_ptr} int *__restrict__ map,
 	${global_ptr} float *dist,
-	${global_ptr} float *entropy)
+	${global_ptr} float *entropy
+	${iteration_number_if_required()}
+)
 {
 	${local_indices()}
 	${load_node_type()}

diff --git a/examples/ldc_2d_entropic.py b/examples/ldc_2d_entropic.py
@@ -32,10 +32,10 @@ def get_aux_kernels(self, runner):
 
         ce1 = runner.get_kernel('ComputeEntropy',
                                 [gpu_map, gpu_dist1b, gpu_entropy],
-                                'PPP')
+                                'PPP', needs_iteration=True)
         ce2 = runner.get_kernel('ComputeEntropy',
                                 [gpu_map, gpu_dist1a, gpu_entropy],
-                                'PPP')
+                                'PPP', needs_iteration=True)
         return KernelPair([ce1], [ce2])
 
 

diff --git a/sailfish/templates/boundary.mako b/sailfish/templates/boundary.mako
@@ -475,6 +475,11 @@ ${device_func} inline void fixMissingDistributions(
 				%endfor
 			}
 		%endif
+	## access_pattern == AA
+	%else:
+		%if nt.NTYuOutflow in node_types or nt.NTGradFreeflow in node_types or nt.NTCopy in node_types:
+			#error NTYuOutflow, NTGradFreeflow and NTCopy are not supported with the AA access_pattern.
+		%endif
 	%endif
 
 	%if nt.NTWallTMS in node_types: