da4ml 0.4.0__py3-none-any.whl → 0.5.0b0__py3-none-any.whl

da4ml/trace/tracer.py

@@ -7,8 +7,8 @@ from uuid import UUID
 
 import numpy as np
 
-from ..cmvm.types import Op, QInterval, Solution
-from .fixed_variable import FixedVariable, _const_f
+from ..cmvm.types import CombLogic, Op, QInterval
+from .fixed_variable import FixedVariable, _const_f, table_context
 from .fixed_variable_array import FixedVariableArray
 
 
@@ -51,6 +51,19 @@ def _comb_trace(inputs: Sequence[FixedVariable], outputs: Sequence[FixedVariable
     variables, index = gather_variables(inputs, outputs)
     ops: list[Op] = []
     inp_uuids = {v.id: i for i, v in enumerate(inputs)}
+    lookup_tables = []
+
+    table_map: dict[int, int] = {}
+    for v in variables:
+        if not v.opr == 'lookup':
+            continue
+        assert v._data is not None
+        idx = int(v._data)
+        if idx in table_map:
+            continue
+        table_map[idx] = len(lookup_tables)
+        lookup_tables.append(table_context.get_table_from_index(idx))
+
     for i, v in enumerate(variables):
         if v.id in inp_uuids and v.opr != 'const':
             id0 = inp_uuids[v.id]
@@ -109,22 +122,33 @@ def _comb_trace(inputs: Sequence[FixedVariable], outputs: Sequence[FixedVariable
                 op = Op(id0, id1, opcode, data, qint, v.latency, v.cost)
             case 'vmul':
                 v0, v1 = v._from
+                opcode = 7
                 id0, id1 = index[v0.id], index[v1.id]
-                op = Op(id0, id1, 7, 0, v.unscaled.qint, v.latency, v.cost)
+                assert id0 < i and id1 < i, f'{id0} {id1} {i} {v.id}'
+                op = Op(id0, id1, opcode, 0, v.unscaled.qint, v.latency, v.cost)
+            case 'lookup':
+                opcode = 8
+                v0 = v._from[0]
+                id0 = index[v0.id]
+                data = v._data
+                assert data is not None, 'lookup must have data'
+                assert id0 < i, f'{id0} {i} {v.id}'
+                op = Op(id0, -1, opcode, table_map[int(data)], v.unscaled.qint, v.latency, v.cost)
             case _:
                 raise NotImplementedError(f'Operation "{v.opr}" is not supported in tracing')
 
         ops.append(op)
     out_index = [index[v.id] for v in outputs]
-    return ops, out_index
+    lookup_tables = None if not lookup_tables else tuple(lookup_tables)
+    return ops, out_index, lookup_tables
 
 
 @overload
-def comb_trace(inputs: Sequence[FixedVariable], outputs: Sequence[FixedVariable]) -> Solution: ...
+def comb_trace(inputs: Sequence[FixedVariable], outputs: Sequence[FixedVariable]) -> CombLogic: ...
 
 
 @overload
-def comb_trace(inputs: FixedVariableArray, outputs: FixedVariableArray) -> Solution: ...
+def comb_trace(inputs: FixedVariableArray, outputs: FixedVariableArray) -> CombLogic: ...
 
 
 def comb_trace(inputs, outputs):
@@ -138,14 +162,14 @@ def comb_trace(inputs, outputs):
             if not isinstance(v, FixedVariable):
                 outputs[i] = FixedVariable.from_const(v, hwconf, latency, 1)
 
-    ops, out_index = _comb_trace(inputs, outputs)
+    ops, out_index, lookup_tables = _comb_trace(inputs, outputs)
     shape = len(inputs), len(outputs)
     inp_shift = [0] * shape[0]
     out_sf = [v._factor for v in outputs]
     out_shift = [int(log2(abs(sf))) for sf in out_sf]
     out_neg = [sf < 0 for sf in out_sf]
 
-    sol = Solution(
+    sol = CombLogic(
         shape,
         inp_shift,
         out_index,
@@ -154,6 +178,7 @@ def comb_trace(inputs, outputs):
         ops,
         outputs[0].hwconf.carry_size,
         outputs[0].hwconf.adder_size,
+        lookup_tables,
     )
 
     ref_count = sol.ref_count

da4ml/typing/__init__.py

@@ -0,0 +1,3 @@
+from ..cmvm.api import solver_options_t
+
+__all__ = ['solver_options_t']

{da4ml-0.4.0.dist-info → da4ml-0.5.0b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: da4ml
-Version: 0.4.0
+Version: 0.5.0b0
 Summary: Distributed Arithmetic for Machine Learning
 Author-email: Chang Sun <chsun@cern.ch>
 License: GNU Lesser General Public License v3 (LGPLv3)
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: llvmlite>=0.44
 Requires-Dist: numba>=0.61
+Requires-Dist: quantizers<2,>=1
 Provides-Extra: docs
 Requires-Dist: hgq2; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"

{da4ml-0.4.0.dist-info → da4ml-0.5.0b0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-da4ml/__init__.py,sha256=IETRRvzsJvPMLu1kzzi8UN5FYaM5MhNaXH2A_ZKr2_w,469
-da4ml/_version.py,sha256=2_0GUP7yBCXRus-qiJKxQD62z172WSs1sQ6DVpPsbmM,704
-da4ml/cmvm/__init__.py,sha256=4Tbt913k9zP0w8R1p6Oss06v5jrManbUhskyHl6e-U0,154
-da4ml/cmvm/api.py,sha256=JpecMt6g8zutGh_uWT61_0iX8TuXct7-jq7N7HMIsgA,9626
-da4ml/cmvm/types.py,sha256=O8BuBZ2SyucxoXt_KbulAuHNgim7Ls3M6Ovw8prLgXM,21340
-da4ml/cmvm/core/__init__.py,sha256=bp2CXI4EOVOQSho1qwfusNs0RliZRt2dV0hZ33W_Kjo,7703
+da4ml/__init__.py,sha256=m8DvkkwIKMPE37S3H1qJxabwstMUOUAUL9TzrV3hZus,117
+da4ml/_version.py,sha256=n7iqgbpEf_-FhhfPmWgI0ybAcdLMRyOtzBWjQk6Ahug,712
+da4ml/cmvm/__init__.py,sha256=zGEQmYlZjWJdY1IhMtIYydWLDLoAogFprEefAZZP0bo,156
+da4ml/cmvm/api.py,sha256=fRMUgY4XjwFfvkIrWrfUXHdPjg720vlNK2sqcynvwOE,9820
+da4ml/cmvm/types.py,sha256=QGpE5bfVni_rTY4-D3Ubj-dRctCpULIrZm2aFY5V3_0,22102
+da4ml/cmvm/core/__init__.py,sha256=it5SXWpF3cSalS3OOmG3AY2vXuVerRMtI_7K__qc8uo,7705
 da4ml/cmvm/core/indexers.py,sha256=QjXgvExS-B2abHTJPDG4NufMdMEflo1i6cUhFOgJpH4,2945
 da4ml/cmvm/core/state_opr.py,sha256=wLqO8qVuM2-qCE5LDeYJDNkUruIPHy63obsv4-x-aR8,8661
 da4ml/cmvm/util/__init__.py,sha256=DkBlUEKA_Gu7n576ja_xZlAQfToWmNL9VXU-jmj6a-g,145
-da4ml/cmvm/util/bit_decompose.py,sha256=SUco70HRYf4r1JU6BXwcgabDrhm_yAmucae5FC67i4I,2216
+da4ml/cmvm/util/bit_decompose.py,sha256=0BPFFIwu3arog9NAvjWNURFAyHOstIWhq1dznhL4BkE,2264
 da4ml/cmvm/util/mat_decompose.py,sha256=eSJNlXwx_jxgqt5vLJrSLQaeq2ZXu8j9mC4d-eq883M,4094
 da4ml/codegen/__init__.py,sha256=ldMaaixWMxEpLS6skyAgpGCcIMVHdeRCNy57-JxGn3Y,161
 da4ml/codegen/hls/__init__.py,sha256=LkTtnKTGKX39-wpf7jb10BZ15-dpw4pIlQoATYfVOec,134
-da4ml/codegen/hls/hls_codegen.py,sha256=XuhdYnFVNkz5FoiIF31xAnU2THKKCBytPlGEiLjsIew,6514
-da4ml/codegen/hls/hls_model.py,sha256=mj6Oc5JaHA4ogJ3ISJ18XcqHBbJchy1muvSNUXbZEIQ,8988
+da4ml/codegen/hls/hls_codegen.py,sha256=q6bWp4StiQDAg8ukT-4lP5qvFsy_X9KPdxhBQatKhhc,6711
+da4ml/codegen/hls/hls_model.py,sha256=vun4iTX6CSRoa4xOhTGTiubrFa3ye01yl8ApKxQNJrk,9171
 da4ml/codegen/hls/source/binder_util.hh,sha256=ClECVxcEynE_9i4jWCV4y1dnadG3wFqLZfjxg4qHFQQ,1752
 da4ml/codegen/hls/source/build_binder.mk,sha256=RLu4TP28aJsveyMOHxuDRGEJVoIPMo9T8WyPtqnmtbQ,584
 da4ml/codegen/hls/source/vitis_bitshift.hh,sha256=u8wjT_cRn7bXcbC5pH3-rS76ekRbwv-VWAAdaP52-dw,765
@@ -33,44 +33,48 @@ da4ml/codegen/hls/source/ap_types/hls_stream.h,sha256=NTkVfbE48c6XnMIfR9WzJbDwUn
 da4ml/codegen/hls/source/ap_types/etc/ap_private.h,sha256=TDdxGIX0r3D6Ql8KeXoceRmHhdlwFA3Akr3-vvMVAtk,261465
 da4ml/codegen/hls/source/ap_types/utils/x_hls_utils.h,sha256=x24cf1HyZKv0J8YQIoUvYE3uw6SNL7vWetRGIiFm2Jw,2227
 da4ml/codegen/rtl/__init__.py,sha256=51VNqMc0JygphulBB4jjqeL9Sd18IUjGhkp2oyUDdnA,505
-da4ml/codegen/rtl/rtl_model.py,sha256=Kb3LwNIkQ6nC591xSU8z-BuemQYwfQk-Bc55LheIHnc,14318
+da4ml/codegen/rtl/rtl_model.py,sha256=m0ooEv6OR8hUlilOPYq0XSoMDsuI7SOKcG9C8dyy4h0,16372
 da4ml/codegen/rtl/common_source/binder_util.hh,sha256=gAcfnfzgDt2OudljfeQjtUtncNVjwRmEwu5VI7VSF6Q,2545
-da4ml/codegen/rtl/common_source/build_binder.mk,sha256=i1CsER5jtY3GmKJCw4H8f70vh_2_FJyNVt3FTLzdJf8,1386
-da4ml/codegen/rtl/common_source/build_prj.tcl,sha256=QkKZTJOsOfQxgDUmDw8vnrQvUluYWz_yI5VB3oyIzIo,3651
+da4ml/codegen/rtl/common_source/build_binder.mk,sha256=MIymsMRk0OEYCOrb9_lJRuGUtZbVJ86yFaCeGGgvQfg,1658
+da4ml/codegen/rtl/common_source/build_quartus_prj.tcl,sha256=nnMFMu_iN_O5dJyqlzz1q9qi0QjIOKtl_lR4ZHqFLHg,3155
+da4ml/codegen/rtl/common_source/build_vivado_prj.tcl,sha256=DX_JsYYwOpvOMXSwJoJ-deUiM-r1qXbSPtVPW13fgCk,4237
 da4ml/codegen/rtl/common_source/ioutil.hh,sha256=QXiHbOfkprOL6b-gBQGwcEOQ39uO-bRxKxwObluiK44,3967
-da4ml/codegen/rtl/common_source/template.xdc,sha256=GlSRy8tw_orohSuUwUSNEYJLLkAAHttGTfLTcQqRQDg,1262
-da4ml/codegen/rtl/verilog/__init__.py,sha256=ZMFGN7atMF98kDVbbUm8dGPr0C8D8ZBfVUJnDOMEn4o,238
-da4ml/codegen/rtl/verilog/comb.py,sha256=9pyZ5n-wefj_yoRaQxxbpY7HAlTZYUx2JY2hrBqgPwU,7174
-da4ml/codegen/rtl/verilog/io_wrapper.py,sha256=8uSBMFbWRzSsxe7rP3yJLhiXm-MBwk5cyrLBqnantYE,5045
-da4ml/codegen/rtl/verilog/pipeline.py,sha256=Qd_6pJOWN9yzxFhWGnsGlfxDQIEfVx4KTCbzYmwgjD0,2420
+da4ml/codegen/rtl/common_source/template.sdc,sha256=_hb-fwZopC84_I2qkhxPOw6mvc5vC7jat4tGUtg6u4w,1148
+da4ml/codegen/rtl/common_source/template.xdc,sha256=0wVPQ37qQduDbcwb3MoWdlrJ1Cg7Or4JDzl8C3BVNGM,1281
+da4ml/codegen/rtl/verilog/__init__.py,sha256=WfBJ_pZ3EFZaWPEfGpa0SPrNQa2DWNfwGRTNqKwA5hY,274
+da4ml/codegen/rtl/verilog/comb.py,sha256=D5WYtKWOgyAQlp5re4NvCh6_kQG0RZiMJeCziZQa9h4,8450
+da4ml/codegen/rtl/verilog/io_wrapper.py,sha256=eczzKDQHQRwEa-3uR5JYmvEjg8kno193Z_bxu7zs6ds,5025
+da4ml/codegen/rtl/verilog/pipeline.py,sha256=8Vj0o3ujI-VxCJC3VPXkkB3_fkQkf_A4fiiWG1gVgzs,2424
+da4ml/codegen/rtl/verilog/source/lookup_table.v,sha256=9Va5FBQfe3V6HGlz1vUL1ZPUhzhnkvOfMLmnr5kyx7M,476
 da4ml/codegen/rtl/verilog/source/multiplier.v,sha256=MfgRYi7jYPp4W94KLKWpc2MPu2Dg9CDiQ3lJizSIlIQ,1122
 da4ml/codegen/rtl/verilog/source/mux.v,sha256=1PMSQKGR_Cku1EQnePBVCuX6we_dqYBXW54WBEURvs0,1928
 da4ml/codegen/rtl/verilog/source/negative.v,sha256=YRfXVxyVQ1vu6LPCWrFzCsAFJxVIQZGZgwCoTOrMXlw,762
 da4ml/codegen/rtl/verilog/source/shift_adder.v,sha256=qrpXBX9bhHI-o75v5zshOfq0giEATvbeGgTir20_S3Q,1915
 da4ml/codegen/rtl/vhdl/__init__.py,sha256=ZMFGN7atMF98kDVbbUm8dGPr0C8D8ZBfVUJnDOMEn4o,238
-da4ml/codegen/rtl/vhdl/comb.py,sha256=F6CZbL3XnQUS-ILmF3ubTX_G62kMt1xMQJZEFymCgF8,8272
-da4ml/codegen/rtl/vhdl/io_wrapper.py,sha256=tdwIHWv5WnADPHxgAQmk4_qRldkeI7icRbkaneAkt-w,5322
-da4ml/codegen/rtl/vhdl/pipeline.py,sha256=tjMYreqo1eHIepdOqX71GYePDLYjlsuphotpw19faKA,2641
+da4ml/codegen/rtl/vhdl/comb.py,sha256=FKnr70OBOOUhg8GsSG9lMj--URBFt6lwYhPx0eI2TUk,8198
+da4ml/codegen/rtl/vhdl/io_wrapper.py,sha256=g1_a0fBFBrismudx77nfZoQWKHTf47j4vz8KAKL_Tsg,5315
+da4ml/codegen/rtl/vhdl/pipeline.py,sha256=q-7MOYczLYAK-MDg4XhmBGQlffIpnXKtIWGFOz-4uOw,2645
+da4ml/codegen/rtl/vhdl/source/lookup_table.vhd,sha256=lcZzyMZOOpn0vrX4qt-ZqHgT4FfmnFlS0s-jI1dBqCE,1518
 da4ml/codegen/rtl/vhdl/source/multiplier.vhd,sha256=Hx63VZy_nVrv7qokwz50fTQVB7LbSBpfRKXhv4lXRAQ,1323
 da4ml/codegen/rtl/vhdl/source/mux.vhd,sha256=tN8XbK0kD71arjEU--tidtWFpmdyxT37E7HLRC0zMYw,3442
 da4ml/codegen/rtl/vhdl/source/negative.vhd,sha256=rTOGEdbONDcpWmOw_g3BTr3f5rZEFIhoG_0X0c_Q2NQ,1019
 da4ml/codegen/rtl/vhdl/source/shift_adder.vhd,sha256=pIBchIa0zXmRcqwGF308_TEzh6aWOTboTEir6lMiSrE,3455
-da4ml/codegen/rtl/vhdl/source/template.xdc,sha256=GlSRy8tw_orohSuUwUSNEYJLLkAAHttGTfLTcQqRQDg,1262
-da4ml/converter/__init__.py,sha256=x7J2PEXYZsVWffRAkucLxbwzzU404eaijMdLwdhBxtY,57
+da4ml/converter/__init__.py,sha256=V_CfqjG4B1r0tFLqcaRB_CyyYQbrPj3cTzgFXwrODs8,1790
 da4ml/converter/hgq2/__init__.py,sha256=-gnT_7zXY-KQtPLxsqngwDKZ2TUIynn996pUjjB03B8,59
-da4ml/converter/hgq2/parser.py,sha256=Yc5V-B_aEslqIXXJihRi3GMjF9vMkmUQ2_yHMGHMPVo,5573
-da4ml/converter/hgq2/replica.py,sha256=aKi6BF2x4s3VUF1Q-__GE4-is9eSC3H8TGFDT05vTWc,16292
+da4ml/converter/hgq2/parser.py,sha256=R4exrC8B-hlw3MQ0rE9iosmmN2hH7AcHOudmZQ6PVXw,4903
+da4ml/converter/hgq2/replica.py,sha256=IBveVY8IncWfIP1jJgdYr4aM0yxpshyr8ryBDSFQN-c,22310
 da4ml/trace/__init__.py,sha256=dv-rti3t8iE0RqeThfOb40mAg8FZB2WkkGQq3enJft0,282
-da4ml/trace/fixed_variable.py,sha256=7vaXFZToCVzPtUZcHv4aoqpqJp46SHUzSWTQijVT0os,21101
-da4ml/trace/fixed_variable_array.py,sha256=mJj9aU-jLCPVkFXrTbcRQndtUKEuhVwiFUGVSGX7PHE,12975
-da4ml/trace/pipeline.py,sha256=AVeO9BNpQlo_WO6S1nQl7RxiHs5VFRR10tWMg_36C2o,5354
-da4ml/trace/tracer.py,sha256=xnaVO4oTWwasfiEBqqeY9o60Lek3eX65IIbvB7JtVKQ,6099
-da4ml/trace/ops/__init__.py,sha256=fz5Cg7ZQqPkZlUj4bIOKY6aaoA1fX_G22TeA8I1n4qY,2166
+da4ml/trace/fixed_variable.py,sha256=NeqQ2Bcyu4dQwI6mkhm5uz-foWNZg4u3B8I5-xAQFG0,28398
+da4ml/trace/fixed_variable_array.py,sha256=Ec8WVJ28K8WgcqdBhbuAkv2LnOq4RUBlkvqo2tlTsNs,21473
+da4ml/trace/pipeline.py,sha256=sqWDX3TvD439ayTBQVEbr1Nj2FFl-l7oMxyvVqKG1bA,6188
+da4ml/trace/tracer.py,sha256=YLOhxbCNkmFI79sIB1xo9S8W43yEL4eXfDsdNRWYuz4,7078
+da4ml/trace/ops/__init__.py,sha256=RiWQTfO6aD1NEZFqU2qgGXEeRW88NH3hdGbFOxdsTrA,2823
 da4ml/trace/ops/conv_utils.py,sha256=Yn73t4F6Tcs1hBwK08L1DPOin2HYVcng4PSkU4vuZFo,8245
 da4ml/trace/ops/einsum_utils.py,sha256=ODofbvR98FwKBTDZsJ0ObbMjU9_GjPu5AbGuWX6sdCY,11453
-da4ml/trace/ops/reduce_utils.py,sha256=vQjEUUbvnW8inAYJWHDzgy-PbgwIdHlH-uzPzSEvrSc,3494
-da4ml-0.4.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-da4ml-0.4.0.dist-info/METADATA,sha256=TbsF6SmOrTNwmH7r9yAjpzfIiRJCUpYgbDADHtqvMfM,4059
-da4ml-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-da4ml-0.4.0.dist-info/top_level.txt,sha256=N0tnKVwRqFiffFdeAzCgFq71hUNySh5-ITbNd6-R58Q,6
-da4ml-0.4.0.dist-info/RECORD,,
+da4ml/trace/ops/reduce_utils.py,sha256=FE0S6nrZYqww4LxspU-jXfBaNFN614NpZ-98UVnVfdg,3480
+da4ml/typing/__init__.py,sha256=9w6s4LZi7wGIqaRs3rLioPXsf6lErYdo1_rHTqGqb2Q,72
+da4ml-0.5.0b0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+da4ml-0.5.0b0.dist-info/METADATA,sha256=a2XAdDSsp752Xp58RfwW09ReycZfHGhiewmZfDuPxVM,4093
+da4ml-0.5.0b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+da4ml-0.5.0b0.dist-info/top_level.txt,sha256=N0tnKVwRqFiffFdeAzCgFq71hUNySh5-ITbNd6-R58Q,6
+da4ml-0.5.0b0.dist-info/RECORD,,

da4ml/codegen/rtl/vhdl/source/template.xdc

@@ -1,32 +0,0 @@
-set clock_period ${CLOCK_PERIOD}
-
-# Clock uncertainty as percentage of clock period
-set uncertainty_setup_r ${UNCERTAINITY_SETUP}
-set uncertainty_hold_r ${UNCERTAINITY_HOLD}
-set delay_max_r ${DELAY_MAX}
-set delay_min_r ${DELAY_MIN}
-
-# Calculate actual uncertainty values
-set uncertainty_setup [expr {$clock_period * $uncertainty_setup_r}]
-set uncertainty_hold [expr {$clock_period * $uncertainty_hold_r}]
-set delay_max [expr {$clock_period * $delay_max_r}]
-set delay_min [expr {$clock_period * $delay_min_r}]
-
-# Create clock with variable period
-create_clock -period $clock_period -name sys_clk [get_ports {clk}]
-
-# Input/Output constraints
-set_input_delay -clock sys_clk -max $delay_max [get_ports {inp[*]}]
-set_input_delay -clock sys_clk -min $delay_min [get_ports {inp[*]}]
-
-set_output_delay -clock sys_clk -max $delay_max [get_ports {out[*]}]
-set_output_delay -clock sys_clk -min $delay_min [get_ports {out[*]}]
-
-# Apply calculated uncertainty values
-set_clock_uncertainty -setup $uncertainty_setup [get_clocks sys_clk]
-set_clock_uncertainty -hold $uncertainty_hold [get_clocks sys_clk]
-
-set_property HD.CLK_SRC BUFG_X0Y0 [get_ports clk]
-
-set_property retiming_forward 1 [get_cells {stage[*]_inp}]
-set_property retiming_backward 1 [get_cells {stage[*]_inp}]