version bump for da4ml and hgq2

Author: calad0i

hls4ml/converters/keras_v3/hgq2/multi_head_attention.py

@@ -14,11 +14,11 @@
 
 
 class QMultiHeadAttentionHandler(QLayerHandler):
-    handles = ('hgq.layers.multi_head_attention.QMultiHeadAttention',)
+    handles = ('hgq.layers.attn.mha.QMultiHeadAttention',)
 
     def handle(
         self,
-        layer: 'hgq.layers.QMultiHeadAttention',
+        layer: 'hgq.layers.attn.mha.QMultiHeadAttention',
         in_tensors: Sequence['KerasTensor'],
         out_tensors: Sequence['KerasTensor'],
     ):
@@ -127,11 +127,11 @@ def _handle(self, layer, tensor_q, tensor_O, node_index, tensor_k, tensor_v):
 
 
 class QLinformerAttentionHandler(QMultiHeadAttentionHandler):
-    handles = ('hgq.layers.linformer_attention.QLinformerAttention',)
+    handles = ('hgq.layers.attn.linformer.QLinformerAttention',)
 
     def handle(
         self,
-        layer: 'hgq.layers.linformer_attention.QLinformerAttention',
+        layer: 'hgq.layers.attn.linformer.QLinformerAttention',
         in_tensors: Sequence['KerasTensor'],
         out_tensors: Sequence['KerasTensor'],
     ):

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dynamic = [ "version" ]
 dependencies = [ "h5py", "numpy", "pydigitalwavetools==1.1", "pyyaml", "quantizers" ]
-optional-dependencies.da = [ "da4ml>=0.5.2,<0.6" ]
+optional-dependencies.da = [ "da4ml>=0.6,<0.7" ]
 optional-dependencies.doc = [
   "sphinx",
   "sphinx-contributors",
@@ -35,7 +35,7 @@ optional-dependencies.doc = [
   "sphinx-tabs",
 ]
 optional-dependencies.hgq = [ "hgq>=0.2.3" ]
-optional-dependencies.hgq2 = [ "hgq2>=0.0.1" ]
+optional-dependencies.hgq2 = [ "hgq2>=0.1.8" ]
 optional-dependencies.keras-v3 = [ "keras>=3.10" ]
 optional-dependencies.onnx = [ "onnx>=1.4" ]
 optional-dependencies.optimization = [
@@ -67,8 +67,8 @@ optional-dependencies.testing-keras2 = [
   "tensorflow>=2.8,<=2.14.1",
 ]
 optional-dependencies.testing-keras3 = [
-  "da4ml",
-  "hgq2>=0.0.1",
+  "da4ml>=0.6,<0.7",
+  "hgq2>=0.1.8",
   "keras>=3.10",
   "tensorflow>=2.15",
 ]

test/pytest/test_hgq2_mha.py

@@ -12,9 +12,6 @@
 
 from hls4ml.converters import convert_from_keras_model
 
-# Current hgq2 release rejects the parallelization_factor kwarg that hls4ml passes; skip until supported.
-pytest.skip('Skip until hgq2 supports parallelization_factor in QEinsumDense', allow_module_level=True)
-
 test_path = Path(__file__).parent