Rename theano.link.c.cc to theano.link.c.basic

tests/gpuarray/test_elemwise.py

@@ -26,7 +26,7 @@ from theano.gpuarray.elemwise import (
 )
 from theano.gpuarray.type import GpuArrayType, get_context, gpuarray_shared_constructor
 from theano.link.basic import PerformLinker
-from theano.link.c.cc import CLinker
+from theano.link.c.basic import CLinker
 
 
 # This is actually a test for GpuElemwise

tests/link/test_cc.py

@@ -7,7 +7,7 @@ from theano.gof.graph import Apply, Constant, Variable
 from theano.gof.op import Op
 from theano.gof.type import Type
 from theano.link.basic import PerformLinker
-from theano.link.c.cc import CLinker, DualLinker, OpWiseCLinker
+from theano.link.c.basic import CLinker, DualLinker, OpWiseCLinker
 
 
 def as_variable(x):

tests/link/test_vm.py

@@ -128,7 +128,7 @@ def test_speed():
 
         print(f"{name} takes {1000 * (t_b - t_a) / (steps_b - steps_a):f} s/Kop")
 
-    from theano.link.c.cc import OpWiseCLinker
+    from theano.link.c.basic import OpWiseCLinker
 
     time_linker("c|py", OpWiseCLinker)
     time_linker("vmLinker", VMLinker)

tests/record.py

@@ -249,7 +249,7 @@ class RecordMode(Mode):
             line = f"Outputs: {outputs_digest}\n"
             handle_line(fgraph, line, i, node, fn)
 
-        # linker = theano.link.c.cc.OpWiseCLinker()
+        # linker = theano.link.c.basic.OpWiseCLinker()
         linker = VMLinker(use_cloop=bool(config.cxx))
 
         wrap_linker = WrapLinkerMany([linker], [callback])

tests/scalar/test_basic.py

@@ -14,7 +14,7 @@ import pytest
 import tests.unittest_tools as utt
 import theano
 from theano.gof import FunctionGraph
