feat: simplify project structure

elasticai/creator/base_modules/layers.py

@@ -1,4 +1,4 @@
-from typing import Callable, Optional
+from typing import Callable, Optional, cast
 
 import torch
 from torch.nn.utils.parametrize import register_parametrization
@@ -104,10 +104,12 @@ def __init__(self, factors=0.5):
         self.factors = torch.nn.Parameter(torch.Tensor([factors]), requires_grad=True)
 
     def forward(self, input):
-        binarize = BinarizeFn.apply
+        def binarize(x: torch.Tensor) -> torch.Tensor:
+            return cast(torch.Tensor, BinarizeFn.apply(x))
+
         first_half = binarize(input)
         second_half = input - self.factors * binarize(input)
-        return binarize(torch.cat((first_half, second_half), dim=1))
+        return binarize(torch.cat([first_half, second_half], dim=1))
 
 
 def _hook_quantizer(module: torch.nn.Module, quantizer: Module, bias: bool):

elasticai/creator/generate_template.py

@@ -1,4 +1,4 @@
-from elasticai.creator.hdl.vhdl.base_template_generator import BaseTemplateGenerator
+from elasticai.creator.vhdl.base_template_generator import BaseTemplateGenerator
 
 generator = BaseTemplateGenerator()
 print(generator.generate())

elasticai/creator/in_memory_path.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
-from elasticai.creator.hdl.code_generation.template import Template, TemplateExpander
-from elasticai.creator.hdl.savable import File, Path
+from elasticai.creator.vhdl.code_generation.template import Template, TemplateExpander
+from elasticai.creator.vhdl.savable import File, Path
 
 
 class InMemoryFile(File):

elasticai/creator/nn/__init__.py

@@ -0,0 +1,8 @@
+from .batch_normed_linear import FPBatchNormedLinear
+from .hard_sigmoid import FPHardSigmoid
+from .hard_tanh import FPHardTanh
+from .identity import BufferedIdentity, BufferlessIdentity
+from .linear import FPLinear
+from .precomputed import FPSigmoid, FPTanh
+from .relu import FPReLU
+from .sequential import Sequential

elasticai/creator/nn/vhdl/batch_normed_linear/layer.py → elasticai/creator/nn/batch_normed_linear/layer.py

@@ -9,8 +9,8 @@
 from elasticai.creator.base_modules.two_complement_fixed_point_config import (
     FixedPointConfig,
 )
-from elasticai.creator.hdl.translatable import Translatable
-from elasticai.creator.nn.vhdl.linear.design import FPLinear
+from elasticai.creator.nn.linear.design import FPLinear
+from elasticai.creator.vhdl.translatable import Translatable
 
 
 class FPBatchNormedLinear(Translatable, torch.nn.Module):

elasticai/creator/nn/vhdl/hard_sigmoid/design.py → elasticai/creator/nn/hard_sigmoid/design.py

@@ -1,10 +1,10 @@
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import create_port
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     module_to_package,
 )
-from elasticai.creator.hdl.design_base.design import Design, Port
-from elasticai.creator.hdl.savable import Path
+from elasticai.creator.vhdl.design_base.design import Design, Port
+from elasticai.creator.vhdl.savable import Path
 
 
 class FPHardSigmoid(Design):

elasticai/creator/nn/vhdl/hard_sigmoid/layer.py → elasticai/creator/nn/hard_sigmoid/layer.py

@@ -2,8 +2,8 @@
 from elasticai.creator.base_modules.two_complement_fixed_point_config import (
     FixedPointConfig,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
 
 from .design import FPHardSigmoid as FPHardSigmoidDesign
 

elasticai/creator/nn/vhdl/hard_tanh/design.py → elasticai/creator/nn/hard_tanh/design.py

@@ -1,10 +1,10 @@
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import create_port
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     module_to_package,
 )
-from elasticai.creator.hdl.design_base.design import Design, Port
-from elasticai.creator.hdl.savable import Path
+from elasticai.creator.vhdl.design_base.design import Design, Port
+from elasticai.creator.vhdl.savable import Path
 
 
 class FPHardTanh(Design):

elasticai/creator/nn/vhdl/hard_tanh/layer.py → elasticai/creator/nn/hard_tanh/layer.py

