From 1cf7bf976fc656bdfabfb409814cdd9c16e54f7e Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Fri, 28 Nov 2014 17:05:18 -0600
Subject: [PATCH] Add explicit data model version, to be used for cache keying
---
loopy/codegen/__init__.py | 8 ++++----
loopy/kernel/__init__.py | 1 +
loopy/preprocess.py | 4 ++--
loopy/schedule.py | 4 ++--
loopy/version.py | 2 ++
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/loopy/codegen/__init__.py b/loopy/codegen/__init__.py
index 9a7ef8c91..0f645c2dd 100644
--- a/loopy/codegen/__init__.py
+++ b/loopy/codegen/__init__.py
@@ -33,7 +33,7 @@ import numpy as np
from pytools.persistent_dict import PersistentDict
from loopy.tools import LoopyKeyBuilder
-from loopy.version import VERSION_TEXT
+from loopy.version import DATA_MODEL_VERSION
import logging
logger = logging.getLogger(__name__)
@@ -174,8 +174,8 @@ class CodeGenerationState(object):
c_code_mapper=None):
return CodeGenerationState(
implemented_domain=implemented_domain or self.implemented_domain,
- implemented_predicates=
- implemented_predicates or self.implemented_predicates,
+ implemented_predicates=(
+ implemented_predicates or self.implemented_predicates),
c_code_mapper=c_code_mapper or self.c_code_mapper)
def intersect(self, other):
@@ -331,7 +331,7 @@ class ImplementedDataInfo(Record):
# }}}
-code_gen_cache = PersistentDict("loopy-code-gen-cache-v2-"+VERSION_TEXT,
+code_gen_cache = PersistentDict("loopy-code-gen-cache-v3-"+DATA_MODEL_VERSION,
key_builder=LoopyKeyBuilder())
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index 7dd67bc42..86ba2d7c2 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -148,6 +148,7 @@ class LoopKernel(RecordWithoutPickling):
A value from :class:`kernel_state`.
"""
+
# {{{ constructor
def __init__(self, domains, instructions, args=[], schedule=None,
diff --git a/loopy/preprocess.py b/loopy/preprocess.py
index 44feb97e2..d4275ea6a 100644
--- a/loopy/preprocess.py
+++ b/loopy/preprocess.py
@@ -34,7 +34,7 @@ from loopy.diagnostic import (
from pytools.persistent_dict import PersistentDict
from loopy.tools import LoopyKeyBuilder
-from loopy.version import VERSION_TEXT
+from loopy.version import DATA_MODEL_VERSION
import logging
logger = logging.getLogger(__name__)
@@ -1071,7 +1071,7 @@ def adjust_local_temp_var_storage(kernel, device):
# }}}
-preprocess_cache = PersistentDict("loopy-preprocess-cache-v2-"+VERSION_TEXT,
+preprocess_cache = PersistentDict("loopy-preprocess-cache-v2-"+DATA_MODEL_VERSION,
key_builder=LoopyKeyBuilder())
diff --git a/loopy/schedule.py b/loopy/schedule.py
index ccf707a22..c1f1a4ed3 100644
--- a/loopy/schedule.py
+++ b/loopy/schedule.py
@@ -32,7 +32,7 @@ from loopy.diagnostic import LoopyError # noqa
from pytools.persistent_dict import PersistentDict
from loopy.tools import LoopyKeyBuilder
-from loopy.version import VERSION_TEXT
+from loopy.version import DATA_MODEL_VERSION
import logging
logger = logging.getLogger(__name__)
@@ -1108,7 +1108,7 @@ def generate_loop_schedules(kernel, debug_args={}):
# }}}
-schedule_cache = PersistentDict("loopy-schedule-cache-v3-"+VERSION_TEXT,
+schedule_cache = PersistentDict("loopy-schedule-cache-v4-"+DATA_MODEL_VERSION,
key_builder=LoopyKeyBuilder())
diff --git a/loopy/version.py b/loopy/version.py
index 0934e945e..7c0f75c3d 100644
--- a/loopy/version.py
+++ b/loopy/version.py
@@ -24,3 +24,5 @@ THE SOFTWARE.
VERSION = (2014, 1)
VERSION_STATUS = ""
VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS
+
+DATA_MODEL_VERSION = "v1"
--
GitLab