From cc270446102203402e5ebb575d6ecd3c0315a409 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 12 Aug 2015 14:40:47 -0500
Subject: [PATCH] Improve inconsistent-args error msg in fusion

---
 loopy/fusion.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/loopy/fusion.py b/loopy/fusion.py
index c14d936af..21b6a7033 100644
--- a/loopy/fusion.py
+++ b/loopy/fusion.py
@@ -143,8 +143,12 @@ def _fuse_two_kernels(knla, knlb):
         else:
             if b_arg != knla.arg_dict[b_arg.name]:
                 raise LoopyError(
-                        "argument '%s' has inconsistent definition between "
-                        "the two kernels being merged" % b_arg.name)
+                        "argument '{arg_name}' has inconsistent definition between "
+                        "the two kernels being merged ({arg_a} <-> {arg_b})"
+                        .format(
+                            arg_name=b_arg.name,
+                            arg_a=str(knla.arg_dict[b_arg.name]),
+                            arg_b=str(b_arg)))
 
     # }}}
 
-- 
GitLab