Deal with @-signs of iname-duplicating reductions in more places.

loopy/kernel.py

@@ -260,7 +260,7 @@ class Instruction(Record):
         def map_reduction(expr, rec):
             rec(expr.expr)
             for iname in expr.inames:
-                result.add(iname)
+                result.add(iname.lstrip("@"))
 
         from loopy.symbolic import ReductionCallbackMapper
         cb_mapper = ReductionCallbackMapper(map_reduction)

loopy/symbolic.py

@@ -546,7 +546,7 @@ class IndexVariableFinder(CombineMapper):
         if self.include_reduction_inames:
             return result
         else:
-            return result - set(expr.inames)
+            return result - real_inames
 
 # }}}