@@ -2,8 +2,8 @@
 from elasticai.creator.base_modules.two_complement_fixed_point_config import (
     FixedPointConfig,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
 
 from .design import FPHardTanh as FPHardTanhDesign
 

elasticai/creator/nn/vhdl/identity/design.py → elasticai/creator/nn/identity/design.py

@@ -1,14 +1,12 @@
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import create_port
-from elasticai.creator.hdl.code_generation.code_generation import (
-    calculate_address_width,
-)
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.addressable import calculate_address_width
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     module_to_package,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.design_base.ports import Port
-from elasticai.creator.hdl.savable import Path
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.design_base.ports import Port
+from elasticai.creator.vhdl.savable import Path
 
 
 class BufferedIdentity(Design):

elasticai/creator/nn/vhdl/identity/layer.py → elasticai/creator/nn/identity/layer.py

@@ -1,8 +1,9 @@
 from elasticai.creator.base_modules.identity import Identity
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
-from elasticai.creator.nn.vhdl.identity.design import BufferedIdentity as IdentityDesign
-from elasticai.creator.nn.vhdl.identity.design import BufferlessDesign
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
+
+from .design import BufferedIdentity as IdentityDesign
+from .design import BufferlessDesign
 
 
 class BufferedIdentity(Translatable, Identity):

elasticai/creator/nn/vhdl/linear/design.py → elasticai/creator/nn/linear/design.py

@@ -1,24 +1,18 @@
 from itertools import chain
 from typing import Optional
 
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import (
-    create_port_for_buffered_design as create_port,
-)
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     module_to_package,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.design_base.ports import Port
-from elasticai.creator.hdl.savable import Path
-from elasticai.creator.hdl.vhdl.designs.rom import Rom
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.design_base.ports import Port
+from elasticai.creator.vhdl.designs.rom import Rom
+from elasticai.creator.vhdl.savable import Path
 
 
 class FPLinear(Design):
-    @property
-    def port(self) -> Port:
-        return self._port
-
     def __init__(
         self,
         *,
@@ -35,12 +29,6 @@ def __init__(
         super().__init__(
             name="fp_linear" if name is None else name,
         )
-        self._port = create_port(
-            x_width=total_bits,
-            y_width=total_bits,
-            x_count=in_feature_num,
-            y_count=out_feature_num,
-        )
         self.weights = weights
         self.bias = bias
         self.in_feature_num = in_feature_num
@@ -52,6 +40,15 @@ def __init__(
         self.x_addr_width = self.port["x_address"].width
         self.y_addr_width = self.port["y_address"].width
 
+    @property
+    def port(self) -> Port:
+        return create_port(
+            x_width=self.data_width,
+            y_width=self.data_width,
+            x_count=self.in_feature_num,
+            y_count=self.out_feature_num,
+        )
+
     def _template_parameters(self) -> dict[str, str]:
         return dict(
             (key, str(getattr(self, key)))

elasticai/creator/nn/vhdl/linear/layer.py → elasticai/creator/nn/linear/layer.py

@@ -7,8 +7,8 @@
 from elasticai.creator.base_modules.two_complement_fixed_point_config import (
     FixedPointConfig,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
 
 from .design import FPLinear as FPLinearDesign
 

elasticai/creator/nn/vhdl/precomputed/fp_monotonic_increasing_module.py → elasticai/creator/nn/precomputed/fp_monotonic_increasing_module.py

@@ -11,11 +11,11 @@
 from elasticai.creator.base_modules.two_complement_fixed_point_config import (
     FixedPointConfig,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
-from elasticai.creator.hdl.vhdl.designs.precomputed_monotonic_increasing_scalar_function import (
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.designs.precomputed_monotonic_increasing_scalar_function import (
     PrecomputedMonotonicIncreasingScalarFunction,
 )
+from elasticai.creator.vhdl.translatable import Translatable
 
 
 class FPPrecomputedMonotonicIncreasingModule(torch.nn.Module, Translatable):

elasticai/creator/nn/vhdl/relu/design.py → elasticai/creator/nn/relu/design.py

@@ -1,10 +1,10 @@
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import create_port
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     module_to_package,
 )
-from elasticai.creator.hdl.design_base.design import Design, Port
-from elasticai.creator.hdl.savable import Path
+from elasticai.creator.vhdl.design_base.design import Design, Port
+from elasticai.creator.vhdl.savable import Path
 
 
 class FPReLU(Design):

elasticai/creator/nn/vhdl/relu/layer.py → elasticai/creator/nn/relu/layer.py

@@ -1,6 +1,6 @@
 from elasticai.creator.base_modules.relu import ReLU
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
 
 from .design import FPReLU as FPReLUDesign
 

elasticai/creator/nn/vhdl/sequential/design.py → elasticai/creator/nn/sequential/design.py

@@ -1,20 +1,23 @@
 from functools import partial, reduce
 from itertools import chain
 
-from elasticai.creator.hdl.auto_wire_protocols.autowiring import AutoWirer, DataFlowNode
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import create_port
-from elasticai.creator.hdl.code_generation.template import (
-    InProjectTemplate,
-    module_to_package,
+from elasticai.creator.vhdl.auto_wire_protocols.autowiring import (
+    AutoWirer,
+    DataFlowNode,
 )
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.design_base.ports import Port
-from elasticai.creator.hdl.savable import Path
-from elasticai.creator.hdl.vhdl.code_generation import create_instance
-from elasticai.creator.hdl.vhdl.code_generation.code_generation import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import create_port
+from elasticai.creator.vhdl.code_generation.code_abstractions import (
     create_connections_using_to_from_pairs,
+    create_instance,
     create_signal_definitions,
 )
+from elasticai.creator.vhdl.code_generation.template import (
+    InProjectTemplate,
+    module_to_package,
+)
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.design_base.ports import Port
+from elasticai.creator.vhdl.savable import Path
 
 
 class Sequential(Design):

elasticai/creator/nn/vhdl/sequential/layer.py → elasticai/creator/nn/sequential/layer.py

@@ -3,9 +3,10 @@
 
 import torch
 
-from elasticai.creator.hdl.design_base.design import Design
-from elasticai.creator.hdl.translatable import Translatable
-from elasticai.creator.nn.vhdl.sequential.design import Sequential as _SequentialDesign
+from elasticai.creator.vhdl.design_base.design import Design
+from elasticai.creator.vhdl.translatable import Translatable
+
+from .design import Sequential as _SequentialDesign
 
 
 class Sequential(Translatable, torch.nn.Sequential):

elasticai/creator/on_disk_path.py

@@ -1,8 +1,8 @@
 import os
 from pathlib import Path as _PyPath
 
-from elasticai.creator.hdl.code_generation.template import Template, TemplateExpander
-from elasticai.creator.hdl.savable import File, Path
+from elasticai.creator.vhdl.code_generation.template import Template, TemplateExpander
+from elasticai.creator.vhdl.savable import File, Path
 
 
 class OnDiskFile(File):

elasticai/creator/hdl/auto_wire_protocols/port_definitions.py → elasticai/creator/vhdl/auto_wire_protocols/port_definitions.py

@@ -1,13 +1,11 @@
 from typing import Optional, cast
 
-from elasticai.creator.hdl.code_generation.code_generation import (
-    calculate_address_width,
-)
-from elasticai.creator.hdl.code_generation.vhdl_ports import (
+from elasticai.creator.vhdl.code_generation.addressable import calculate_address_width
+from elasticai.creator.vhdl.code_generation.vhdl_ports import (
     template_string_for_port_definition,
 )
-from elasticai.creator.hdl.design_base import std_signals as _signals
-from elasticai.creator.hdl.design_base.ports import Port
+from elasticai.creator.vhdl.design_base import std_signals as _signals
+from elasticai.creator.vhdl.design_base.ports import Port
 
 
 def create_port(

elasticai/creator/hdl/vhdl/base_template_generator/base_template_generator.py → elasticai/creator/vhdl/base_template_generator/base_template_generator.py

@@ -1,7 +1,7 @@
-from elasticai.creator.hdl.auto_wire_protocols.port_definitions import (
+from elasticai.creator.vhdl.auto_wire_protocols.port_definitions import (
     port_definition_template_for_bufferless_design,
 )
-from elasticai.creator.hdl.code_generation.template import (
+from elasticai.creator.vhdl.code_generation.template import (
     InProjectTemplate,
     TemplateExpander,
     module_to_package,

elasticai/creator/hdl/code_generation/code_generation.py → elasticai/creator/vhdl/code_generation/addressable.py

@@ -3,7 +3,3 @@
 
 def calculate_address_width(num_items: int) -> int:
     return max(1, math.ceil(math.log2(num_items)))
-
-
-def to_hex(number: int, bit_width: int) -> str:
-    return f"{number:0{math.ceil(bit_width / 4)}x}"