da4ml 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

da4ml/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.0'
-__version_tuple__ = version_tuple = (0, 4, 0)
+__version__ = version = '0.4.1'
+__version_tuple__ = version_tuple = (0, 4, 1)
 
 __commit_id__ = commit_id = None

da4ml/codegen/rtl/rtl_model.py

@@ -85,6 +85,7 @@ class RTLModel:
                 tcl = f.read()
             tcl = tcl.replace('${DEVICE}', self._part_name)
             tcl = tcl.replace('${PROJECT_NAME}', self._prj_name)
+            tcl = tcl.replace('${SOURCE_TYPE}', flavor)
             with open(self._path / 'build_prj.tcl', 'w') as f:
                 f.write(tcl)
 
@@ -94,8 +95,8 @@ class RTLModel:
             xdc = xdc.replace('${CLOCK_PERIOD}', str(self._clock_period))
             xdc = xdc.replace('${UNCERTAINITY_SETUP}', str(self._clock_uncertainty))
             xdc = xdc.replace('${UNCERTAINITY_HOLD}', str(self._clock_uncertainty))
-            xdc = xdc.replace('${DELAY_MAX}', str(self._io_delay_minmax[0]))
-            xdc = xdc.replace('${DELAY_MIN}', str(self._io_delay_minmax[1]))
+            xdc = xdc.replace('${DELAY_MAX}', str(self._io_delay_minmax[1]))
+            xdc = xdc.replace('${DELAY_MIN}', str(self._io_delay_minmax[0]))
             with open(self._path / f'{self._prj_name}.xdc', 'w') as f:
                 f.write(xdc)
 

da4ml/converter/hgq2/replica.py

@@ -94,7 +94,6 @@ class ReplayOperationBase(metaclass=ReplayOperationMeta):
 
     def __call__(self, *args, **kwargs) -> tuple[FixedVariableArray, ...]:
         assert all(not isinstance(a, FixedVariableArray) for a in kwargs.values())
-        assert all(isinstance(a, FixedVariableArray) or isinstance(a, Sequence) for a in args)
         inputs = args[0] if len(args) == 1 else args
 
         if not isinstance(self.op, hgq.layers.QLayerBase):
@@ -134,7 +133,7 @@ class ReplayOperationBase(metaclass=ReplayOperationMeta):
                 assert isinstance(layer.oq, Quantizer)
                 outputs = mirror_quantizer(layer.oq, outputs)
 
-        if isinstance(outputs, FixedVariableArray):
+        if isinstance(outputs, (FixedVariableArray, np.ndarray)):
             outputs = (outputs,)
 
         return outputs
@@ -193,7 +192,7 @@ class ReplayQBatchNormalization(ReplayOperationBase):
     def call(self, inputs: FixedVariableArray) -> FixedVariableArray:
         layer: QBatchNormalization = self.op
         scale, bias = map(np.array, layer.qscaler_and_qoffset)
-        shape = layer._shape
+        shape = layer._shape[1:]
         return inputs * scale.reshape(shape) + bias.reshape(shape)
 
 

{da4ml-0.4.0.dist-info → da4ml-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: da4ml
-Version: 0.4.0
+Version: 0.4.1
 Summary: Distributed Arithmetic for Machine Learning
 Author-email: Chang Sun <chsun@cern.ch>
 License: GNU Lesser General Public License v3 (LGPLv3)

{da4ml-0.4.0.dist-info → da4ml-0.4.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 da4ml/__init__.py,sha256=IETRRvzsJvPMLu1kzzi8UN5FYaM5MhNaXH2A_ZKr2_w,469
-da4ml/_version.py,sha256=2_0GUP7yBCXRus-qiJKxQD62z172WSs1sQ6DVpPsbmM,704
+da4ml/_version.py,sha256=k7cu0JKra64gmMNU_UfA5sw2eNc_GRvf3QmesiYAy8g,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
@@ -33,7 +33,7 @@ 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=8GY25qyW02vEb4br_pO2bXGwBiJKbEBYLkROnr4OYjs,14374
 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
@@ -59,7 +59,7 @@ da4ml/codegen/rtl/vhdl/source/template.xdc,sha256=GlSRy8tw_orohSuUwUSNEYJLLkAAHt
 da4ml/converter/__init__.py,sha256=x7J2PEXYZsVWffRAkucLxbwzzU404eaijMdLwdhBxtY,57
 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/replica.py,sha256=wBbLF_NqbfowdKw31AI-x2aud9PEjuGLcKvWSh3y5Vc,16215
 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
@@ -69,8 +69,8 @@ da4ml/trace/ops/__init__.py,sha256=fz5Cg7ZQqPkZlUj4bIOKY6aaoA1fX_G22TeA8I1n4qY,2
 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-0.4.1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+da4ml-0.4.1.dist-info/METADATA,sha256=7Tqk-kFr5sXBx6sjFY1NBvPsRXoU06j7p4IGlyqUkLs,4059
+da4ml-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+da4ml-0.4.1.dist-info/top_level.txt,sha256=N0tnKVwRqFiffFdeAzCgFq71hUNySh5-ITbNd6-R58Q,6
+da4ml-0.4.1.dist-info/RECORD,,