remove shots and add reno

Author: t-imamichi

qiskit/primitives/backend_estimator_v2.py

@@ -238,7 +238,6 @@ def _preprocess_pub(self, pub: EstimatorPub) -> _PreprocessedData:
         param_indices = np.fromiter(np.ndindex(param_shape), dtype=object).reshape(param_shape)
         bc_param_ind, bc_obs = np.broadcast_arrays(param_indices, observables)
 
-        # calculate expectation values for each pair of parameter value set and pauli
         param_obs_map = defaultdict(set)
         for index in np.ndindex(*bc_param_ind.shape):
             param_index = bc_param_ind[index]

qiskit/primitives/statevector_sampler.py

@@ -199,7 +199,7 @@ def _run_pub(self, pub: SamplerPub) -> SamplerPubResult:
         }
         return SamplerPubResult(
             DataBin(**meas, shape=pub.shape),
-            metadata={"shots": pub.shots, "circuit_metadata": pub.circuit.metadata},
+            metadata={"circuit_metadata": pub.circuit.metadata},
         )
 
 

releasenotes/notes/update-primitive-v2-metadata-cf1226e2d6477688.yaml

@@ -0,0 +1,6 @@
+---
+features_primitives:
+  - |
+    The metadata of Primitives V2 implementations, i.e., :class:`.StatevectorSampler`,
+    :class:`.StatevectorEstimator`, :class:`.BackendSamplerV2` and :class:`.BackendEstimatorV2`,
+    has been updated to match that of IBM quantum devices.

test/python/primitives/test_statevector_sampler.py

@@ -381,8 +381,6 @@ def test_run_with_shots_option(self):
             self.assertEqual(len(result), 1)
             self.assertEqual(result[0].data.meas.num_shots, shots)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), shots)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], shots)
 
         with self.subTest("default shots"):
             sampler = StatevectorSampler(seed=self._seed)
@@ -391,8 +389,6 @@ def test_run_with_shots_option(self):
             self.assertEqual(len(result), 1)
             self.assertEqual(result[0].data.meas.num_shots, default_shots)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), default_shots)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], default_shots)
 
         with self.subTest("setting default shots"):
             default_shots = 100
@@ -402,26 +398,20 @@ def test_run_with_shots_option(self):
             self.assertEqual(len(result), 1)
             self.assertEqual(result[0].data.meas.num_shots, default_shots)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), default_shots)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], default_shots)
 
         with self.subTest("pub-like"):
             sampler = StatevectorSampler(seed=self._seed)
             result = sampler.run([(bell, None, shots)]).result()
             self.assertEqual(len(result), 1)
             self.assertEqual(result[0].data.meas.num_shots, shots)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), shots)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], shots)
 
         with self.subTest("pub"):
             sampler = StatevectorSampler(seed=self._seed)
             result = sampler.run([SamplerPub(bell, shots=shots)]).result()
             self.assertEqual(len(result), 1)
             self.assertEqual(result[0].data.meas.num_shots, shots)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), shots)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], shots)
 
         with self.subTest("multiple pubs"):
             sampler = StatevectorSampler(seed=self._seed)
@@ -437,13 +427,9 @@ def test_run_with_shots_option(self):
             self.assertEqual(len(result), 2)
             self.assertEqual(result[0].data.meas.num_shots, shots1)
             self.assertEqual(sum(result[0].data.meas.get_counts().values()), shots1)
-            self.assertIn("shots", result[0].metadata)
-            self.assertEqual(result[0].metadata["shots"], shots1)
 
             self.assertEqual(result[1].data.meas.num_shots, shots2)
             self.assertEqual(sum(result[1].data.meas.get_counts().values()), shots2)
-            self.assertIn("shots", result[1].metadata)
-            self.assertEqual(result[1].metadata["shots"], shots2)
 
     def test_run_shots_result_size(self):
         """test with shots option to validate the result size"""
@@ -647,8 +633,8 @@ def test_metadata(self):
 
         self.assertEqual(len(result), 2)
         self.assertIsInstance(result.metadata, dict)
-        self.assertEqual(result[0].metadata, {"shots": 10, "circuit_metadata": qc.metadata})
-        self.assertEqual(result[1].metadata, {"shots": 10, "circuit_metadata": qc2.metadata})
+        self.assertEqual(result[0].metadata, {"circuit_metadata": qc.metadata})
+        self.assertEqual(result[1].metadata, {"circuit_metadata": qc2.metadata})
 
 
 if __name__ == "__main__":