diff --git a/docs/abstractions2.py b/docs/abstractions2.py index f633474202..e28037a768 100644 --- a/docs/abstractions2.py +++ b/docs/abstractions2.py @@ -80,7 +80,7 @@ print("******** third, the UOp ***********") from tinygrad.engine.realize import run_schedule from tinygrad.engine.schedule import create_schedule_with_vars -from tinygrad.kernelize.kernelize import get_kernelize_map +from tinygrad.schedule.kernelize import get_kernelize_map # allocate some values + load in values a = UOp.new_buffer(DEVICE, 1, dtypes.int32) diff --git a/docs/developer/layout.md b/docs/developer/layout.md index 11be1984cb..68eeaec98c 100644 --- a/docs/developer/layout.md +++ b/docs/developer/layout.md @@ -6,11 +6,11 @@ Directories are listed in order of how they are processed. --- -## tinygrad/kernelize +## tinygrad/schedule Group UOps into kernels. -::: tinygrad.kernelize.kernelize.get_kernelize_map +::: tinygrad.schedule.kernelize.get_kernelize_map options: members: false show_labels: false diff --git a/examples/openpilot/compile4.py b/examples/openpilot/compile4.py index 658f9a07d2..c57bd3eb70 100644 --- a/examples/openpilot/compile4.py +++ b/examples/openpilot/compile4.py @@ -2,7 +2,7 @@ import sys from tinygrad import Tensor, fetch, GlobalCounters, dtypes from tinygrad.uop.ops import UOp from tinygrad.frontend.onnx import OnnxRunner -from tinygrad.kernelize.kernelize import get_kernelize_map +from tinygrad.schedule.kernelize import get_kernelize_map from tinygrad.engine.schedule import create_schedule_with_vars from tinygrad.engine.realize import run_schedule diff --git a/extra/gemm/amd_uop_matmul.py b/extra/gemm/amd_uop_matmul.py index 0833dcb112..095f8d1f6f 100644 --- a/extra/gemm/amd_uop_matmul.py +++ b/extra/gemm/amd_uop_matmul.py @@ -5,7 +5,7 @@ from tinygrad.opt.kernel import AxisType from tinygrad.engine.realize import CompiledRunner, ExecItem, get_program from tinygrad.uop.ops import graph_rewrite, PatternMatcher, UPat, Ops, UOp, GroupOp from tinygrad.shape.shapetracker import ShapeTracker, strides_for_shape -from tinygrad.kernelize.kernelize import merge_views +from tinygrad.schedule.kernelize import merge_views from tinygrad.shape.view import View N = 4096 diff --git a/setup.py b/setup.py index 795fa5c7b3..acf4d52915 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup(name='tinygrad', long_description=long_description, long_description_content_type='text/markdown', packages = ['tinygrad', 'tinygrad.runtime.autogen', 'tinygrad.runtime.autogen.am', 'tinygrad.codegen', 'tinygrad.nn', - 'tinygrad.renderer', 'tinygrad.engine', 'tinygrad.viz', 'tinygrad.runtime', 'tinygrad.runtime.support', 'tinygrad.kernelize', + 'tinygrad.renderer', 'tinygrad.engine', 'tinygrad.viz', 'tinygrad.runtime', 'tinygrad.runtime.support', 'tinygrad.schedule', 'tinygrad.runtime.support.am', 'tinygrad.runtime.graph', 'tinygrad.shape', 'tinygrad.uop', 'tinygrad.opt', 'tinygrad.runtime.support.nv', 'tinygrad.apps'], package_data = {'tinygrad': ['py.typed'], 'tinygrad.viz': ['index.html', 'assets/**/*', 'js/*']}, diff --git a/test/external/process_replay/process_replay.py b/test/external/process_replay/process_replay.py index e8aba6be73..b6615914ed 100755 --- a/test/external/process_replay/process_replay.py +++ b/test/external/process_replay/process_replay.py @@ -7,7 +7,7 @@ ASSERT_DIFF = int((flag:="[pr]") in os.getenv("COMMIT_MESSAGE", flag) or flag in if not int(os.getenv("ASSERT_PROCESS_REPLAY", "1")): ASSERT_DIFF = 0 try: - from tinygrad.kernelize.kernelize import get_kernelize_map + from tinygrad.schedule.kernelize import get_kernelize_map from tinygrad.renderer import Renderer, ProgramSpec from tinygrad.engine.realize import get_program from tinygrad.uop.ops import UOp, Ops, KernelInfo diff --git a/test/test_schedule.py b/test/test_schedule.py index 140b3d1bd2..41963c7a88 100644 --- a/test/test_schedule.py +++ b/test/test_schedule.py @@ -15,7 +15,7 @@ from tinygrad.shape.shapetracker import ShapeTracker from tinygrad.uop.ops import PatternMatcher, UOp, Ops, GroupOp, UPat, graph_rewrite, track_rewrites from tinygrad.uop.symbolic import symbolic_simple from tinygrad.helpers import CI, DEBUG, FUSE_ARANGE, SPLIT_REDUCEOP, GlobalCounters, Context, getenv, all_same, temp -from tinygrad.kernelize.kernelize import merge_views, get_kernelize_map, Kernel +from tinygrad.schedule.kernelize import merge_views, get_kernelize_map, Kernel from tinygrad.engine.schedule import ScheduleItem, create_schedule_with_vars from tinygrad.engine.realize import CompiledRunner, run_schedule, lower_schedule diff --git a/test/unit/test_rewrite_tracked_childen.py b/test/unit/test_rewrite_tracked_childen.py index 6cddd6f289..3e410ff299 100644 --- a/test/unit/test_rewrite_tracked_childen.py +++ b/test/unit/test_rewrite_tracked_childen.py @@ -1,7 +1,7 @@ import unittest from tinygrad import Tensor from tinygrad.uop.ops import PatternMatcher, Ops, UPat, graph_rewrite, RewriteContext, UOp -from tinygrad.kernelize.kernelize import sym, merge_views +from tinygrad.schedule.kernelize import sym, merge_views class TestRewriteTrackedChildren(unittest.TestCase): @unittest.skip("track_children no longer supported") diff --git a/tinygrad/opt/kernel.py b/tinygrad/opt/kernel.py index 25fdf88bd1..b76920c959 100644 --- a/tinygrad/opt/kernel.py +++ b/tinygrad/opt/kernel.py @@ -14,7 +14,7 @@ from tinygrad.dtype import ImageDType from tinygrad.helpers import all_same, colored, ansilen, dedup, prod, round_up, to_function_name, unwrap, argfix, DEBUG, TC_SELECT, TC_OPT, AMX from tinygrad.shape.shapetracker import ShapeTracker from tinygrad.shape.view import strides_for_shape, get_contraction -from tinygrad.kernelize.kernelize import view_left +from tinygrad.schedule.kernelize import view_left class OptOps(Enum): TC = auto(); UPCAST = auto(); UNROLL = auto(); LOCAL = auto() # noqa: E702 diff --git a/tinygrad/kernelize/__init__.py b/tinygrad/schedule/__init__.py similarity index 100% rename from tinygrad/kernelize/__init__.py rename to tinygrad/schedule/__init__.py diff --git a/tinygrad/kernelize/grouper.py b/tinygrad/schedule/grouper.py similarity index 100% rename from tinygrad/kernelize/grouper.py rename to tinygrad/schedule/grouper.py diff --git a/tinygrad/kernelize/kernelize.py b/tinygrad/schedule/kernelize.py similarity index 99% rename from tinygrad/kernelize/kernelize.py rename to tinygrad/schedule/kernelize.py index 765989b8ec..231da90330 100644 --- a/tinygrad/kernelize/kernelize.py +++ b/tinygrad/schedule/kernelize.py @@ -5,10 +5,10 @@ from tinygrad.uop.spec import type_verify, tensor_uop_spec from tinygrad.uop.symbolic import symbolic_simple from tinygrad.helpers import Metadata, all_int, all_same, colored, prod, dedup, unwrap, getenv, pluralize, FUSE_ARANGE, DEBUG, SPLIT_REDUCEOP from tinygrad.dtype import ImageDType -from tinygrad.kernelize.multi import multi_pm +from tinygrad.schedule.multi import multi_pm from tinygrad.shape.shapetracker import ShapeTracker from tinygrad.shape.view import View, strides_for_shape, get_contraction_with_reduce -from tinygrad.kernelize.grouper import group_realizes, ALWAYS_CONTIGUOUS +from tinygrad.schedule.grouper import group_realizes, ALWAYS_CONTIGUOUS # creation can recurse a lot import sys diff --git a/tinygrad/kernelize/multi.py b/tinygrad/schedule/multi.py similarity index 100% rename from tinygrad/kernelize/multi.py rename to tinygrad/schedule/multi.py diff --git a/tinygrad/tensor.py b/tinygrad/tensor.py index 6361a2775e..ef9f9bbad0 100644 --- a/tinygrad/tensor.py +++ b/tinygrad/tensor.py @@ -14,7 +14,7 @@ from tinygrad.device import Device, Buffer from tinygrad.engine.realize import run_schedule from tinygrad.engine.memory import memory_planner from tinygrad.engine.schedule import ScheduleItem, create_schedule_with_vars -from tinygrad.kernelize.kernelize import get_kernelize_map +from tinygrad.schedule.kernelize import get_kernelize_map # *** all in scope Tensors are here. this gets relevant UOps ***