@@ -176,12 +176,15 @@ def test_least_squares_xeb_fidelity_from_expectations():
176
176
exact_expectations_log .append (np .sum (probabilities * np .log (dim * probabilities )))
177
177
uniform_expectations_log .append (np .mean (np .log (dim * probabilities )))
178
178
179
- f_lin , r_lin = cirq .experiments .least_squares_xeb_fidelity_from_expectations (
180
- measured_expectations_lin , exact_expectations_lin , [1.0 ] * n_circuits
181
- )
182
- f_log , r_log = cirq .experiments .least_squares_xeb_fidelity_from_expectations (
183
- measured_expectations_log , exact_expectations_log , uniform_expectations_log
184
- )
179
+ with cirq .testing .assert_deprecated (
180
+ 'Use cirq.experiments.xeb_fitting' , deadline = 'v0.16' , count = 2
181
+ ):
182
+ f_lin , r_lin = cirq .experiments .least_squares_xeb_fidelity_from_expectations (
183
+ measured_expectations_lin , exact_expectations_lin , [1.0 ] * n_circuits
184
+ )
185
+ f_log , r_log = cirq .experiments .least_squares_xeb_fidelity_from_expectations (
186
+ measured_expectations_log , exact_expectations_log , uniform_expectations_log
187
+ )
185
188
186
189
assert np .isclose (f_lin , 1 - depolarization , atol = 0.01 )
187
190
assert np .isclose (f_log , 1 - depolarization , atol = 0.01 )
@@ -192,9 +195,11 @@ def test_least_squares_xeb_fidelity_from_expectations():
192
195
193
196
194
197
def test_least_squares_xeb_fidelity_from_expectations_bad_length ():
195
- with pytest .raises (ValueError ) as exception_info :
196
- _ = cirq .experiments .least_squares_xeb_fidelity_from_expectations ([1.0 ], [1.0 ], [1.0 , 2.0 ])
197
- assert '1, 1, and 2' in str (exception_info .value )
198
+ with pytest .raises (ValueError , match = '1, 1, and 2' ):
199
+ with cirq .testing .assert_deprecated ('Use cirq.experiments.xeb_fitting' , deadline = 'v0.16' ):
200
+ _ = cirq .experiments .least_squares_xeb_fidelity_from_expectations (
201
+ [1.0 ], [1.0 ], [1.0 , 2.0 ]
202
+ )
198
203
199
204
200
205
def test_least_squares_xeb_fidelity_from_probabilities ():
@@ -221,15 +226,19 @@ def test_least_squares_xeb_fidelity_from_probabilities():
221
226
all_probabilities .append (probabilities )
222
227
observed_probabilities .append (probabilities [bitstrings ])
223
228
224
- f_lin , r_lin = cirq .least_squares_xeb_fidelity_from_probabilities (
225
- dim , observed_probabilities , all_probabilities , None , True
226
- )
227
- f_log_np , r_log_np = cirq .least_squares_xeb_fidelity_from_probabilities (
228
- dim , observed_probabilities , all_probabilities , np .log , True
229
- )
230
- f_log_math , r_log_math = cirq .least_squares_xeb_fidelity_from_probabilities (
231
- dim , observed_probabilities , all_probabilities , math .log , False
232
- )
229
+ # 2 deprecation warnings for each of the following
230
+ with cirq .testing .assert_deprecated (
231
+ 'Use cirq.experiments.xeb_fitting' , deadline = 'v0.16' , count = 6
232
+ ):
233
+ f_lin , r_lin = cirq .least_squares_xeb_fidelity_from_probabilities (
234
+ dim , observed_probabilities , all_probabilities , None , True
235
+ )
236
+ f_log_np , r_log_np = cirq .least_squares_xeb_fidelity_from_probabilities (
237
+ dim , observed_probabilities , all_probabilities , np .log , True
238
+ )
239
+ f_log_math , r_log_math = cirq .least_squares_xeb_fidelity_from_probabilities (
240
+ dim , observed_probabilities , all_probabilities , math .log , False
241
+ )
233
242
234
243
assert np .isclose (f_lin , 1 - depolarization , atol = 0.01 )
235
244
assert np .isclose (f_log_np , 1 - depolarization , atol = 0.01 )
0 commit comments