Reorganize directories

mlcommons · May 9, 2024 · a1120dd · a1120dd
1 parent f316efc
commit a1120dd
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 17 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,29 +19,33 @@ Documentation = "https://github.com/mlcommons/chakra/README.md"
 Repository = "https://github.com/mlcommons/chakra.git"
 
 [tool.setuptools.package-dir]
-"chakra.et_def" = "et_def"
-"chakra.et_converter" = "et_converter"
-"chakra.et_visualizer" = "et_visualizer"
-"chakra.timeline_visualizer" = "timeline_visualizer"
-"chakra.et_generator" = "utils/et_generator"
-"chakra.et_jsonizer" = "utils/et_jsonizer"
-"chakra.trace_link" = "trace_link"
-"chakra.third_party.utils" = "third_party/utils"
+"chakra.schema.protobuf" = "schema/protobuf"
+"chakra.src.converter" = "src/converter"
+"chakra.src.generator" = "src/generator"
+"chakra.src.jsonizer" = "src/jsonizer"
+"chakra.src.third_party" = "src/third_party"
+"chakra.src.timeline_visualizer" = "src/timeline_visualizer"
+"chakra.src.trace_link" = "src/trace_link"
+"chakra.src.visualizer" = "src/visualizer"
 
 [tool.setuptools.package-data]
-"chakra.et_def" = ["et_def_pb2.pyi", "et_def.proto"]
+"chakra.schema.protobuf" = ["et_def.proto"]
 
 [project.scripts]
-chakra_converter = "chakra.et_converter.et_converter:main"
-chakra_visualizer = "chakra.et_visualizer.et_visualizer:main"
-chakra_timeline_visualizer = "chakra.et_timeline_visualizer.et_timeline_visualizer:main"
-chakra_generator = "chakra.et_generator.et_generator:main"
-chakra_jsonizer = "chakra.et_jsonizer.et_jsonizer:main"
-chakra_trace_link = "chakra.trace_link.trace_link:main"
+chakra_converter = "chakra.src.converter.converter:main"
+chakra_generator = "chakra.src.generator.generator:main"
+chakra_jsonizer = "chakra.src.jsonizer.jsonizer:main"
+chakra_timeline_visualizer = "chakra.src.timeline_visualizer.timeline_visualizer:main"
+chakra_trace_link = "chakra.src.trace_link.trace_link:main"
+chakra_visualizer = "chakra.src.visualizer.visualizer:main"
 
 [tool.ruff]
 target-version = "py39"
 line-length = 120
+exclude = [
+    "src/converter/text2chakra_converter.py",
+    "src/third_party/utils/protolib.py",
+]
 
 [tool.ruff.lint]
 select = ["I", "B", "E", "F", "SIM", "W", "C90", "EXE"]

diff --git a/et_def/et_def.proto → schema/protobuf/et_def.proto b/et_def/et_def.proto → schema/protobuf/et_def.proto
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [build_grpc]
 proto_files = et_def.proto
 grpc_files = et_def.proto
-proto_path = et_def
-output_path = et_def
+proto_path = schema/protobuf/
+output_path = schema/protobuf/
diff --git a/et_converter/et_converter.py → src/converter/converter.py b/et_converter/et_converter.py → src/converter/converter.py
diff --git a/et_converter/pytorch2chakra_converter.py → src/converter/pytorch2chakra_converter.py b/et_converter/pytorch2chakra_converter.py → src/converter/pytorch2chakra_converter.py
diff --git a/et_converter/pytorch_node.py → src/converter/pytorch_node.py b/et_converter/pytorch_node.py → src/converter/pytorch_node.py
diff --git a/et_converter/pytorch_tensor.py → src/converter/pytorch_tensor.py b/et_converter/pytorch_tensor.py → src/converter/pytorch_tensor.py
diff --git a/et_converter/text2chakra_converter.py → src/converter/text2chakra_converter.py b/et_converter/text2chakra_converter.py → src/converter/text2chakra_converter.py
diff --git a/et_feeder/et_feeder.cpp → src/feeder/et_feeder.cpp b/et_feeder/et_feeder.cpp → src/feeder/et_feeder.cpp
diff --git a/et_feeder/et_feeder.h → src/feeder/et_feeder.h b/et_feeder/et_feeder.h → src/feeder/et_feeder.h
diff --git a/et_feeder/et_feeder_node.cpp → src/feeder/et_feeder_node.cpp b/et_feeder/et_feeder_node.cpp → src/feeder/et_feeder_node.cpp
diff --git a/et_feeder/et_feeder_node.h → src/feeder/et_feeder_node.h b/et_feeder/et_feeder_node.h → src/feeder/et_feeder_node.h
diff --git a/utils/et_generator/et_generator.py → src/generator/generator.py b/utils/et_generator/et_generator.py → src/generator/generator.py
diff --git a/utils/et_jsonizer/et_jsonizer.py → src/jsonizer/jsonizer.py b/utils/et_jsonizer/et_jsonizer.py → src/jsonizer/jsonizer.py
diff --git a/third_party/utils/protoio.cc → src/third_party/utils/protoio.cc b/third_party/utils/protoio.cc → src/third_party/utils/protoio.cc
diff --git a/third_party/utils/protoio.hh → src/third_party/utils/protoio.hh b/third_party/utils/protoio.hh → src/third_party/utils/protoio.hh
diff --git a/third_party/utils/protolib.py → src/third_party/utils/protolib.py b/third_party/utils/protolib.py → src/third_party/utils/protolib.py
diff --git a/timeline_visualizer/timeline_visualizer.py → ...imeline_visualizer/timeline_visualizer.py b/timeline_visualizer/timeline_visualizer.py → ...imeline_visualizer/timeline_visualizer.py
diff --git a/trace_link/trace_link.py → src/trace_link/trace_link.py b/trace_link/trace_link.py → src/trace_link/trace_link.py
diff --git a/et_visualizer/et_visualizer.py → src/visualizer/visualizer.py b/et_visualizer/et_visualizer.py → src/visualizer/visualizer.py