issue/943 - fix bugs: (1) circular imports (2) ambiguous filenames and class names.

Author: pengcheng888

python/infinicore/__init__.py

@@ -2,22 +2,8 @@
 
 import infinicore.context as context
 import infinicore.nn as nn
-
-# Import context functions
-from infinicore.context import (
-    get_device,
-    get_device_count,
-    get_stream,
-    is_graph_recording,
-    set_device,
-    start_graph_recording,
-    stop_graph_recording,
-    sync_device,
-    sync_stream,
-)
-from infinicore.device import device
-from infinicore.device_event import DeviceEvent
-from infinicore.dtype import (
+from infinicore._device import device
+from infinicore._dtype import (
     bfloat16,
     bool,
     cdouble,
@@ -42,6 +28,20 @@
     short,
     uint8,
 )
+
+# Import context functions
+from infinicore.context import (
+    get_device,
+    get_device_count,
+    get_stream,
+    is_graph_recording,
+    set_device,
+    start_graph_recording,
+    stop_graph_recording,
+    sync_device,
+    sync_stream,
+)
+from infinicore.device_event import DeviceEvent
 from infinicore.ops.add import add
 from infinicore.ops.add_rms_norm import add_rms_norm, add_rms_norm_
 from infinicore.ops.attention import attention

python/infinicore/device.py python/infinicore/_device.pypython/infinicore/device.py renamed to python/infinicore/_device.py

@@ -1,4 +1,4 @@
-import infinicore.device
+import infinicore._device
 from infinicore.graph import Graph
 from infinicore.lib import _infinicore
 

python/infinicore/dtype.py python/infinicore/_dtype.pypython/infinicore/dtype.py renamed to python/infinicore/_dtype.py

@@ -1,4 +1,4 @@
-import infinicore.device
+import infinicore._device
 from infinicore.lib import _infinicore
 
 

python/infinicore/context.py

@@ -2,8 +2,10 @@
 
 import numpy as np
 
-import infinicore.device
-import infinicore.dtype
+import infinicore._device
+import infinicore._dtype
+from infinicore._device import device
+from infinicore._dtype import dtype
 from infinicore.lib import _infinicore
 
 from .utils import (
@@ -18,8 +20,8 @@ class Tensor:
     _underlying: _infinicore.Tensor
     _torch_ref: "torch.Tensor"  # noqa: F821
     shape: list[int]
-    dtype: infinicore.dtype
-    device: infinicore.device
+    dtype: dtype
+    device: device
 
     def __init__(self, underlying, *, _torch_ref=None):
         """An internal method. Please do not use this directly."""
@@ -198,8 +200,8 @@ def from_torch(torch_tensor) -> Tensor:
 def from_numpy(
     np_array,
     *,
-    dtype: infinicore.dtype = None,
-    device: infinicore.device = None,
+    dtype: dtype = None,
+    device: device = None,
 ) -> Tensor:
     """Convert a NumPy ndarray to an infinicore Tensor.
 

python/infinicore/device_event.py

@@ -170,7 +170,7 @@ def test5_bf16():
 
 
 def func6_initialize_device_relationship():
-    from infinicore.device import _initialize_device_relationship
+    from infinicore._device import _initialize_device_relationship
 
     all_device_types = [
         _infinicore.Device.Type.CPU,  # 0  "cpu"