Revert changes that contradict comments. Removed new shortcuts for modes.

theano/compile/mode.py

@@ -303,29 +303,8 @@ predefined_modes = {'FAST_COMPILE': FAST_COMPILE,
                     'FAST_RUN': FAST_RUN,
                     'FAST_RUN_NOGC':FAST_RUN_NOGC,
                     'STABILIZE': STABILIZE,
-                    'VM':Mode('vm', 'fast_run'),
-                    'VM_NOGC':Mode('vm_nogc', 'fast_run'),
-                    'CVM':Mode('cvm', 'fast_run'),
-                    'CVM_NOGC':Mode('cvm_nogc', 'fast_run'),
                     }
 
-# Do not add FAST_RUN_NOGC to this list (nor any other ALL CAPS shortcut).
-# The way to get FAST_RUN_NOGC is with the flag 'linker=c|py_nogc'.
-# The old all capital letter way of working is deprecated as it is not
-# scalable.
-# Also, please be careful not to modify the first item in the enum when adding
-# new modes, since it is the default mode.
-AddConfigVar('mode',
-        "Default compilation mode",
-        EnumStr(*(['Mode','DebugMode', 'ProfileMode',
-                   'DEBUG_MODE', 'PROFILE_MODE'] +
-                  # NB: the 'sorted' should not be required, but it is a safety
-                  # measure to help debugging (platform-dependent behavior is
-                  # *not* fun to work with).
-                  sorted(predefined_modes.iterkeys()))),
-        in_c_key=False)
-
-
 instanciated_default_mode=None
 def get_mode(orig_string):
     if orig_string is None:

theano/configdefaults.py

@@ -63,6 +63,18 @@ AddConfigVar('force_device',
         BoolParam(False, allow_override=False),
         in_c_key=False)
 
+# Do not add FAST_RUN_NOGC to this list (nor any other ALL CAPS shortcut).
+# The way to get FAST_RUN_NOGC is with the flag 'linker=c|py_nogc'.
+# The old all capital letter way of working is deprecated as it is not
+# scalable.
+# Also, please be careful not to modify the first item in the enum when adding
+# new modes, since it is the default mode.
+AddConfigVar('mode',
+        "Default compilation mode",
+        EnumStr('Mode', 'ProfileMode', 'DebugMode', 'FAST_RUN',
+                'FAST_COMPILE', 'PROFILE_MODE', 'DEBUG_MODE'),
+        in_c_key=False)
+
 # Test whether or not gcc is present: disable C code if it is not.
 # Using the dummy file descriptor below is a workaround for a crash experienced
 # in an unusual Python 2.4.4 Windows environment with the default stdin=None.
@@ -80,7 +92,7 @@ except OSError:
     # gcc is not present, linker should default to python only
     AddConfigVar('linker',
                  "Default linker used if the theano flags mode is Mode or ProfileMode",
-                 EnumStr('c|py', 'py', 'c', 'c|py_nogc', 'c&py',
+                 EnumStr('py', 'c|py', 'c', 'c|py_nogc', 'c&py',
                      'vm', 'cvm', 'vm_nogc', 'cvm_nogc'),
                  in_c_key=False)
     _logger.warning('GCC not detected ! Theano will be unable to execute '