chore: use program.remove_quil_t_instructions

forest/benchmarking/observable_estimation.py

@@ -17,7 +17,7 @@
 import networkx as nx
 from networkx.algorithms.approximation.clique import clique_removal
 from pyquil import Program
-from pyquil.api import QuantumComputer
+from pyquil.api import QuantumComputer, QVM
 from pyquil.gates import RX, RZ, MEASURE, RESET
 from pyquil.quilbase import Delay
 from pyquil.paulis import PauliTerm, sI, is_identity
@@ -901,13 +901,8 @@ def estimate_observables(qc: QuantumComputer, obs_expt: ObservablesExperiment,
     programs, meas_qubits = generate_experiment_programs(obs_expt, active_reset)
     for prog, meas_qs, settings in zip(tqdm(programs, disable=not show_progress_bar), meas_qubits,
                                        obs_expt):
-        # Remove `Delay` instructions for qvm-bound executions,
-        # where Quil-T instructions are not supported.
-        if 'qvm' in qc.name:
-            prog.instructions = [
-                instruction for instruction in prog.instructions
-                if not isinstance(instruction, Delay)
-            ]
+        if isinstance(qc.qam, QVM):
+            prog = prog.remove_quilt_instructions()
 
         results = qc.run_symmetrized_readout(prog, num_shots, symm_type, meas_qs or [0])