Merge pull request #330 from josharian/version-in-compiledir

doc/library/config.txt

@@ -288,16 +288,28 @@ import theano and print the config variable, as in:
     Default: On Windows: $LOCALAPPDATA\\Theano if $LOCALAPPDATA is defined,
     otherwise and on other systems: ~/.theano.
 
-    This directory stores the architecture-dependent compilation directories.
+    This directory stores the platform-dependent compilation directories.
+
+    This flag's value cannot be modified during the program execution.
+
+.. attribute:: compiledir_format
+
+    Default: "compiledir_%(platform)s-%(processor)s-%(python_version)s"
+
+    This is a Python format string that specifies the subdirectory
+    of ``config.base_compiledir`` in which to store platform-dependent
+    compiled modules. To see a list of all available substitution keys,
+    run ``python -c "import theano; print theano.config"``, and look
+    for compiledir_format.
 
     This flag's value cannot be modified during the program execution.
 
 .. attribute:: compiledir
 
-    Default: ``config.base_compiledir``/<arch-identifier>
+    Default: ``config.base_compiledir``/``config.compiledir_format``
 
     This directory stores dynamically-compiled modules for a particular
-    architecture.
+    platform.
 
     This flag's value cannot be modified during the program execution.
 

theano/configparser.py

@@ -60,8 +60,16 @@ def config_files_from_theanorc():
         rval.append(os.path.expanduser('~/.theanorc.txt'))
     return rval
 
-theano_cfg = ConfigParser.SafeConfigParser({'USER':os.getenv("USER", os.path.split(os.path.expanduser('~'))[-1])})
-theano_cfg.read(config_files_from_theanorc())
+
+config_files = config_files_from_theanorc()
+theano_cfg = ConfigParser.SafeConfigParser({'USER': os.getenv("USER", os.path.split(os.path.expanduser('~'))[-1])})
+theano_cfg.read(config_files)
+# Having a raw version of the config around as well enables us to pass
+# through config values that contain format strings.
+# The time required to parse the config twice is negligible.
+theano_raw_cfg = ConfigParser.RawConfigParser()
+theano_raw_cfg.read(config_files)
+
 
 def fetch_val_for_key(key):
     """Return the overriding config value for a key.
@@ -92,7 +100,10 @@ def fetch_val_for_key(key):
     else:
         section, option = 'global', key
     try:
-        return theano_cfg.get(section, option)
+        try:
+            return theano_cfg.get(section, option)
+        except ConfigParser.InterpolationError:
+            return theano_raw_cfg.get(section, option)
     except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
         raise KeyError(key)
 

theano/gof/compiledir.py

@@ -4,19 +4,32 @@ import os
 import platform
 import re
 import sys
+import textwrap
 
 import theano
 from theano.configparser import config, AddConfigVar, ConfigParam, StrParam
 
+compiledir_format_dict = {"platform": platform.platform(),
+                          "processor": platform.processor(),
+                          "python_version": platform.python_version(),
+                          "theano_version": theano.__version__,
+                         }
+compiledir_format_keys = ", ".join(compiledir_format_dict.keys())
+default_compiledir_format = "compiledir_%(platform)s-%(processor)s-%(python_version)s"
+
+AddConfigVar("compiledir_format",
+             textwrap.fill(textwrap.dedent("""\
+                 Format string for platform-dependent compiled
+                 module subdirectory (relative to base_compiledir).
+                 Available keys: %s. Defaults to %r.
+             """ % (compiledir_format_keys, default_compiledir_format))),
+             StrParam(default_compiledir_format, allow_override=False))
+
 
 def default_compiledirname():
-    platform_id = '-'.join([
-        platform.platform(),
-        platform.processor(),
-        platform.python_version(),
-        theano.__version__])
-    platform_id = re.sub("[\(\)\s,]+", "_", platform_id)
-    return 'compiledir_' + platform_id
+    formatted = config.compiledir_format % compiledir_format_dict
+    safe = re.sub("[\(\)\s,]+", "_", formatted)
+    return safe
 
 
 def filter_compiledir(path):
@@ -78,12 +91,11 @@ else:
 
 
 AddConfigVar('base_compiledir',
-        "arch-independent cache directory for compiled modules",
+        "platform-independent root directory for compiled modules",
         StrParam(default_base_compiledir, allow_override=False))
 
-
 AddConfigVar('compiledir',
-        "arch-dependent cache directory for compiled modules",
+        "platform-dependent cache directory for compiled modules",
         ConfigParam(
             os.path.join(
                 os.path.expanduser(config.base_compiledir),