diff --git a/extra/backends/hsa_graph.py b/extra/backends/hsa_graph.py index 07c3d66c61..6a26c82e23 100644 --- a/extra/backends/hsa_graph.py +++ b/extra/backends/hsa_graph.py @@ -8,7 +8,7 @@ from tinygrad.runtime.ops_hsa import HSADevice, PROFILE, Profiler from tinygrad.engine.realize import ExecItem, BufferXfer, CompiledRunner from tinygrad.engine.jit import MultiGraphRunner import tinygrad.runtime.autogen.hsa as hsa -from tinygrad.runtime.driver.hsa import check, AQLQueue, AQL_PACKET_SIZE, EMPTY_SIGNAL +from tinygrad.runtime.support.hsa import check, AQLQueue, AQL_PACKET_SIZE, EMPTY_SIGNAL def dedup_signals(signals): return [hsa.hsa_signal_t(hndl) for hndl in set([x.handle for x in signals if isinstance(x, hsa.hsa_signal_t)])] diff --git a/extra/backends/ops_hip.py b/extra/backends/ops_hip.py index 14db29d899..9417549e6b 100644 --- a/extra/backends/ops_hip.py +++ b/extra/backends/ops_hip.py @@ -6,7 +6,7 @@ from tinygrad.helpers import DEBUG, getenv, init_c_var from tinygrad.helpers import from_mv, round_up, to_mv, colored, init_c_struct_t from tinygrad.device import Compiled, LRUAllocator, BufferOptions, Runner, Device, Buffer, MallocAllocator, update_stats, Compiler, CompilerOptions from tinygrad.renderer.cstyle import HIPRenderer -from tinygrad.runtime.driver.hip_comgr import compile_hip +from tinygrad.runtime.support.hip_comgr import compile_hip from tinygrad.renderer.rdna import uops_to_rdna class RDNACompiler(Compiler): diff --git a/extra/backends/ops_hsa.py b/extra/backends/ops_hsa.py index c2ff4c73cc..15ba7aedfc 100644 --- a/extra/backends/ops_hsa.py +++ b/extra/backends/ops_hsa.py @@ -5,8 +5,8 @@ import tinygrad.runtime.autogen.hsa as hsa from tinygrad.helpers import DEBUG, init_c_var, from_mv, round_up, to_mv, init_c_struct_t, getenv, PROFILE from tinygrad.device import Compiled, Compiler, CompileError, BufferOptions, LRUAllocator from tinygrad.renderer.cstyle import HIPRenderer -from tinygrad.runtime.driver.hsa import check, scan_agents, find_memory_pool, AQLQueue -from tinygrad.runtime.driver.hip_comgr import compile_hip +from tinygrad.runtime.support.hsa import check, scan_agents, find_memory_pool, AQLQueue +from tinygrad.runtime.support.hip_comgr import compile_hip if getenv("IOCTL"): import extra.hip_gpu_driver.hip_ioctl # noqa: F401 class HSAProfiler: diff --git a/setup.py b/setup.py index 6bc5234243..8a95fa15d7 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup(name='tinygrad', long_description=long_description, long_description_content_type='text/markdown', packages = ['tinygrad', 'tinygrad.runtime.autogen', 'tinygrad.codegen', 'tinygrad.nn', 'tinygrad.renderer', 'tinygrad.engine', - 'tinygrad.runtime', 'tinygrad.runtime.driver', 'tinygrad.runtime.graph', 'tinygrad.shape'], + 'tinygrad.runtime', 'tinygrad.runtime.support', 'tinygrad.runtime.graph', 'tinygrad.shape'], classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License" diff --git a/test/external/external_test_hip_compile.py b/test/external/external_test_hip_compile.py index acbcd23b03..6da8127202 100644 --- a/test/external/external_test_hip_compile.py +++ b/test/external/external_test_hip_compile.py @@ -1,5 +1,5 @@ import time, unittest -from tinygrad.runtime.driver.hip_comgr import compile_hip +from tinygrad.runtime.support.hip_comgr import compile_hip from tinygrad import Tensor from tinygrad.device import Device from tinygrad.engine.schedule import create_schedule diff --git a/test/external/external_test_hsa_driver.py b/test/external/external_test_hsa_driver.py index 827401be61..29ffaa2340 100644 --- a/test/external/external_test_hsa_driver.py +++ b/test/external/external_test_hsa_driver.py @@ -2,7 +2,7 @@ import ctypes, unittest from tinygrad.helpers import init_c_struct_t from tinygrad.device import Device, Buffer, BufferXfer from tinygrad.dtype import dtypes -from tinygrad.runtime.driver.hsa import AQLQueue +from tinygrad.runtime.support.hsa import AQLQueue from tinygrad.runtime.graph.hsa import VirtAQLQueue, HSAGraph from tinygrad.engine.realize import ExecItem diff --git a/tinygrad/runtime/ops_amd.py b/tinygrad/runtime/ops_amd.py index e884ecfd44..aba8819b6b 100644 --- a/tinygrad/runtime/ops_amd.py +++ b/tinygrad/runtime/ops_amd.py @@ -6,7 +6,7 @@ from tinygrad.device import HCQCompatCompiled, HCQCompatAllocator, HCQCompatAllo Compiler, CompileError, BufferOptions from tinygrad.helpers import getenv, init_c_struct_t, to_mv, round_up, DEBUG, PROFILE, mv_address from tinygrad.renderer.cstyle import AMDRenderer -from tinygrad.runtime.driver.hip_comgr import compile_hip +from tinygrad.runtime.support.hip_comgr import compile_hip import tinygrad.runtime.autogen.kfd as kfd import tinygrad.runtime.autogen.hsa as hsa import tinygrad.runtime.autogen.amd_gpu as amd_gpu diff --git a/tinygrad/runtime/driver/__init__.py b/tinygrad/runtime/support/__init__.py similarity index 100% rename from tinygrad/runtime/driver/__init__.py rename to tinygrad/runtime/support/__init__.py diff --git a/tinygrad/runtime/driver/hip_comgr.py b/tinygrad/runtime/support/hip_comgr.py similarity index 100% rename from tinygrad/runtime/driver/hip_comgr.py rename to tinygrad/runtime/support/hip_comgr.py