iqm-benchmarks 2.23__tar.gz → 2.25__tar.gz

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog
 =========
 
+Version 2.25
+============
+* Added optional configuration parameter (`max_circuits_per_batch`) to specify the maximum amount of circuits per batch.
+
+Version 2.24
+============
+* Added rustworkx dependency range to fix wrong edge thickness assignment in qubit selection plot.
+
 Version 2.23
 ============
 * Added dynamical decoupling parameter option to configurations of all benchmarks.

{iqm_benchmarks-2.23/src/iqm_benchmarks.egg-info → iqm_benchmarks-2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.23
+Version: 2.25
 Summary: A package for implementation of Quantum Characterization, Verification and Validation (QCVV) techniques on IQM's hardware at gate level abstraction
 Author-email: IQM Finland Oy <developers@meetiqm.com>, Adrian Auer <adrian.auer@meetiqm.com>, Raphael Brieger <raphael.brieger@meetiqm.com>, Alessio Calzona <alessio.calzona@meetiqm.com>, Pedro Figueroa Romero <pedro.romero@meetiqm.com>, Amin Hosseinkhani <amin.hosseinkhani@meetiqm.com>, Miikka Koistinen <miikka@meetiqm.com>, Nadia Milazzo <nadia.milazzo@meetiqm.com>, Vicente Pina Canelles <vicente.pina@meetiqm.com>, Aniket Rath <aniket.rath@meetiqm.com>, Jami Rönkkö <jami@meetiqm.com>, Stefan Seegerer <stefan.seegerer@meetiqm.com>
 Project-URL: Homepage, https://github.com/iqm-finland/iqm-benchmarks
@@ -16,6 +16,7 @@ Requires-Dist: matplotlib<4,>=3.6.3
 Requires-Dist: more-itertools<11.0.0,>=10.1.0
 Requires-Dist: mthree<2.7,>=2.6
 Requires-Dist: networkx<4.0,>=3.3
+Requires-Dist: rustworkx>=0.15.1
 Requires-Dist: numpy<2.0,>=1.25.2
 Requires-Dist: qiskit<2.0,>=1.0
 Requires-Dist: qiskit-iqm<16.0,>=15.1
@@ -193,7 +194,7 @@ EXAMPLE_MRB = MirrorRBConfiguration(
 )
 
 EXAMPLE_QV = QuantumVolumeConfiguration(
-    num_circuits=500,
+    num_circuits=800,
     shots=2**8,
     calset_id=None,
     num_sigmas=2,
@@ -203,7 +204,8 @@ EXAMPLE_QV = QuantumVolumeConfiguration(
     optimize_sqg=True,
     routing_method="sabre",
     physical_layout="fixed",
-    max_gates_per_batch=60_000,
+    max_circuits_per_batch=500,
+    max_gates_per_batch=60_000, # Will be used if it renders a smaller max batch size than max_circuits_per_batch
     rem=True,
     mit_shots=1_000,
 )

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/README.md

@@ -141,7 +141,7 @@ EXAMPLE_MRB = MirrorRBConfiguration(
 )
 
 EXAMPLE_QV = QuantumVolumeConfiguration(
-    num_circuits=500,
+    num_circuits=800,
     shots=2**8,
     calset_id=None,
     num_sigmas=2,
@@ -151,7 +151,8 @@ EXAMPLE_QV = QuantumVolumeConfiguration(
     optimize_sqg=True,
     routing_method="sabre",
     physical_layout="fixed",
-    max_gates_per_batch=60_000,
+    max_circuits_per_batch=500,
+    max_gates_per_batch=60_000, # Will be used if it renders a smaller max batch size than max_circuits_per_batch
     rem=True,
     mit_shots=1_000,
 )

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
     "more-itertools >= 10.1.0, < 11.0.0",
     "mthree >= 2.6, < 2.7",
     "networkx>=3.3, < 4.0",
+    "rustworkx>=0.15.1",
     "numpy >= 1.25.2, < 2.0",
     "qiskit >= 1.0, < 2.0",
     "qiskit-iqm >= 15.1, < 16.0",

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/requirements.txt

@@ -929,9 +929,9 @@ llvmlite==0.43.0 \
     --hash=sha256:e0a9a1a39d4bf3517f2af9d23d479b4175ead205c592ceeb8b89af48a327ea57 \
     --hash=sha256:eccce86bba940bae0d8d48ed925f21dbb813519169246e2ab292b5092aba121f \
     --hash=sha256:f99b600aa7f65235a5a05d0b9a9f31150c390f31261f2a0ba678e26823ec38f7
-lmfit==1.3.2 \
-    --hash=sha256:2b834f054cd7a5172f3b431345b292e5d95ea387d6f96d60ad35a11b8efee6ac \
-    --hash=sha256:31beeae1f027c1b8c14dcd7f2e8488a80b75fb389e77fca677549bdc2fe597bb
+lmfit==1.3.3 \
+    --hash=sha256:73321e6b881f2f686235721a7dfc02af6bb0f030a25efeb66638f62b1c6053a1 \
+    --hash=sha256:a9e9ec7d0d0ec962cc6c078ad1ec6c8311d3ac0e5f0947a00a91f5509dacc2b2
 markdown-it-py==3.0.0 \
     --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \
     --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
@@ -1505,38 +1505,38 @@ pyaml==25.1.0 \
 pycparser==2.22 \
     --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
     --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
-pycurl==7.45.4 \
-    --hash=sha256:0470bff6cc24d8c2f63c80931aa239463800871609dafc6bcc9ca10f5a12a04e \
-    --hash=sha256:1324a859b50bdb0abdbd5620e42f74240d0b7daf2d5925fa303695d9fc3ece18 \
-    --hash=sha256:13c4b18f44637859f34639493efd297a08670f45e4eec34ab2dcba724e3cb5fc \
-    --hash=sha256:13eb1643ab0bf4fdc539a2cdf1021029b07095d3196c5cee5a4271af268d3d31 \
-    --hash=sha256:236600bfe2cd72efe47333add621286667e8fa027dadf1247349afbf30333e95 \
-    --hash=sha256:247b4af8eab7d04137a7f1a98391930e04ea93dc669b64db5625070fe15f80a3 \
-    --hash=sha256:2548c3291a33c821f0f80bf9989fc43b5d90fb78b534a7015c8419b83c6f5803 \
-    --hash=sha256:26745c6c5ebdccfe8a828ac3fd4e6da6f5d2245696604f04529eb7894a02f4db \
-    --hash=sha256:32c8e237069273f4260b6ae13d1e0f99daae938977016021565dc6e11050e803 \
-    --hash=sha256:3452459668bd01d646385482362b021834a31c036aa1c02acd88924ddeff7d0d \
-    --hash=sha256:4f25d52c97dbca6ebea786f0961b49c1998fa05178abf1964a977c825b3d8ae6 \
-    --hash=sha256:561f88697f7540634b1c750146f37bdc0da367b15f6b4ab2bb780871ee6ab005 \
-    --hash=sha256:57971d7215fc6fdedcfc092f880a59f04f52fcaf2fd329151b931623d7b59a9c \
-    --hash=sha256:587a4891039803b5f48392066f97b7cd5e7e9a166187abb5cb4b4806fdb8fbef \
-    --hash=sha256:688d09ba2c6a0d4a749d192c43422839d73c40c85143c50cc65c944258fe0ba8 \
-    --hash=sha256:731c46e7c0acffaab19f7c2ecc3d9e7ee337500e87b260b4e0b9fae2d90fa133 \
-    --hash=sha256:73df3eb5940a7fbf4cf62f7271e9f23a8e9f80e352c838ee9a8448a70c01d3f5 \
-    --hash=sha256:9940e3234c1ca3d30f27a2202d325dbc25291605c98e9585100a351cacd935e8 \
-    --hash=sha256:9bd493ce598f1dc76c8e50043c47debec27c583fa313a836b2d3667640f875d5 \
-    --hash=sha256:a39f28f031885485325034918386be352036c220ca45625c7e286d3938eb579d \
-    --hash=sha256:acf25cfdaf914db21a2a6e9e274b6d95e3fa2b6018c38f2c58c94b5d8ac3d1b7 \
-    --hash=sha256:b0e38e3eb83b0c891f391853f798fc6a97cb5a86a4a731df0b6320e539ae54ae \
-    --hash=sha256:b485fdaf78553f0b8e1c2803bb7dcbe47a7b47594f846fc7e9d3b94d794cfc89 \
-    --hash=sha256:caec8b634763351dd4e1b729a71542b1e2de885d39710ba8e7202817a381b453 \
-    --hash=sha256:d14f954ecd21a070038d65ef1c6d1d3ab220f952ff703d48313123222097615c \
-    --hash=sha256:d192a48b3cec2e13ad432196b65c22e99620db92feae39c0476635354eff68c6 \
-    --hash=sha256:df5f94c051c5a163fa85064559ca94979575e2da26740ff91c078c50c541c465 \
-    --hash=sha256:e7ae49b88a5d57485fbabef004534225dfe04dc15716a61fae1a0c7f46f2279e \
-    --hash=sha256:f6c0e22052946bbfa25be67f9d1d6639eff10781c89f0cf6f3ff2099273d1bad \
-    --hash=sha256:fd167f73d34beb0cb8064334aee76d9bdd13167b30be6d5d36fb07d0c8223b71 \
-    --hash=sha256:ffd3262f98b8997ad04940061d5ebd8bab2362169b9440939c397e24a4a135b0
+pycurl==7.45.6 \
+    --hash=sha256:0cd6b7794268c17f3c660162ed6381769ce0ad260331ef49191418dfc3a2d61a \
+    --hash=sha256:1309fc0f558a80ca444a3a5b0bdb1572a4d72b195233f0e65413b4d4dd78809b \
+    --hash=sha256:26839d43dc7fff6b80e0067f185cc1d0e9be2ae6e2e2361ae8488cead5901c04 \
+    --hash=sha256:2a21e13278d7553a04b421676c458449f6c10509bebf04993f35154b06ee2b20 \
+    --hash=sha256:2b73e66b22719ea48ac08a93fc88e57ef36d46d03cb09d972063c9aa86bb74e6 \
+    --hash=sha256:2d1a49418b8b4c61f52e06d97b9c16142b425077bd997a123a2ba9ef82553203 \
+    --hash=sha256:334721ce1ccd71ff8e405470768b3d221b4393570ccc493fcbdbef4cd62e91ed \
+    --hash=sha256:3441ee77e830267aa6e2bb43b29fd5f8a6bd6122010c76a6f0bf84462e9ea9c7 \
+    --hash=sha256:357ea634395310085b9d5116226ac5ec218a6ceebf367c2451ebc8d63a6e9939 \
+    --hash=sha256:361bf94b2a057c7290f9ab84e935793ca515121fc012f4b6bef6c3b5e4ea4397 \
+    --hash=sha256:3fc0b505c37c7c54d88ced27e1d9e3241130987c24bf1611d9bbd9a3e499e07c \
+    --hash=sha256:56d1197eadd5774582b259cde4364357da71542758d8e917f91cc6ed7ed5b262 \
+    --hash=sha256:56f841b6f2f7a8b2d3051b9ceebd478599dbea3c8d1de8fb9333c895d0c1eea5 \
+    --hash=sha256:6f57ad26d6ab390391ad5030790e3f1a831c1ee54ad3bf969eb378f5957eeb0a \
+    --hash=sha256:7c09b7180799af70fc1d4eed580cfb1b9f34fda9081f73a3e3bc9a0e5a4c0e9b \
+    --hash=sha256:81005c0f681d31d5af694d1d3c18bbf1bed0bc8b2bb10fb7388cb1378ba9bd6a \
+    --hash=sha256:878ae64484db18f8f10ba99bffc83fefb4fe8f5686448754f93ec32fa4e4ee93 \
+    --hash=sha256:8a99e56d2575aa74c48c0cd08852a65d5fc952798f76a34236256d5589bf5aa0 \
+    --hash=sha256:942b352b69184cb26920db48e0c5cb95af39874b57dbe27318e60f1e68564e37 \
+    --hash=sha256:9f721e3394e5bd7079802ec1819b19c5be4842012268cc45afcb3884efb31cf0 \
+    --hash=sha256:a554a2813d415a7bb9a996a6298f3829f57e987635dcab9f1197b2dccd0ab3b2 \
+    --hash=sha256:a721c2696a71b1aa5ecf82e6d0ade64bc7211b7317f1c9c66e82f82e2264d8b4 \
+    --hash=sha256:abe1b204a2f96f2eebeaf93411f03505b46d151ef6d9d89326e6dece7b3a008a \
+    --hash=sha256:ae893144b82d72d95c932ebdeb81fc7e9fde758e5ecd5dd10ad5b67f34a8b8ee \
+    --hash=sha256:bb9eff0c7794af972da769a887c87729f1bcd8869297b1c01a2732febbb75876 \
+    --hash=sha256:c04230b9e9cfdca9cf3eb09a0bec6cf2f084640f1f1ca1929cca51411af85de2 \
+    --hash=sha256:c31b390f1e2cd4525828f1bb78c1f825c0aab5d1588228ed71b22c4784bdb593 \
+    --hash=sha256:c6fd295f03c928da33a00f56c91765195155d2ac6f12878f6e467830b5dce5f5 \
+    --hash=sha256:c872d4074360964697c39c1544fe8c91bfecbff27c1cdda1fee5498e5fdadcda \
+    --hash=sha256:d0b5501d527901369aba307354530050f56cd102410f2a3bacd192dc12c645e3 \
+    --hash=sha256:f0198ebcda8686b3a0c66d490a687fa5fd466f8ecc2f20a0ed0931579538ae3d
 pydantic==2.9.2 \
     --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
     --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
@@ -2075,19 +2075,18 @@ rpds-py==0.22.3 \
     --hash=sha256:fb6116dfb8d1925cbdb52595560584db42a7f664617a1f7d7f6e32f138cdf37d \
     --hash=sha256:fda7cb070f442bf80b642cd56483b5548e43d366fe3f39b98e67cce780cded00 \
     --hash=sha256:feea821ee2a9273771bae61194004ee2fc33f8ec7db08117ef9147d4bbcbca8e
-rustworkx==0.15.1 \
-    --hash=sha256:0e0cc86599f979285b2ab9c357276f3272f3fcb3b2df5651a6bf9704c570d4c1 \
-    --hash=sha256:241c502532e348ba89200823326dba30de4df4b886cb2fd5a140b359ff124bb3 \
-    --hash=sha256:308bc76a01bcae9af4602d8b9ed58021df37dd0bb5a7b2e3831ae53c5e234ff0 \
-    --hash=sha256:6ac68ae2515ece22ba3ef56f3d16ad6bf707955f650d623190b2e7d706c6dc92 \
-    --hash=sha256:6cd4496d3298cd3205c03545e48cc37d21e0455d57752af801d3fb250452d590 \
-    --hash=sha256:7834ab34748db6214ec3b3836b996b23882dc83184234e6d346d6bb85fd58ae5 \
-    --hash=sha256:7e5f4156f46fa03177c9b0580450eab87786063495d48b457762a5bdd20c55e2 \
-    --hash=sha256:89077382633e918d2392772f53b9d6d30eee51eb536f8d38ee195c212b2f0427 \
-    --hash=sha256:8b903edec1d803704b499959f9d6f6119cdda63b9b64194a4b4307e506b112f0 \
-    --hash=sha256:a2c97a56ff8a0f6c273a83e26e627c72207442b4252aa550acad0bff42caac40 \
-    --hash=sha256:cb518f5649e62d753e29ca1e57290c8f58adbebcd154dc3159f4a36ebfa1e2b7 \
-    --hash=sha256:ce53f173fed16e1d51d9df9f23475a16c981b03bf1a412d991c75a70db6b1dc1
+rustworkx==0.16.0 \
+    --hash=sha256:040c4368729cf502f756a3b0ff5f1c6915fc389f74dcc6afc6c3833688c97c01 \
+    --hash=sha256:0db3a73bf68b3e66c08322a2fc95d3aa663d037d9b4e49c3509da4898d3529cc \
+    --hash=sha256:293180b83509ee9bff4c3af7ccc1024f6528d61b65d0cb7320bd31924f10cb71 \
+    --hash=sha256:476a6c67b0142acd941691943750cc6737a48372304489969c2b62d30aaf4c27 \
+    --hash=sha256:4f12a13d7486234fa2a84746d5e41f436bf9df43548043e7a232f48804ff8c61 \
+    --hash=sha256:89efd5c3a4653ddacc55ca39f28b261d43deec7d678f8f8fc6b76b5087f1dfea \
+    --hash=sha256:905df608843c32fa45ac023687769fe13056edf7584474c801d5c50705d76e9b \
+    --hash=sha256:9f0dcb83f38d5ca2c3a683eb9b6951c8aec3262fbfe5141946a7ee5ba37e0bb6 \
+    --hash=sha256:bef2ef42870f806af93979b457e240f6dfa4f867ca33965c620f3a804409ed3a \
+    --hash=sha256:d650e39fc1a1534335f7517358ebfc3478bb235428463cfcd7c5750d50377b33 \
+    --hash=sha256:ec0c12aac8c54910ace20ac6ada4b890cd39f95f69100514715f8ad7af9041e4
 scikit-learn==1.6.1 \
     --hash=sha256:0650e730afb87402baa88afbf31c07b84c98272622aaba002559b614600ca691 \
     --hash=sha256:0c8d036eb937dbb568c6242fa598d551d88fb4399c0344d95c001980ec1c7d36 \
@@ -2428,9 +2427,9 @@ traitlets==5.14.3 \
 types-python-dateutil==2.9.0.20241206 \
     --hash=sha256:18f493414c26ffba692a72369fea7a154c502646301ebfe3d56a04b3767284cb \
     --hash=sha256:e248a4bc70a486d3e3ec84d0dc30eec3a5f979d6e7ee4123ae043eedbb987f53
-types-requests==2.32.0.20250301 \
-    --hash=sha256:0003e0124e2cbefefb88222ff822b48616af40c74df83350f599a650c8de483b \
-    --hash=sha256:3d909dc4eaab159c0d964ebe8bfa326a7afb4578d8706408d417e17d61b0c500
+types-requests==2.32.0.20250306 \
+    --hash=sha256:0962352694ec5b2f95fda877ee60a159abdf84a0fc6fdace599f20acb41a03d1 \
+    --hash=sha256:25f2cbb5c8710b2022f8bbee7b2b66f319ef14aeea2f35d80f18c9dbf3b60a0b
 typing-extensions==4.12.2 \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/benchmark.py

@@ -51,6 +51,7 @@ class BenchmarkBase(ABC):
         self.shots = self.configuration.shots
         self.calset_id = self.configuration.calset_id
         self.max_gates_per_batch = self.configuration.max_gates_per_batch
+        self.max_circuits_per_batch = self.configuration.max_circuits_per_batch
 
         self.routing_method = self.configuration.routing_method
         self.physical_layout = self.configuration.physical_layout
@@ -92,6 +93,8 @@ class BenchmarkConfigurationBase(BaseModel):
                 * Default for all benchmarks is 2**8.
         max_gates_per_batch (Optional[int]): the maximum number of gates per circuit batch.
                 * Default for all benchmarks is None.
+        max_circuits_per_batch (Optional[int]): the maximum number of circuits per batch.
+                * Default for all benchmarks is None.
         calset_id (Optional[str]): the calibration ID to use in circuit execution.
                 * Default for all benchmarks is None (uses last available calibration ID).
         routing_method (Literal["basic", "lookahead", "stochastic", "sabre", "none"]): the Qiskit routing method to use in transpilation.
@@ -100,13 +103,14 @@ class BenchmarkConfigurationBase(BaseModel):
                 - "fixed": physical layout is constrained during transpilation to the selected initial physical qubits.
                 - "batching": physical layout is allowed to use any other physical qubits, and circuits are batched according to final measured qubits.
                 * Default for all benchmarks is "fixed".
-        use_DD (bool): Boolean flag determining if dynamical decoupling is enabled during circuit execution
+        use_dd (bool): Boolean flag determining whether to enable dynamical decoupling during circuit execution.
             * Default: False
     """
 
     benchmark: Type[BenchmarkBase]
     shots: int = 2**8
     max_gates_per_batch: Optional[int] = None
+    max_circuits_per_batch: Optional[int] = None
     calset_id: Optional[str] = None
     routing_method: Literal["basic", "lookahead", "stochastic", "sabre", "none"] = "sabre"
     physical_layout: Literal["fixed", "batching"] = "fixed"

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/compressive_gst/compressive_gst.py

@@ -239,6 +239,7 @@ class CompressiveGST(Benchmark):
                 self.configuration.shots,
                 self.calset_id,
                 max_gates_per_batch=self.configuration.max_gates_per_batch,
+                max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                 circuit_compilation_options=self.circuit_compilation_options,
             )
             # Retrieve
@@ -255,6 +256,7 @@ class CompressiveGST(Benchmark):
                     self.configuration.shots,
                     self.calset_id,
                     max_gates_per_batch=self.configuration.max_gates_per_batch,
+                    max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                 )
             # Retrieve all
             qcvv_logger.info(f"Now executing the corresponding circuit batch")

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/entanglement/ghz.py

@@ -851,6 +851,7 @@ class GHZBenchmark(Benchmark):
                 self.shots,
                 self.calset_id,
                 max_gates_per_batch=self.max_gates_per_batch,
+                max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                 circuit_compilation_options=self.circuit_compilation_options,
             )
 

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/optimization/qscore.py

@@ -881,6 +881,7 @@ class QScoreBenchmark(Benchmark):
                         self.shots,
                         self.calset_id,
                         max_gates_per_batch=self.max_gates_per_batch,
+                        max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                         circuit_compilation_options=self.circuit_compilation_options,
                     )
                     qc_transpiled_list.append(transpiled_qc)

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/quantum_volume/clops.py

@@ -565,6 +565,7 @@ class CLOPSBenchmark(Benchmark):
             self.num_shots,
             self.calset_id,
             max_gates_per_batch=self.max_gates_per_batch,
+            max_circuits_per_batch=self.configuration.max_circuits_per_batch,
             circuit_compilation_options=self.circuit_compilation_options,
         )
 

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/quantum_volume/quantum_volume.py

@@ -26,7 +26,7 @@ from mthree.classes import QuasiCollection
 from mthree.utils import expval
 import numpy as np
 from qiskit.circuit.library import QuantumVolume
-from qiskit_aer import Aer
+from qiskit_aer import StatevectorSimulator
 import xarray as xr
 
 from iqm.benchmarks.benchmark import BenchmarkConfigurationBase
@@ -119,7 +119,7 @@ def get_ideal_heavy_outputs(
     """
     simulable_circuits = deepcopy(qc_list)
     ideal_heavy_outputs: List[Dict[str, float]] = []
-    ideal_simulator = Aer.get_backend("statevector_simulator")
+    ideal_simulator = StatevectorSimulator()
 
     # Separate according to sorted indices
     circuit_batches = {
@@ -698,6 +698,7 @@ class QuantumVolumeBenchmark(Benchmark):
             self.shots,
             self.calset_id,
             max_gates_per_batch=self.max_gates_per_batch,
+            max_circuits_per_batch=self.configuration.max_circuits_per_batch,
             circuit_compilation_options=self.circuit_compilation_options,
         )
         # qcvv_logger.info(

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/randomized_benchmarking/clifford_rb/clifford_rb.py

@@ -294,6 +294,7 @@ class CliffordRandomizedBenchmarking(Benchmark):
                         self.shots,
                         self.calset_id,
                         self.max_gates_per_batch,
+                        self.configuration.max_circuits_per_batch,
                     )
                 )
                 qcvv_logger.info(f"Job for sequence length {seq_length} submitted successfully!")
@@ -353,6 +354,7 @@ class CliffordRandomizedBenchmarking(Benchmark):
                         self.backend,
                         self.calset_id,
                         max_gates_per_batch=self.max_gates_per_batch,
+                        max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                         circuit_compilation_options=self.circuit_compilation_options,
                     )
                 )

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/randomized_benchmarking/interleaved_rb/interleaved_rb.py

