diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5004144..247c7569 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,6 +70,12 @@ jobs: python -m pip install numpy scipy cython python -m pip install 'git+https://github.com/qutip/qutip.git${{ matrix.qutip-version }}' + # For qutip-v5 qutip.control is replaced by qutip-qtrl + - name: Install qutip-qtrl from PyPI + if: ${{ matrix.qutip-version == '@master'}} + run: | + python -m pip install qutip-qtrl + - name: Install Qiskit from PyPI if: ${{ matrix.qiskit-version != '' }} run: python -m pip install 'qiskit${{ matrix.qiskit-version }}' diff --git a/src/qutip_qip/pulse.py b/src/qutip_qip/pulse.py index e9e9ea7e..b25c9d02 100644 --- a/src/qutip_qip/pulse.py +++ b/src/qutip_qip/pulse.py @@ -652,7 +652,7 @@ def _fill_coeff(old_coeffs, old_tlist, full_tlist, args=None, tol=1.0e-10): old_coeffs = np.concatenate([old_coeffs, [0]]) new_n = len(full_tlist) old_ind = 0 # index for old coeffs and tlist - new_coeff = np.zeros(new_n) + new_coeff = np.zeros(new_n, dtype=old_coeffs.dtype) for new_ind in range(new_n): t = full_tlist[new_ind] if old_tlist[0] - t > tol: