From 976ac6085093495cad2a9e5a3366d17b61c5551a Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Fri, 6 Feb 2015 11:31:21 -0600
Subject: [PATCH] Remove pyopencl dependency from top-level script and Fortran
translator
---
bin/loopy | 28 ++++------------------------
examples/fortran/run-floopy.sh | 2 +-
examples/fortran/run-loopy.sh | 2 +-
loopy/frontend/fortran/__init__.py | 2 +-
loopy/kernel/__init__.py | 1 -
5 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/bin/loopy b/bin/loopy
index 78e2b86d6..5eebe15ec 100644
--- a/bin/loopy
+++ b/bin/loopy
@@ -61,27 +61,9 @@ def main():
parser.add_argument("--print-ir", action="store_true")
args = parser.parse_args()
- # {{{ set up target
-
- if args.target is None:
- raise ValueError("must specify target")
-
- import re
- CL_TARGET_RE = re.compile(r"^cl:([0-9]+),([0-9]+)$")
-
- cl_target_re_match = CL_TARGET_RE.match(args.target)
- if cl_target_re_match is not None:
- platform_ordinal = int(cl_target_re_match.group(1))
- device_ordinal = int(cl_target_re_match.group(2))
-
- import pyopencl as cl
- plat = cl.get_platforms()[platform_ordinal]
- target = plat.get_devices()[device_ordinal]
- else:
- raise ValueError("target '%s' not understood"
- % args.target)
-
- # }}}
+ if args.target is not None:
+ from warnings import warn
+ warn("--target option is deprecated and ignored")
if args.infile == "-":
infile_content = sys.stdin.read()
@@ -109,7 +91,6 @@ def main():
data_dic = {}
data_dic["lp"] = lp
data_dic["np"] = np
- data_dic["lp_target"] = target
if args.occa_defines:
with open(args.occa_defines, "r") as defines_fd:
@@ -151,8 +132,7 @@ def main():
+ pre_transform_code)
from loopy.frontend.fortran import f2loopy
- kernels = f2loopy(target, infile_content,
- pre_transform_code=pre_transform_code)
+ kernels = f2loopy(infile_content, pre_transform_code=pre_transform_code)
if args.name is not None:
kernels = [kernel for kernel in kernels
diff --git a/examples/fortran/run-floopy.sh b/examples/fortran/run-floopy.sh
index 77c141d40..6a718bb69 100755
--- a/examples/fortran/run-floopy.sh
+++ b/examples/fortran/run-floopy.sh
@@ -3,4 +3,4 @@
NAME="$1"
shift
-python $(which loopy) --target=cl:0,0 --lang=floopy "$NAME" - "$@"
+python $(which loopy) --lang=floopy "$NAME" - "$@"
diff --git a/examples/fortran/run-loopy.sh b/examples/fortran/run-loopy.sh
index d4fb7c2a2..f22f78424 100755
--- a/examples/fortran/run-loopy.sh
+++ b/examples/fortran/run-loopy.sh
@@ -1,3 +1,3 @@
#! /bin/sh
-python $(which loopy) --target=cl:0,0 --lang=loopy "$NAME" - "$@"
+python $(which loopy) --lang=loopy "$NAME" - "$@"
diff --git a/loopy/frontend/fortran/__init__.py b/loopy/frontend/fortran/__init__.py
index f09c224d5..f169eeef5 100644
--- a/loopy/frontend/fortran/__init__.py
+++ b/loopy/frontend/fortran/__init__.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
"""
-def f2loopy(target, source, free_form=True, strict=True,
+def f2loopy(source, free_form=True, strict=True,
pre_transform_code=None):
from fparser import api
tree = api.parse(source, isfree=free_form, isstrict=strict,
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index 86ba2d7c2..7dd67bc42 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -148,7 +148,6 @@ class LoopKernel(RecordWithoutPickling):
A value from :class:`kernel_state`.
"""
-
# {{{ constructor
def __init__(self, domains, instructions, args=[], schedule=None,
--
GitLab