@@ -407,6 +407,7 @@ class InterleavedRandomizedBenchmarking(Benchmark):
                         self.shots,
                         self.calset_id,
                         self.max_gates_per_batch,
+                        self.configuration.max_circuits_per_batch,
                     )
                 )
                 all_rb_jobs["interleaved"].append(
@@ -418,6 +419,7 @@ class InterleavedRandomizedBenchmarking(Benchmark):
                         self.shots,
                         self.calset_id,
                         self.max_gates_per_batch,
+                        self.configuration.max_circuits_per_batch,
                     )
                 )
                 qcvv_logger.info(f"Both jobs for sequence length {seq_length} submitted successfully!")
@@ -513,6 +515,7 @@ class InterleavedRandomizedBenchmarking(Benchmark):
                         backend,
                         self.calset_id,
                         max_gates_per_batch=self.max_gates_per_batch,
+                        max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                         circuit_compilation_options=self.circuit_compilation_options,
                     )
                 )
@@ -524,6 +527,7 @@ class InterleavedRandomizedBenchmarking(Benchmark):
                         backend,
                         self.calset_id,
                         max_gates_per_batch=self.max_gates_per_batch,
+                        max_circuits_per_batch=self.configuration.max_circuits_per_batch,
                         circuit_compilation_options=self.circuit_compilation_options,
                     )
                 )

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/randomized_benchmarking/mirror_rb/mirror_rb.py

