diff --git a/sz.py b/sz.py index d224831a48..38090bb2cd 100755 --- a/sz.py +++ b/sz.py @@ -69,7 +69,8 @@ if __name__ == "__main__": print("```") else: print(tabulate([headers] + sorted(table, key=lambda x: -x[1]), headers="firstrow", floatfmt=".1f")+"\n") - for dir_name, group in itertools.groupby(sorted([(x[0].rsplit("/", 1)[0], x[1], x[2]) for x in table]), key=lambda x:x[0]): + groups = sorted([('/'.join(x[0].rsplit("/", 1)[0].split("/")[0:2]), x[1], x[2]) for x in table]) + for dir_name, group in itertools.groupby(groups, key=lambda x:x[0]): print(f"{dir_name:30s} : {sum([x[1] for x in group]):6d}") total_lines = sum([x[1] for x in table]) print(f"\ntotal line count: {total_lines}") diff --git a/test/test_multitensor.py b/test/test_multitensor.py index a423d79731..08fd62505f 100644 --- a/test/test_multitensor.py +++ b/test/test_multitensor.py @@ -5,7 +5,7 @@ from tinygrad.ops import Ops, UOp from tinygrad.helpers import CI, getenv, prod, Context from tinygrad.nn.state import get_parameters, get_state_dict from tinygrad.engine.realize import lower_schedule, BufferCopy, CompiledRunner, run_schedule -from tinygrad.multi import all_reduce +from tinygrad.engine.multi import all_reduce import numpy as np from hypothesis import given, strategies as strat, settings from tinygrad.device import is_dtype_supported diff --git a/tinygrad/multi.py b/tinygrad/engine/multi.py similarity index 100% rename from tinygrad/multi.py rename to tinygrad/engine/multi.py diff --git a/tinygrad/helpers.py b/tinygrad/helpers.py index 0bd3e367eb..5895b0cc68 100644 --- a/tinygrad/helpers.py +++ b/tinygrad/helpers.py @@ -167,7 +167,7 @@ class Profiling(contextlib.ContextDecorator): cache_dir: str = os.path.join(getenv("XDG_CACHE_HOME", os.path.expanduser("~/Library/Caches" if OSX else "~/.cache")), "tinygrad") CACHEDB: str = getenv("CACHEDB", os.path.abspath(os.path.join(cache_dir, "cache.db"))) -VERSION = 17 +VERSION = 18 _db_connection = None def db_connection(): global _db_connection diff --git a/tinygrad/tensor.py b/tinygrad/tensor.py index 1b81c74601..a39c158eac 100644 --- a/tinygrad/tensor.py +++ b/tinygrad/tensor.py @@ -6,7 +6,7 @@ from typing import List, Tuple, Callable, Optional, ClassVar, Union, Sequence, c from tinygrad.dtype import DType, DTypeLike, dtypes, ImageDType, ConstType, least_upper_float, least_upper_dtype, sum_acc_dtype, to_dtype, truncate from tinygrad.helpers import argfix, make_tuple, flatten, prod, all_int, round_up, merge_dicts, argsort, getenv, all_same, fully_flatten, dedup from tinygrad.helpers import IMAGE, WINO, _METADATA, Metadata, TRACEMETA, ceildiv, fetch, polyN, unwrap -from tinygrad.multi import get_multi_map +from tinygrad.engine.multi import get_multi_map from tinygrad.gradient import compute_gradient from tinygrad.ops import smax, smin, resolve, UOp, Ops, sint, Variable, SimpleMathTrait, identity_element from tinygrad.device import Device, BufferSpec