-from theano.link.c.cc import DualLinker
+from theano.link.c.basic import DualLinker
 from theano.scalar.basic import (
     ComplexError,
     Composite,

tests/scalar/test_basic_sympy.py

@@ -20,7 +20,7 @@ def test_SymPyCCode():
     op = SymPyCCode([xs, ys], xs + ys)
     e = op(xt, yt)
     g = theano.gof.FunctionGraph([xt, yt], [e])
-    fn = theano.link.c.cc.CLinker().accept(g).make_function()
+    fn = theano.link.c.basic.CLinker().accept(g).make_function()
     assert fn(1.0, 2.0) == 3.0
 
 

tests/tensor/random/test_type.py

@@ -16,7 +16,7 @@ def test_view_op_c_code():
     # TODO: It might be good to make sure that the registered C code works
     # (even though it's basically copy-paste from other registered `Op`s).
     # from theano.compile.ops import view_op
-    # from theano.link.c.cc import CLinker
+    # from theano.link.c.basic import CLinker
     # rng_var = random_state_type()
     # rng_view = view_op(rng_var)
     # function(

tests/tensor/test_basic.py

@@ -72,7 +72,7 @@ from theano import compile, config, function, gof, shared
 from theano.compile import DeepCopyOp
 from theano.compile.mode import get_default_mode
 from theano.gof.graph import Variable
-from theano.link.c.cc import DualLinker
+from theano.link.c.basic import DualLinker
 from theano.scalar import autocast_float, autocast_float_as
 from theano.tensor import (
     Alloc,

tests/tensor/test_elemwise.py

@@ -12,7 +12,7 @@ from tests import unittest_tools
 from theano import config, gof, scalar
 from theano.compile.mode import Mode, get_default_mode
 from theano.link.basic import PerformLinker
-from theano.link.c.cc import CLinker, OpWiseCLinker
+from theano.link.c.basic import CLinker, OpWiseCLinker
 from theano.tensor import TensorType, as_tensor_variable
 from theano.tensor.elemwise import (
     CAReduce,

theano/__init__.py

@@ -115,7 +115,7 @@ from theano.gof import (
 )
 from theano.gradient import Lop, Rop, grad, subgraph_grad
 from theano.link.basic import Container, Linker, LocalLinker, PerformLinker
-from theano.link.c.cc import CLinker, DualLinker, OpWiseCLinker
+from theano.link.c.basic import CLinker, DualLinker, OpWiseCLinker
 from theano.misc.safe_asarray import _asarray
 from theano.printing import pp, pprint
 from theano.updates import OrderedUpdates

theano/compile/function/types.py

@@ -1536,7 +1536,7 @@ class FunctionMaker:
             #    too much execution time during testing as we compile
             #    much more functions then the number of compile c
             #    module.
-            theano.link.c.cc.get_module_cache().refresh()
+            theano.link.c.basic.get_module_cache().refresh()
         # Handle the case where inputs and/or outputs is a single
         # Variable (not in a list)
         unpack_single = False

theano/compile/mode.py

@@ -10,7 +10,7 @@ import theano
 from theano import config, gof
 from theano.compile.function.types import Supervisor
 from theano.link.basic import PerformLinker
-from theano.link.c.cc import CLinker, OpWiseCLinker
+from theano.link.c.basic import CLinker, OpWiseCLinker
 from theano.link.jax import JAXLinker
 from theano.link.vm import VMLinker
 

theano/compile/monitormode.py

@@ -5,7 +5,7 @@ import numpy as np
 from theano.compile.mode import Mode
 from theano.configdefaults import config
 from theano.link.basic import WrapLinkerMany
-from theano.link.c.cc import OpWiseCLinker
+from theano.link.c.basic import OpWiseCLinker
 
 
 class MonitorMode(Mode):

theano/gof/op.py

@@ -843,7 +843,7 @@ class Op(object2, PureOp, CLinkerOp):
         # FIXME: Putting the following import on the module level causes an import cycle.
         #        The conclusion should be that the antire "make_c_thunk" method should be defined
         #        in theano.link.c and dispatched onto the Op!
-        import theano.link.c.cc
+        import theano.link.c.basic
 
         node_input_storage = [storage_map[r] for r in node.inputs]
         node_output_storage = [storage_map[r] for r in node.outputs]
@@ -854,7 +854,7 @@ class Op(object2, PureOp, CLinkerOp):
             for (new_o, old_o) in zip(e.outputs, node.outputs)
             if old_o in no_recycling
         ]
-        cl = theano.link.c.cc.CLinker().accept(e, no_recycling=e_no_recycling)
+        cl = theano.link.c.basic.CLinker().accept(e, no_recycling=e_no_recycling)
         # float16 gets special treatment since running
         # unprepared C code will get bad results.
         if not getattr(self, "_f16_ok", False):

theano/gpuarray/basic_ops.py

@@ -11,7 +11,7 @@ from theano.gof import COp, ParamsType
 from theano.gof.opt import copy_stack_trace
 from theano.gof.utils import MethodNotDefined
 from theano.gradient import grad_undefined
-from theano.link.c.cc import HideC
+from theano.link.c.basic import HideC
 from theano.scalar import bool as bool_t
 from theano.scalar import int32 as int32_t
 from theano.tensor.basic import Alloc, AllocEmpty, Join, Split, alloc_validate_shape

theano/gpuarray/opt.py

@@ -150,7 +150,7 @@ from theano.gpuarray.type import (
     move_to_gpu,
 )
 from theano.ifelse import IfElse
-from theano.link.c.cc import CLinker
+from theano.link.c.basic import CLinker
 from theano.misc.ordered_set import OrderedSet
 from theano.scalar.basic import Cast, Pow, Scalar, log, neg, true_div
 from theano.scalar.basic_scipy import Erfcinv, Erfinv

theano/link/c/cc.py → theano/link/c/basic.py

@@ -27,7 +27,7 @@ from theano.link.c.cmodule import get_module_cache as _get_module_cache
 from theano.link.utils import gc_helper, map_storage, raise_with_op, streamline
 
 
-_logger = logging.getLogger("theano.link.c.cc")
+_logger = logging.getLogger("theano.link.c.basic")
 
 
 run_cthunk = None  # Will be imported only when needed.

theano/scan/op.py

@@ -63,7 +63,7 @@ from theano.gof import Apply, PureOp
 from theano.gof.graph import equal_computations, io_connection_pattern
 from theano.gof.toolbox import NoOutputFromInplace
 from theano.gradient import DisconnectedType, NullType, grad_undefined
-from theano.link.c.cc import CLinker
+from theano.link.c.basic import CLinker
 from theano.link.c.exceptions import MissingGXX
 from theano.link.utils import raise_with_op
 from theano.scan.utils import Validator, forced_replace, hash_listsDictsTuples, safe_new

theano/tensor/elemwise.py

@@ -1037,7 +1037,7 @@ second dimension
         if self.openmp:
             # If we are using openmp, we need to get rid of the "goto"
             # statement in sub['fail']. For now we recreate it here.
-            fail = theano.link.c.cc.failure_code(sub, use_goto=False)
+            fail = theano.link.c.basic.failure_code(sub, use_goto=False)
         else:
             fail = sub["fail"]
         task_code = self.scalar_op.c_code(