@@ -662,6 +662,7 @@ class MirrorRandomizedBenchmarking(Benchmark):
             self.shots,
             self.calset_id,
             max_gates_per_batch=self.max_gates_per_batch,
+            max_circuits_per_batch=self.configuration.max_circuits_per_batch,
             circuit_compilation_options=self.circuit_compilation_options,
         )
         mrb_submit_results = {

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/randomized_benchmarking/randomized_benchmarking_common.py

@@ -439,6 +439,7 @@ def submit_parallel_rb_job(
     shots: int,
     calset_id: Optional[str],
     max_gates_per_batch: Optional[str],
+    max_circuits_per_batch: Optional[int],
 ) -> Dict[str, Any]:
     """Submit fixed-depth parallel MRB jobs for execution in the specified IQMBackend
     Args:
@@ -449,6 +450,7 @@ def submit_parallel_rb_job(
         shots (int): the number of shots to submit the job
         calset_id (Optional[str]): the calibration identifier
         max_gates_per_batch (Optional[str]): the maximum number of gates per batch to submit the job
+        max_circuits_per_batch (Optional[int]): the maximum number of circuits per batch to submit the job.
     Returns:
         Dict with qubit layout, submitted job objects, type (vanilla/DD) and submission time
     """
@@ -456,7 +458,12 @@ def submit_parallel_rb_job(
     # Send to execute on backend
     # pylint: disable=unbalanced-tuple-unpacking
     execution_jobs, time_submit = submit_execute(
-        sorted_transpiled_circuit_dicts, backend_arg, shots, calset_id, max_gates_per_batch=max_gates_per_batch
+        sorted_transpiled_circuit_dicts,
+        backend_arg,
+        shots,
+        calset_id,
+        max_gates_per_batch=max_gates_per_batch,
+        max_circuits_per_batch=max_circuits_per_batch,
     )
     rb_submit_results = {
         "qubits": qubits_array,
@@ -474,6 +481,7 @@ def submit_sequential_rb_jobs(
     backend_arg: str | IQMBackendBase,
     calset_id: Optional[str] = None,
     max_gates_per_batch: Optional[int] = None,
+    max_circuits_per_batch: Optional[int] = None,
     circuit_compilation_options: Optional[CircuitCompilationOptions] = None,
 ) -> List[Dict[str, Any]]:
     """Submit sequential RB jobs for execution in the specified IQMBackend
@@ -484,6 +492,7 @@ def submit_sequential_rb_jobs(
         backend_arg (IQMBackendBase): the IQM backend to submit the job
         calset_id (Optional[str]): the calibration identifier
         max_gates_per_batch (Optional[int]): the maximum number of gates per batch
+        max_circuits_per_batch (Optional[int]): the maximum number of circuits per batch
         circuit_compilation_options (Optional[CircuitCompilationOptions]): Compilation options passed to submit_execute
     Returns:
         Dict with qubit layout, submitted job objects, type (vanilla/DD) and submission time
@@ -504,6 +513,7 @@ def submit_sequential_rb_jobs(
             shots,
             calset_id,
             max_gates_per_batch,
+            max_circuits_per_batch=max_circuits_per_batch,
             circuit_compilation_options=circuit_compilation_options,
         )
         rb_submit_results[depth] = {

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm/benchmarks/utils.py

@@ -503,6 +503,7 @@ def submit_execute(
     shots: int,
     calset_id: Optional[str] = None,
     max_gates_per_batch: Optional[int] = None,
+    max_circuits_per_batch: Optional[int] = None,
     circuit_compilation_options: Optional[CircuitCompilationOptions] = None,
 ) -> List[IQMJob]:
     """Submit for execute a list of quantum circuits on the specified Backend.
@@ -511,10 +512,15 @@ def submit_execute(
         sorted_transpiled_qc_list (Dict[Tuple, List[QuantumCircuit]]): the list of quantum circuits to be executed.
         backend (IQMBackendBase): the backend to execute the circuits on.
         shots (int): the number of shots per circuit.
-        calset_id (Optional[str]): the calibration set ID, uses the latest one if None.
-        max_gates_per_batch (int): the maximum number of gates per batch sent to the backend, used to make manageable batches.
+        calset_id (Optional[str]): the calibration set ID.
+            * Default is None: uses the latest calibration ID.
+        max_gates_per_batch (Optional[int]): the maximum number of gates per batch sent to the backend, used to make manageable batches.
+            * Default is None.
+        max_circuits_per_batch (Optional[int]): the maximum number of circuits per batch sent to the backend, used to make manageable batches.
+            * Default is None.
         circuit_compilation_options (CircuitCompilationOptions): Ability to pass a compilation options object,
             enabling execution with dynamical decoupling, among other options - see qiskit-iqm documentation.
+            * Default is None.
     Returns:
         List[IQMJob]: the IQMJob objects of the executed circuits.
 
@@ -530,23 +536,41 @@ def submit_execute(
             f"Submitting batch with {len(sorted_transpiled_qc_list[k])} circuits corresponding to qubits {list(k)}"
         )
         # Divide into batches according to maximum gate count per batch
-        if max_gates_per_batch is None:
+        if max_gates_per_batch is None and max_circuits_per_batch is None:
             jobs = backend.run(sorted_transpiled_qc_list[k], shots=shots, calibration_set_id=calset_id)
             final_jobs.append(jobs)
+
         else:
-            # Calculate average gate count per quantum circuit
-            avg_gates_per_qc = sum(sum(qc.count_ops().values()) for qc in sorted_transpiled_qc_list[k]) / len(
-                sorted_transpiled_qc_list[k]
-            )
-            final_batch_jobs = []
-            for index, qc_batch in enumerate(
-                chunked(
-                    sorted_transpiled_qc_list[k],
-                    max(1, floor(max_gates_per_batch / avg_gates_per_qc)),
+            if max_gates_per_batch is None and max_circuits_per_batch is not None:
+                restriction = "max_circuits_per_batch"
+                batching_size = max_circuits_per_batch
+
+            elif max_circuits_per_batch is None and max_gates_per_batch is not None:
+                restriction = "max_gates_per_batch"
+                # Calculate average gate count per quantum circuit
+                avg_gates_per_qc = sum(sum(qc.count_ops().values()) for qc in sorted_transpiled_qc_list[k]) / len(
+                    sorted_transpiled_qc_list[k]
+                )
+                batching_size = max(1, floor(max_gates_per_batch / avg_gates_per_qc))
+
+            else:  # Both are not None - select the one rendering the smallest batches.
+                # Calculate average gate count per quantum circuit
+                avg_gates_per_qc = sum(sum(qc.count_ops().values()) for qc in sorted_transpiled_qc_list[k]) / len(
+                    sorted_transpiled_qc_list[k]
+                )
+                qcvv_logger.warning(
+                    "Both max_gates_per_batch and max_circuits_per_batch are not None. Selecting the one giving the smallest batches."
                 )
-            ):
+                batching_size = min(max_circuits_per_batch, max(1, floor(max_gates_per_batch / avg_gates_per_qc)))
+                if batching_size == max_circuits_per_batch:
+                    restriction = "max_circuits_per_batch"
+                else:
+                    restriction = "max_gates_per_batch"
+
+            final_batch_jobs = []
+            for index, qc_batch in enumerate(chunked(sorted_transpiled_qc_list[k], batching_size)):
                 qcvv_logger.info(
-                    f"max_gates_per_batch restriction: submitting subbatch #{index+1} with {len(qc_batch)} circuits corresponding to qubits {list(k)}"
+                    f"{restriction} restriction: submitting subbatch #{index + 1} with {len(qc_batch)} circuits corresponding to qubits {list(k)}"
                 )
                 batch_jobs = backend.run(
                     qc_batch,

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25/src/iqm_benchmarks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.23
+Version: 2.25
 Summary: A package for implementation of Quantum Characterization, Verification and Validation (QCVV) techniques on IQM's hardware at gate level abstraction
 Author-email: IQM Finland Oy <developers@meetiqm.com>, Adrian Auer <adrian.auer@meetiqm.com>, Raphael Brieger <raphael.brieger@meetiqm.com>, Alessio Calzona <alessio.calzona@meetiqm.com>, Pedro Figueroa Romero <pedro.romero@meetiqm.com>, Amin Hosseinkhani <amin.hosseinkhani@meetiqm.com>, Miikka Koistinen <miikka@meetiqm.com>, Nadia Milazzo <nadia.milazzo@meetiqm.com>, Vicente Pina Canelles <vicente.pina@meetiqm.com>, Aniket Rath <aniket.rath@meetiqm.com>, Jami Rönkkö <jami@meetiqm.com>, Stefan Seegerer <stefan.seegerer@meetiqm.com>
 Project-URL: Homepage, https://github.com/iqm-finland/iqm-benchmarks
@@ -16,6 +16,7 @@ Requires-Dist: matplotlib<4,>=3.6.3
 Requires-Dist: more-itertools<11.0.0,>=10.1.0
 Requires-Dist: mthree<2.7,>=2.6
 Requires-Dist: networkx<4.0,>=3.3
+Requires-Dist: rustworkx>=0.15.1
 Requires-Dist: numpy<2.0,>=1.25.2
 Requires-Dist: qiskit<2.0,>=1.0
 Requires-Dist: qiskit-iqm<16.0,>=15.1
@@ -193,7 +194,7 @@ EXAMPLE_MRB = MirrorRBConfiguration(
 )
 
 EXAMPLE_QV = QuantumVolumeConfiguration(
-    num_circuits=500,
+    num_circuits=800,
     shots=2**8,
     calset_id=None,
     num_sigmas=2,
@@ -203,7 +204,8 @@ EXAMPLE_QV = QuantumVolumeConfiguration(
     optimize_sqg=True,
     routing_method="sabre",
     physical_layout="fixed",
-    max_gates_per_batch=60_000,
+    max_circuits_per_batch=500,
+    max_gates_per_batch=60_000, # Will be used if it renders a smaller max batch size than max_circuits_per_batch
     rem=True,
     mit_shots=1_000,
 )

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm_benchmarks.egg-info/SOURCES.txt

@@ -93,4 +93,5 @@ tests/test_gst.py
 tests/test_qscore.py
 tests/test_qv.py
 tests/test_rb.py
-tests/unit/test_benchmark_circuit.py
+tests/unit/test_benchmark_circuit.py
+tests/unit/test_submit_execute.py

{iqm_benchmarks-2.23 → iqm_benchmarks-2.25}/src/iqm_benchmarks.egg-info/requires.txt

@@ -3,6 +3,7 @@ matplotlib<4,>=3.6.3
 more-itertools<11.0.0,>=10.1.0
 mthree<2.7,>=2.6
 networkx<4.0,>=3.3
+rustworkx>=0.15.1
 numpy<2.0,>=1.25.2
 qiskit<2.0,>=1.0
 qiskit-iqm<16.0,>=15.1

iqm_benchmarks-2.25/tests/unit/test_submit_execute.py

@@ -0,0 +1,172 @@
+import unittest
+from unittest.mock import Mock, patch, call
+
+from iqm.qiskit_iqm import IQMCircuit as QuantumCircuit
+from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
+from iqm.qiskit_iqm.iqm_job import IQMJob
+from iqm.iqm_client.models import CircuitCompilationOptions
+from iqm.benchmarks.utils import submit_execute
+
+
+
+class TestSubmitExecute(unittest.TestCase):
+    def setUp(self):
+        # Create mock backend
+        self.mock_backend = Mock(spec=IQMBackendBase)
+        self.mock_run_result = Mock(spec=IQMJob)
+        self.mock_backend.run.return_value = self.mock_run_result
+
+        # Create test circuits with varying gate counts
+        self.create_test_circuits()
+
+        # Create a dict mapping tuple keys to lists of circuits
+        self.sorted_circuits = {
+            (0, 1): self.qc_list_small,  # 10 circuits with 5 operations each
+            (2, 3): self.qc_list_large,  # 5 circuits with 12 operations each
+        }
+
+    def create_test_circuits(self):
+        # Small circuits (5 operations each)
+        self.qc_list_small = []
+        for _ in range(10):
+            qc = QuantumCircuit(2, 2)
+            qc.r(0.1, 0.2, 0)
+            qc.r(0.3, 0.4, 1)
+            qc.cz(0, 1)
+            qc.measure_all()
+            # Mock the count_ops method to return a fixed gate count
+            qc.count_ops = Mock(return_value={'r': 2, 'cz': 1, 'measure': 2})
+            self.qc_list_small.append(qc)
+
+        # Large circuits (12 operations each)
+        self.qc_list_large = []
+        for _ in range(5):
+            qc = QuantumCircuit(2, 2)
+            for _ in range(5):
+                qc.r(0.1, 0.2, 0)
+                qc.r(0.3, 0.4, 1)
+            qc.measure_all()
+            # Mock the count_ops method to return a fixed gate count
+            qc.count_ops = Mock(return_value={'r': 10, 'measure': 2})
+            self.qc_list_large.append(qc)
+
+    @patch('iqm.benchmarks.utils.qcvv_logger')
+    def test_submit_execute_no_restrictions(self, mock_logger):
+        """Test with no batch size restrictions."""
+        jobs,_ = submit_execute(self.sorted_circuits, self.mock_backend, shots=1000)
+
+        # Should return after first batch
+        self.assertEqual(len(jobs), 2)
+
+        # Check that backend.run was called with each circuit list
+        expected_calls = []
+        for key in self.sorted_circuits.keys():
+            expected_calls.append(call(
+                self.sorted_circuits[key], shots=1000, calibration_set_id=None
+            ))
+        self.mock_backend.run.assert_has_calls(expected_calls, any_order=True)
+
+    @patch('iqm.benchmarks.utils.qcvv_logger')
+    def test_submit_execute_max_circuits(self, mock_logger):
+        """Test with max_circuits_per_batch restriction."""
+
+        jobs, _ = submit_execute(
+            self.sorted_circuits,
+            self.mock_backend,
+            shots=1000,
+            max_circuits_per_batch=2
+        )
+
+        # Check that backend.run was called with correct batches
+        expected_calls = [
+            # First key (2,3) - 5 circuits in batches of 2
+            call(self.qc_list_large[0:2], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call(self.qc_list_large[2:4], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call([self.qc_list_large[4]], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            # Second key (0,1) - 10 circuits in batches of 2
+            call(self.qc_list_small[0:2], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call(self.qc_list_small[2:4], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call(self.qc_list_small[4:6], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call(self.qc_list_small[6:8], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+            call(self.qc_list_small[8:10], shots=1000, calibration_set_id=None, circuit_compilation_options=None),
+        ]
+
+        # Verify all calls were made and all circuits were used
+        self.mock_backend.run.assert_has_calls(expected_calls, any_order=True)
+        self.assertEqual(self.mock_backend.run.call_count, 8)
+
+    @patch('iqm.benchmarks.utils.qcvv_logger')
+    def test_submit_execute_max_gates(self, mock_logger):
+        """Test with max_gates_per_batch restriction."""
+
+        # Each small circuit has 5 operations, each large has 10
+        # Set max_gates_per_batch to a value that will test different batch sizes
+        jobs,_ = submit_execute(
+            self.sorted_circuits,
+            self.mock_backend,
+            shots=1000,
+            max_gates_per_batch=15
+        )
+
+        # For large circuits (12 operations each), batches should have 1 circuit per batch
+        # For small circuits (5 operations each), batches should have 3 circuits per batch
+
+        expected_batch_sizes_large = [1, 1, 1, 1, 1]  # 5 batches of 1 circuit
+        expected_batch_sizes_small = [3, 3, 3, 1]  # 3 batches of 3 circuits and one batch of one circuit
+
+        actual_batch_sizes = [len(args[0]) for args, _ in self.mock_backend.run.call_args_list]
+
+        # Verify we have the right number of batches
+        self.assertEqual(len(actual_batch_sizes),
+                         len(expected_batch_sizes_large) + len(expected_batch_sizes_small))
+
+        # Verify batch sizes match our expectations
+        self.assertEqual(actual_batch_sizes[4:], expected_batch_sizes_large)
+        self.assertEqual(actual_batch_sizes[:4], expected_batch_sizes_small)
+
+        # Check that all circuits were included
+        total_circuits = sum(actual_batch_sizes)
+        self.assertEqual(total_circuits, len(self.qc_list_large) + len(self.qc_list_small))
+
+    @patch('iqm.benchmarks.utils.qcvv_logger')
+    def test_submit_execute_both_restrictions(self, mock_logger):
+        """Test with both max_gates_per_batch and max_circuits_per_batch restrictions."""
+
+        jobs,_ = submit_execute(
+            self.sorted_circuits,
+            self.mock_backend,
+            shots=1000,
+            max_gates_per_batch=15,
+            max_circuits_per_batch=2
+        )
+
+        # For large circuits:
+        # - max_gates_per_batch=15 would allow 1 circuit per batch (12 operations each)
+        # - max_circuits_per_batch=2 would allow 2 circuits per batch
+        # Should use the more restrictive: 1 circuit per batch
+
+        # For small circuits:
+        # - max_gates_per_batch=15 would allow 3 circuits per batch (5 operations each)
+        # - max_circuits_per_batch=2 would allow 2 circuits per batch
+        # Should use the more restrictive: 2 circuits per batch
+
+        expected_batch_sizes_large = [1, 1, 1, 1, 1]  # 5 batches of 1 circuit
+        expected_batch_sizes_small = [2, 2, 2, 2, 2]  # 5 batches of 2 circuits
+
+        actual_batch_sizes = [len(args[0]) for args, _ in self.mock_backend.run.call_args_list]
+
+        # Verify batch sizes match our expectations
+        self.assertEqual(actual_batch_sizes[5:], expected_batch_sizes_large)
+        self.assertEqual(actual_batch_sizes[:5], expected_batch_sizes_small)
+
+        # Check that all circuits were included
+        total_circuits = sum(actual_batch_sizes)
+        self.assertEqual(total_circuits, len(self.qc_list_large) + len(self.qc_list_small))
+
+        # Verify batch sizes are within maximum limits
+        for batch_size in actual_batch_sizes:
+            # Circuits per batch should not exceed max_circuits_per_batch
+            self.assertLessEqual(batch_size, 2)
+
+if __name__ == '__main__':
+    unittest.main()