From 20b1e1c0dc1efeca99dd94f72c7e09a0a31afae2 Mon Sep 17 00:00:00 2001
From: "[6~" <inform@tiker.net>
Date: Thu, 9 Apr 2020 13:34:46 -0500
Subject: [PATCH] Fix references to KernelState.SCHEDULED to minimize warning
avalanche
---
loopy/auto_test.py | 2 +-
loopy/codegen/__init__.py | 2 +-
loopy/kernel/__init__.py | 2 +-
loopy/kernel/tools.py | 6 +++---
loopy/schedule/__init__.py | 10 +++++-----
loopy/schedule/device_mapping.py | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/loopy/auto_test.py b/loopy/auto_test.py
index 6837b99a0..ca70c8489 100644
--- a/loopy/auto_test.py
+++ b/loopy/auto_test.py
@@ -534,7 +534,7 @@ def auto_test_vs_ref(
from loopy.target.pyopencl import PyOpenCLTarget
if test_knl.state not in [
KernelState.PREPROCESSED,
- KernelState.SCHEDULED]:
+ KernelState.LINEARIZED]:
if isinstance(test_knl.target, PyOpenCLTarget):
test_knl = test_knl.copy(target=PyOpenCLTarget(ctx.devices[0]))
diff --git a/loopy/codegen/__init__.py b/loopy/codegen/__init__.py
index 11f874e1b..b4811dc99 100644
--- a/loopy/codegen/__init__.py
+++ b/loopy/codegen/__init__.py
@@ -388,7 +388,7 @@ def generate_code_v2(kernel):
from loopy.schedule import get_one_scheduled_kernel
kernel = get_one_scheduled_kernel(kernel)
- if kernel.state != KernelState.SCHEDULED:
+ if kernel.state != KernelState.LINEARIZED:
raise LoopyError("cannot generate code for a kernel that has not been "
"scheduled")
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index c3cd1738d..2d926aad4 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -349,7 +349,7 @@ class LoopKernel(ImmutableRecordWithoutPickling):
if state not in [
KernelState.INITIAL,
KernelState.PREPROCESSED,
- KernelState.SCHEDULED,
+ KernelState.LINEARIZED,
]:
raise ValueError("invalid value for 'state'")
diff --git a/loopy/kernel/tools.py b/loopy/kernel/tools.py
index bb6ae44c9..9e54bc25d 100644
--- a/loopy/kernel/tools.py
+++ b/loopy/kernel/tools.py
@@ -1726,8 +1726,8 @@ def get_subkernels(kernel):
See also :class:`loopy.schedule.CallKernel`.
"""
from loopy.kernel import KernelState
- if kernel.state != KernelState.SCHEDULED:
- raise LoopyError("Kernel must be scheduled")
+ if kernel.state != KernelState.LINEARIZED:
+ raise LoopyError("Kernel must be linearized")
from loopy.schedule import CallKernel
@@ -1743,7 +1743,7 @@ def get_subkernel_to_insn_id_map(kernel):
kernel must be scheduled.
"""
from loopy.kernel import KernelState
- if kernel.state != KernelState.SCHEDULED:
+ if kernel.state != KernelState.LINEARIZED:
raise LoopyError("Kernel must be scheduled")
from loopy.schedule import (
diff --git a/loopy/schedule/__init__.py b/loopy/schedule/__init__.py
index 0983c5e0d..032cdc276 100644
--- a/loopy/schedule/__init__.py
+++ b/loopy/schedule/__init__.py
@@ -1841,7 +1841,7 @@ def generate_loop_schedules(kernel, debug_args={}):
def generate_loop_schedules_inner(kernel, debug_args={}):
from loopy.kernel import KernelState
- if kernel.state not in (KernelState.PREPROCESSED, KernelState.SCHEDULED):
+ if kernel.state not in (KernelState.PREPROCESSED, KernelState.LINEARIZED):
raise LoopyError("cannot schedule a kernel that has not been "
"preprocessed")
@@ -1852,7 +1852,7 @@ def generate_loop_schedules_inner(kernel, debug_args={}):
debug = ScheduleDebugger(**debug_args)
- preschedule = kernel.schedule if kernel.state == KernelState.SCHEDULED else ()
+ preschedule = kernel.schedule if kernel.state == KernelState.LINEARIZED else ()
prescheduled_inames = set(
insn.iname
@@ -1904,7 +1904,7 @@ def generate_loop_schedules_inner(kernel, debug_args={}):
unscheduled_insn_ids=set(insn.id for insn in kernel.instructions),
scheduled_insn_ids=frozenset(),
- within_subkernel=kernel.state != KernelState.SCHEDULED,
+ within_subkernel=kernel.state != KernelState.LINEARIZED,
may_schedule_global_barriers=True,
preschedule=preschedule,
@@ -1973,11 +1973,11 @@ def generate_loop_schedules_inner(kernel, debug_args={}):
new_kernel = kernel.copy(
schedule=gen_sched,
- state=KernelState.SCHEDULED)
+ state=KernelState.LINEARIZED)
from loopy.schedule.device_mapping import \
map_schedule_onto_host_or_device
- if kernel.state != KernelState.SCHEDULED:
+ if kernel.state != KernelState.LINEARIZED:
# Device mapper only gets run once.
new_kernel = map_schedule_onto_host_or_device(new_kernel)
diff --git a/loopy/schedule/device_mapping.py b/loopy/schedule/device_mapping.py
index 59afb07d2..d45c1ecbd 100644
--- a/loopy/schedule/device_mapping.py
+++ b/loopy/schedule/device_mapping.py
@@ -31,7 +31,7 @@ from loopy.schedule.tools import get_block_boundaries
def map_schedule_onto_host_or_device(kernel):
# FIXME: Should be idempotent.
from loopy.kernel import KernelState
- assert kernel.state == KernelState.SCHEDULED
+ assert kernel.state == KernelState.LINEARIZED
from functools import partial
device_prog_name_gen = partial(
--
GitLab