From ddc4f94dea2184a5b4d7a79e40c78af68ed30a6c Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 29 Jun 2014 19:38:48 -0500
Subject: [PATCH] Don't overwrite array orders with default order
---
loopy/kernel/array.py | 2 +-
loopy/kernel/creation.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/loopy/kernel/array.py b/loopy/kernel/array.py
index 45360a926..c362043ca 100644
--- a/loopy/kernel/array.py
+++ b/loopy/kernel/array.py
@@ -30,7 +30,7 @@ from pytools import Record, memoize_method
import pyopencl as cl # noqa
import pyopencl.array # noqa
-import numpy as np
+import numpy as np # noqa
from loopy.diagnostic import LoopyError
from loopy.tools import is_integer
diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py
index c9909c280..54e240283 100644
--- a/loopy/kernel/creation.py
+++ b/loopy/kernel/creation.py
@@ -924,7 +924,7 @@ def apply_default_order_to_args(kernel, default_order):
processed_args = []
for arg in kernel.args:
- if isinstance(arg, ArrayBase):
+ if isinstance(arg, ArrayBase) and arg.order is None:
arg = arg.copy(order=default_order)
processed_args.append(arg)
--
GitLab