fix local_bitwidth and python_int_bitwidth imports

theano/compile/tests/test_pfunc.py

@@ -549,7 +549,7 @@ class Test_pfunc(unittest.TestCase):
     def test_default_updates_input(self):
         x = shared(0)
         y = shared(1)
-        if theano.gof.python_int_bitwidth() == 32:
+        if theano.configdefaults.python_int_bitwidth() == 32:
             a = iscalar('a')
         else:
             a = lscalar('a')

theano/compile/tests/test_shared.py

@@ -18,7 +18,7 @@ class Test_SharedVariable(unittest.TestCase):
             assert shared(7, dtype='float64').type == Scalar('float64')
 
         else:
-            if theano.gof.python_int_bitwidth() == 32:
+            if theano.configdefaults.python_int_bitwidth() == 32:
                 assert shared(7).type == theano.tensor.iscalar, shared(7).type
             else:
                 assert shared(7).type == theano.tensor.lscalar, shared(7).type

theano/gof/__init__.py

@@ -38,10 +38,6 @@ e-mail thread "What is gof?".
 from theano.gof.cc import \
     CLinker, OpWiseCLinker, DualLinker, HideC
 
-# Also adds config vars
-from theano.gof.compiledir import \
-    local_bitwidth, python_int_bitwidth
-
 from theano.gof.fg import \
     CachedConstantError, InconsistencyError, MissingInputError, FunctionGraph
 

theano/sandbox/cuda/basic_ops.py

@@ -3008,7 +3008,7 @@ class GpuAdvancedIncSubtensor1_dev20(GpuAdvancedIncSubtensor1):
                        32: tensor.basic._convert_to_int32,
                        64: tensor.basic._convert_to_int64
         }
-        intwidth = theano.gof.compiledir.python_int_bitwidth()
+        intwidth = theano.configdefaults.python_int_bitwidth()
         ilist_ = convert_map[intwidth](ilist_)
 
         assert x_.type.dtype == y_.type.dtype

theano/sandbox/cuda/nvcc_compiler.py

@@ -10,7 +10,7 @@ import numpy
 
 from theano import config
 from theano.compat import decode, decode_iter
-from theano.gof import local_bitwidth
+from theano.configdefaults import local_bitwidth
 from theano.gof.utils import hash_from_file
 from theano.gof.cmodule import (std_libs, std_lib_dirs,
                                 std_include_dirs, dlimport,

theano/tensor/extra_ops.py

@@ -416,12 +416,12 @@ class BinCountOp(theano.Op):
         # Some dtypes are not supported by numpy's implementation of bincount.
         # Until another one is available, we should fail at graph construction
         # time, not wait for execution.
-        int_bitwidth = theano.gof.python_int_bitwidth()
+        int_bitwidth = theano.configdefaults.python_int_bitwidth()
         if int_bitwidth == 64:
             numpy_unsupported_dtypes = ('uint64',)
         if int_bitwidth == 32:
             numpy_unsupported_dtypes = ('uint32', 'int64', 'uint64')
-        intp_bitwidth = theano.gof.local_bitwidth()
+        intp_bitwidth = theano.configdefaults.local_bitwidth()
         if intp_bitwidth == 32:
             out_type = basic.ivector()
         elif intp_bitwidth == 64:
@@ -598,7 +598,7 @@ class RepeatOp(theano.Op):
         # Some dtypes are not supported by numpy's implementation of repeat.
         # Until another one is available, we should fail at graph construction
         # time, not wait for execution.
-        ptr_bitwidth = theano.gof.local_bitwidth()
+        ptr_bitwidth = theano.configdefaults.local_bitwidth()
         if ptr_bitwidth == 64:
             numpy_unsupported_dtypes = ('uint64',)
         if ptr_bitwidth == 32:

theano/tensor/tests/test_basic.py

@@ -6672,7 +6672,7 @@ class test_arithmetic_cast(unittest.TestCase):
 
 class T_long_tensor(unittest.TestCase):
     def test_fit_int64(self):
-        for exp in xrange(gof.python_int_bitwidth()):
+        for exp in xrange(theano.configdefaults.python_int_bitwidth()):
             val = L(2 ** exp - 1)
             scalar_ct = constant(val)
 

theano/tensor/tests/test_extra_ops.py

@@ -175,7 +175,7 @@ class TestBinCountOp(utt.InferShapeTester):
                       'uint8', 'uint16', 'uint32', 'uint64'):
             # uint64 always fails
             # int64 and uint32 also fail if python int are 32-bit
-            int_bitwidth = theano.gof.python_int_bitwidth()
+            int_bitwidth = theano.configdefaults.python_int_bitwidth()
             if int_bitwidth == 64:
                 numpy_unsupported_dtypes = ('uint64',)
             if int_bitwidth == 32:
@@ -208,7 +208,7 @@ class TestBinCountOp(utt.InferShapeTester):
         for dtype in tensor.discrete_dtypes:
             # uint64 always fails
             # int64 and uint32 also fail if python int are 32-bit
-            int_bitwidth = theano.gof.python_int_bitwidth()
+            int_bitwidth = theano.configdefaults.python_int_bitwidth()
             if int_bitwidth == 64:
                 numpy_unsupported_dtypes = ('uint64',)
             if int_bitwidth == 32:
@@ -408,7 +408,7 @@ class TestRepeatOp(utt.InferShapeTester):
         self.op = RepeatOp()
         # uint64 always fails
         # int64 and uint32 also fail if python int are 32-bit
-        ptr_bitwidth = theano.gof.local_bitwidth()
+        ptr_bitwidth = theano.configdefaults.local_bitwidth()
         if ptr_bitwidth == 64:
             self.numpy_unsupported_dtypes = ('uint64',)
         if ptr_bitwidth == 32: