Removed the config.home option

doc/library/config.txt

@@ -273,23 +273,10 @@ import theano and print the config variable, as in:
 
     This flag's value cannot be modified during the program execution.
 
-.. attribute:: home
-
-    Default: On Linux: $HOME/.theano. On Windows: $LOCALAPPDATA\\Theano
-
-    This is the base directory where all Theano files are stored. Currently,
-    the only files being stored are compiled C modules, and thus changing ``home``
-    is similar to changing ``base_compiledir`` (described below).
-    Note however that ``home`` used to have a different meaning in previous
-    versions of Theano (up to 0.4.1), and to make sure its new meaning is
-    understood, it is currently forbidden to change ``home`` without also
-    changing either ``base_compiledir`` or ``compiledir``.
-
-    This flag's value cannot be modified during the program execution.
-
 .. attribute:: base_compiledir
 
-    Default: ``config.home``
+    Default: On Windows: $LOCALAPPDATA\\Theano if $LOCALAPPDATA is defined,
+    otherwise and on other systems: ~/.theano.
 
     This directory stores the architecture-dependent compilation directories.
 

theano/configdefaults.py

@@ -3,7 +3,10 @@ import logging
 import subprocess
 import sys
 
-from theano.configparser import TheanoConfigParser, AddConfigVar, EnumStr, StrParam, IntParam, FloatParam, BoolParam
+from theano.configparser import (
+        AddConfigVar, BoolParam, ConfigParam, EnumStr, IntParam, FloatParam,
+        StrParam, TheanoConfigParser)
+
 
 _logger = logging.getLogger('theano.configdefaults')
 
@@ -119,37 +122,38 @@ AddConfigVar('on_opt_error',
         EnumStr('warn', 'raise'),
         in_c_key=False)
 
-def get_home_dir():
-    home = os.getenv('HOME')
-    if home is None:
-        # This expanduser usually works on Windows (see discussion on
-        # theano-users, July 13 2010).
-        home = os.path.expanduser('~')
-        if home == '~':
-            # This might happen when expanduser fails. Although the cause of
-            # failure is a mystery, it has been seen on some Windows system.
-            home = os.getenv('USERPROFILE')
-    assert home is not None
-    return home
-
-# On Windows we should avoid writing temporary files to a directory that is
-# part of the roaming part of the user profile. Instead we use the local part
-# of the user profile, when available.
-if sys.platform == 'win32' and os.getenv('LOCALAPPDATA') is not None:
-    default_home = os.path.join(os.getenv('LOCALAPPDATA'), 'Theano')
-else:
-    default_home = os.path.join(get_home_dir(), '.theano')
+
+def safe_no_home(home):
+    """
+    Make sure the user is not attempting to use `config.home`.
+
+    This config option was removed in Thenao 0.5 since it was redundant with
+    `config.base_compiledir`. This filter function ensures people who were
+    setting the location of their compilation directory through `config.home`
+    switch to `config.basecompiledir` instead, by raising an error when
+    `config.home` is used.
+    """
+    if home:
+        raise RuntimeError(
+                'The `config.home` option has been removed and should not be '
+                'used anymore. Please set the `config.base_compiledir` option '
+                'instead (for instance to: %s)' %
+                os.path.join(home, '.theano'))
+    return True
+
 
 AddConfigVar('home',
-        "Home directory for Theano files",
-        StrParam(default_home, allow_override=False),
+        "This config option was removed in 0.5: do not use it!",
+        ConfigParam('', allow_override=False, filter=safe_no_home),
         in_c_key=False)
 
+
 AddConfigVar('nocleanup',
         "Suppress the deletion of code files that did not compile cleanly",
         BoolParam(False),
         in_c_key=False)
 
+
 # This flag is used when we import Theano to initialize global variables.
 # So changing it after import will not modify these global variables.
 # This could be done differently... but for now we simply prevent it from being

theano/gof/compiledir.py

@@ -4,7 +4,6 @@ import os
 import platform
 import re
 import sys
-import warnings
 
 import theano
 from theano.configparser import config, AddConfigVar, ConfigParam, StrParam
@@ -51,47 +50,47 @@ def filter_compiledir(path):
     return path
 
 
+def get_home_dir():
+    """
+    Return location of the user's home directory.
+    """
+    home = os.getenv('HOME')
+    if home is None:
+        # This expanduser usually works on Windows (see discussion on
+        # theano-users, July 13 2010).
+        home = os.path.expanduser('~')
+        if home == '~':
+            # This might happen when expanduser fails. Although the cause of
+            # failure is a mystery, it has been seen on some Windows system.
+            home = os.getenv('USERPROFILE')
+    assert home is not None
+    return home
+
+
+# On Windows we should avoid writing temporary files to a directory that is
+# part of the roaming part of the user profile. Instead we use the local part
+# of the user profile, when available.
+if sys.platform == 'win32' and os.getenv('LOCALAPPDATA') is not None:
+    default_base_compiledir = os.path.join(os.getenv('LOCALAPPDATA'), 'Theano')
+else:
+    default_base_compiledir = os.path.join(get_home_dir(), '.theano')
+
+
 AddConfigVar('base_compiledir',
         "arch-independent cache directory for compiled modules",
-        StrParam(config.home, allow_override=False))
+        StrParam(default_base_compiledir, allow_override=False))
 
-default_compiledir = os.path.join(
-        os.path.expanduser(config.base_compiledir),
-        default_compiledirname())
 
 AddConfigVar('compiledir',
         "arch-dependent cache directory for compiled modules",
-        ConfigParam(default_compiledir,
+        ConfigParam(
+            os.path.join(
+                os.path.expanduser(config.base_compiledir),
+                default_compiledirname()),
             filter=filter_compiledir,
             allow_override=False))
 
 
-# The role of `config.home` was changed compared to Theano 0.4.1. It used to
-# be the location of the user home directory. Now, it directly points to the
-# directory where Theano should save its own data files. Typically, the
-# difference is that it now includes the '.theano' folder, while it used to be
-# the parent of that folder. In order for this change to be safe, we currently
-# prevent people from changing `config.home` unless they also change
-# the compilation directory.
-if (config.home != theano.configdefaults.default_home and
-    config.base_compiledir == config.home and
-    # We need to compare to the `real` path because this is what is used in
-    # `filter_compiledir`.
-    config.compiledir == os.path.realpath(default_compiledir)):
-    # The user changed `config.home` but is still using the default values for
-    # `config.base_compiledir` and `config.compiledir`.
-    raise RuntimeError(
-            'You manually set your Theano home directory (to %s), but kept '
-            'the default compilation directory. Please note that the meaning '
-            'of the `home` directory was changed: it is now the base '
-            'directory for all Theano files, instead of being its parent '
-            'directory. To get rid of this error, please set the '
-            '`base_compiledir` config option to the directory you want '
-            'compiled files to be stored into (for instance: %s).' % (
-                config.home,
-                os.path.join(config.home, '.theano')))
-
-
 def print_compiledir_content():
 
     def flatten(a):