diff --git a/.github/workflows/neko.yml b/.github/workflows/neko.yml index 980611fc61..18998a41ee 100644 --- a/.github/workflows/neko.yml +++ b/.github/workflows/neko.yml @@ -14,3 +14,4 @@ jobs: - uses: Qiskit/qiskit-neko@main with: test_selection: backend + repo_install_command: pip install -e . diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0fd9e38f2..2365cacebe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,8 +37,8 @@ jobs: - name: Run Lint run: | set -e - pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit/providers/aer - pylint -j 2 -rn qiskit/providers/aer + pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit_aer + pylint -j 2 -rn qiskit_aer sdist: runs-on: ${{ matrix.platform.os }} needs: ["lint"] @@ -120,6 +120,7 @@ jobs: - name: Run Tests run: | set -e + mv qiskit_aer qiskit_aer.bak pip check stestr run --slowest shell: bash @@ -165,6 +166,7 @@ jobs: - name: Run Tests run: | set -e + mv qiskit_aer qiskit_aer.bak pip check stestr run --slowest shell: bash @@ -203,6 +205,7 @@ jobs: - name: Run Tests run: | set -e + mv qiskit_aer qiskit_aer.bak pip check stestr run --slowest shell: bash @@ -248,6 +251,7 @@ jobs: PYTHONIOENCODING: 'utf-8:backslashreplace' run: | set -e + mv qiskit_aer qiskit_aer.bak chcp.com 65001 pip check stestr run --slowest diff --git a/.gitignore b/.gitignore index b9f9e0b431..29e2b2d579 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ rhs*_op.pyx *.whl *.egg* build/* -qiskit/providers/aer/backends/libomp.dylib +*libomp.dylib # Ignore macOS DS_Store .DS_Store diff --git a/.pylintrc b/.pylintrc index 4990f74814..c8443f43e8 100644 --- a/.pylintrc +++ b/.pylintrc @@ -296,7 +296,7 @@ ignore-mixin-members=yes # (useful for modules/projects where namespaces are manipulated during runtime # and thus existing member attributes cannot be deduced by static analysis. It # supports qualified module names, as well as Unix pattern matching. -ignored-modules=matplotlib.cm,numpy.random +ignored-modules=matplotlib.cm,numpy.random,qiskit.providers # List of class names for which member attributes should not be checked (useful # for classes with dynamically set attributes). This supports the use of diff --git a/CMakeLists.txt b/CMakeLists.txt index 85d54dfe35..82c6618ac2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # be linked statically per Apple's indications. cmake_minimum_required(VERSION 3.8 FATAL_ERROR) -file(STRINGS "qiskit/providers/aer/VERSION.txt" VERSION_NUM) +file(STRINGS "qiskit_aer/VERSION.txt" VERSION_NUM) include(CheckLanguage) project(qasm_simulator VERSION ${VERSION_NUM} LANGUAGES CXX C) @@ -327,7 +327,7 @@ set(AER_LIBRARIES set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES}) if(SKBUILD) # Terra Addon build set(AER_LIBRARIES ${AER_LIBRARIES} AER_DEPENDENCY_PKG::muparserx) - add_subdirectory(qiskit/providers/aer/backends/wrappers) + add_subdirectory(qiskit_aer/backends/wrappers) add_subdirectory(src/open_pulse) else() # Standalone build diff --git a/MANIFEST.in b/MANIFEST.in index 82b7947c16..573dc7656e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,18 +1,14 @@ include MANIFEST.in include README.md include pyproject.toml -recursive-include qiskit *pyx -recursive-include qiskit *pxd -recursive-include qiskit *.pxi -recursive-include qiskit *cpp -recursive-include qiskit *hpp +recursive-include qiskit_aer *cpp +recursive-include qiskit_aer *hpp graft src graft contrib -include qiskit/providers/aer/backends/wrappers/CMakeLists.txt -include qiskit/providers/aer/backends/wrappers/bindings.cc -include qiskit/providers/aer/pulse/qutip_extra_lite/cy/CMakeLists.txt -include qiskit/providers/aer/VERSION.txt -include qiskit/providers/aer/library/instructions_table.csv +include qiskit_aer/backends/wrappers/CMakeLists.txt +include qiskit_aer/backends/wrappers/bindings.cc +include qiskit_aer/VERSION.txt +include qiskit_aer/library/instructions_table.csv include CMakeLists.txt include cmake/*.cmake # Exclude static libraries (they are all compressed with 7z) diff --git a/README.md b/README.md index d79a99da89..13a620df5d 100755 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ $ python ```python import qiskit from qiskit import IBMQ -from qiskit.providers.aer import AerSimulator +from qiskit_aer import AerSimulator # Generate 3-qubit GHZ state circ = qiskit.QuantumCircuit(3) diff --git a/docs/apidocs/aer_extensions.rst b/docs/apidocs/aer_extensions.rst index 164b6e5801..e99f06474d 100644 --- a/docs/apidocs/aer_extensions.rst +++ b/docs/apidocs/aer_extensions.rst @@ -1,6 +1,6 @@ .. _aer-circuit-extensions: -.. automodule:: qiskit.providers.aer.extensions +.. automodule:: qiskit_aer.extensions :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/aer_jobs.rst b/docs/apidocs/aer_jobs.rst index ea9fbf8af0..513972aab3 100644 --- a/docs/apidocs/aer_jobs.rst +++ b/docs/apidocs/aer_jobs.rst @@ -1,6 +1,6 @@ .. _aer-jobs: -.. automodule:: qiskit.providers.aer.jobs +.. automodule:: qiskit_aer.jobs :no-members: :no-inherited-members: :no-special-members: diff --git a/docs/apidocs/aer_library.rst b/docs/apidocs/aer_library.rst index 1dc50571d4..4a2e8bc428 100644 --- a/docs/apidocs/aer_library.rst +++ b/docs/apidocs/aer_library.rst @@ -1,6 +1,6 @@ .. _aer-library: -.. automodule:: qiskit.providers.aer.library +.. automodule:: qiskit_aer.library :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/aer_noise.rst b/docs/apidocs/aer_noise.rst index c86b8036d9..a8c219cd79 100644 --- a/docs/apidocs/aer_noise.rst +++ b/docs/apidocs/aer_noise.rst @@ -1,6 +1,6 @@ .. _aer-noise: -.. automodule:: qiskit.providers.aer.noise +.. automodule:: qiskit_aer.noise :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/aer_provider.rst b/docs/apidocs/aer_provider.rst index 2661425968..5d49008777 100644 --- a/docs/apidocs/aer_provider.rst +++ b/docs/apidocs/aer_provider.rst @@ -1,6 +1,6 @@ .. _aer-provider: -.. automodule:: qiskit.providers.aer +.. automodule:: qiskit_aer :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/aer_pulse.rst b/docs/apidocs/aer_pulse.rst index 54069dccb5..37424762ff 100644 --- a/docs/apidocs/aer_pulse.rst +++ b/docs/apidocs/aer_pulse.rst @@ -1,6 +1,6 @@ .. _aer-pulse: -.. automodule:: qiskit.providers.aer.pulse +.. automodule:: qiskit_aer.pulse :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/aer_utils.rst b/docs/apidocs/aer_utils.rst index 222a4f5fc3..e43420bab9 100644 --- a/docs/apidocs/aer_utils.rst +++ b/docs/apidocs/aer_utils.rst @@ -1,6 +1,6 @@ .. _aer-utils: -.. automodule:: qiskit.providers.aer.utils +.. automodule:: qiskit_aer.utils :no-members: :no-inherited-members: - :no-special-members: \ No newline at end of file + :no-special-members: diff --git a/docs/apidocs/parallel.rst b/docs/apidocs/parallel.rst index 3bbb381eb3..4104b0d211 100644 --- a/docs/apidocs/parallel.rst +++ b/docs/apidocs/parallel.rst @@ -43,7 +43,7 @@ Example: Threadpool execution import qiskit from concurrent.futures import ThreadPoolExecutor - from qiskit.providers.aer import AerSimulator + from qiskit_aer import AerSimulator from math import pi # Generate circuit @@ -78,7 +78,7 @@ guard it by an ``if __name__ == "__main__":`` block. .. code-block:: python import qiskit - from qiskit.providers.aer import AerSimulator + from qiskit_aer import AerSimulator from dask.distributed import LocalCluster, Client from math import pi def q_exec(): diff --git a/docs/conf.py b/docs/conf.py index 79f60a7609..18ec14f960 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -123,7 +123,7 @@ # (e.g., if this is set to ['foo.'], then foo.bar is shown under B, not F). # This can be handy if you document a project that consists of a single # package. Works only for the HTML builder currently. -modindex_common_prefix = ['qiskit.providers'] +modindex_common_prefix = ['qiskit_aer'] # -- Configuration for extlinks extension ------------------------------------ # Refer to https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html diff --git a/qiskit/providers/aer/VERSION.txt b/qiskit_aer/VERSION.txt similarity index 100% rename from qiskit/providers/aer/VERSION.txt rename to qiskit_aer/VERSION.txt diff --git a/qiskit/providers/aer/__init__.py b/qiskit_aer/__init__.py similarity index 95% rename from qiskit/providers/aer/__init__.py rename to qiskit_aer/__init__.py index 3b908be241..c10d422966 100644 --- a/qiskit/providers/aer/__init__.py +++ b/qiskit_aer/__init__.py @@ -12,10 +12,10 @@ """ ========================================== -Aer Provider (:mod:`qiskit.providers.aer`) +Aer Provider (:mod:`qiskit_aer`) ========================================== -.. currentmodule:: qiskit.providers.aer +.. currentmodule:: qiskit_aer Simulator Provider ================== diff --git a/qiskit/providers/aer/aererror.py b/qiskit_aer/aererror.py similarity index 100% rename from qiskit/providers/aer/aererror.py rename to qiskit_aer/aererror.py diff --git a/qiskit/providers/aer/aerprovider.py b/qiskit_aer/aerprovider.py similarity index 100% rename from qiskit/providers/aer/aerprovider.py rename to qiskit_aer/aerprovider.py diff --git a/qiskit/providers/aer/backends/__init__.py b/qiskit_aer/backends/__init__.py similarity index 100% rename from qiskit/providers/aer/backends/__init__.py rename to qiskit_aer/backends/__init__.py diff --git a/qiskit/providers/aer/backends/aer_compiler.py b/qiskit_aer/backends/aer_compiler.py similarity index 100% rename from qiskit/providers/aer/backends/aer_compiler.py rename to qiskit_aer/backends/aer_compiler.py diff --git a/qiskit/providers/aer/backends/aer_simulator.py b/qiskit_aer/backends/aer_simulator.py similarity index 99% rename from qiskit/providers/aer/backends/aer_simulator.py rename to qiskit_aer/backends/aer_simulator.py index 823320f911..6a622a9f13 100644 --- a/qiskit/providers/aer/backends/aer_simulator.py +++ b/qiskit_aer/backends/aer_simulator.py @@ -70,7 +70,7 @@ class AerSimulator(AerBackend): The final state of the simulator can be saved to the returned ``Result`` object by appending the - :func:`~qiskit.providers.aer.library.save_state` instruction to a + :func:`~qiskit_aer.library.save_state` instruction to a quantum circuit. The format of the final state will depend on the simulation method used. Additional simulation data may also be saved using the other save instructions in :mod:`qiskit.provider.aer.library`. @@ -296,7 +296,7 @@ class AerSimulator(AerBackend): * ``stabilizer_max_snapshot_probabilities`` (int): set the maximum qubit number for the - `~qiskit.providers.aer.extensions.SnapshotProbabilities` + `~qiskit_aer.extensions.SnapshotProbabilities` instruction (Default: 32). These backend options only apply when using the ``"extended_stabilizer"`` diff --git a/qiskit/providers/aer/backends/aerbackend.py b/qiskit_aer/backends/aerbackend.py similarity index 100% rename from qiskit/providers/aer/backends/aerbackend.py rename to qiskit_aer/backends/aerbackend.py diff --git a/qiskit/providers/aer/backends/backend_utils.py b/qiskit_aer/backends/backend_utils.py similarity index 100% rename from qiskit/providers/aer/backends/backend_utils.py rename to qiskit_aer/backends/backend_utils.py diff --git a/qiskit/providers/aer/backends/compatibility.py b/qiskit_aer/backends/compatibility.py similarity index 100% rename from qiskit/providers/aer/backends/compatibility.py rename to qiskit_aer/backends/compatibility.py diff --git a/qiskit/providers/aer/backends/pulse_simulator.py b/qiskit_aer/backends/pulse_simulator.py similarity index 95% rename from qiskit/providers/aer/backends/pulse_simulator.py rename to qiskit_aer/backends/pulse_simulator.py index 93bea8730a..0145d68c13 100644 --- a/qiskit/providers/aer/backends/pulse_simulator.py +++ b/qiskit_aer/backends/pulse_simulator.py @@ -59,18 +59,18 @@ class PulseSimulator(AerBackend): The ``PulseSimulator`` simulates continuous time Hamiltonian dynamics of a quantum system, with controls specified by pulse :class:`~qiskit.Schedule` objects, and the model of the - physical system specified by :class:`~qiskit.providers.aer.pulse.PulseSystemModel` objects. + physical system specified by :class:`~qiskit_aer.pulse.PulseSystemModel` objects. Results are returned in the same format as when jobs are submitted to actual devices. **Examples** The minimal information a ``PulseSimulator`` needs to simulate is a - :class:`~qiskit.providers.aer.pulse.PulseSystemModel`, which can be supplied either by + :class:`~qiskit_aer.pulse.PulseSystemModel`, which can be supplied either by setting the backend option before calling ``run``, e.g.: .. code-block:: python - backend_sim = qiskit.providers.aer.PulseSimulator() + backend_sim = qiskit_aer.PulseSimulator() # Set the pulse system model for the simulator backend_sim.set_options(system_model=system_model) @@ -85,7 +85,7 @@ class PulseSimulator(AerBackend): .. code-block:: python - backend_sim = qiskit.providers.aer.PulseSimulator() + backend_sim = qiskit_aer.PulseSimulator() # Assemble schedules using PulseSimulator as the backend pulse_qobj = assemble(schedules, backend=backend_sim) @@ -99,21 +99,21 @@ class PulseSimulator(AerBackend): .. code-block:: python - armonk_sim = qiskit.providers.aer.PulseSimulator.from_backend(FakeArmonk()) + armonk_sim = qiskit_aer.PulseSimulator.from_backend(FakeArmonk()) pulse_qobj = assemble(schedules, backend=armonk_sim) armonk_sim.run(pulse_qobj) In the above example, the ``PulseSimulator`` copies all configuration and default data from ``FakeArmonk()``, and as such has the same affect as ``FakeArmonk()`` when passed as an argument to ``assemble``. Furthermore it constructs a - :class:`~qiskit.providers.aer.pulse.PulseSystemModel` from the model details in the supplied + :class:`~qiskit_aer.pulse.PulseSystemModel` from the model details in the supplied backend, which is then used in simulation. **Supported PulseQobj parameters** * ``qubit_lo_freq``: Local oscillator frequencies for each :class:`DriveChannel`. Defaults to either the value given in the - :class:`~qiskit.providers.aer.pulse.PulseSystemModel`, or is calculated directly + :class:`~qiskit_aer.pulse.PulseSystemModel`, or is calculated directly from the Hamiltonian. * ``meas_level``: Type of desired measurement output, in ``[1, 2]``. ``1`` gives complex numbers (IQ values), and ``2`` gives discriminated states ``|0>`` and @@ -138,7 +138,7 @@ class PulseSimulator(AerBackend): The simulator uses the ``zvode`` differential equation solver method through ``scipy``. Simulation is performed in the rotating frame of the diagonal of the drift Hamiltonian - contained in the :class:`~qiskit.providers.aer.pulse.PulseSystemModel`. Measurements + contained in the :class:`~qiskit_aer.pulse.PulseSystemModel`. Measurements are performed in the `dressed basis` of the drift Hamiltonian. **Other options** diff --git a/qiskit/providers/aer/backends/qasm_simulator.py b/qiskit_aer/backends/qasm_simulator.py similarity index 99% rename from qiskit/providers/aer/backends/qasm_simulator.py rename to qiskit_aer/backends/qasm_simulator.py index 23ad8a4927..904192198d 100644 --- a/qiskit/providers/aer/backends/qasm_simulator.py +++ b/qiskit_aer/backends/qasm_simulator.py @@ -195,7 +195,7 @@ class QasmSimulator(AerBackend): * ``stabilizer_max_snapshot_probabilities`` (int): set the maximum qubit number for the - `~qiskit.providers.aer.extensions.SnapshotProbabilities` + `~qiskit_aer.extensions.SnapshotProbabilities` instruction (Default: 32). These backend options only apply when using the ``"extended_stabilizer"`` diff --git a/qiskit/providers/aer/backends/statevector_simulator.py b/qiskit_aer/backends/statevector_simulator.py similarity index 100% rename from qiskit/providers/aer/backends/statevector_simulator.py rename to qiskit_aer/backends/statevector_simulator.py diff --git a/qiskit/providers/aer/backends/unitary_simulator.py b/qiskit_aer/backends/unitary_simulator.py similarity index 100% rename from qiskit/providers/aer/backends/unitary_simulator.py rename to qiskit_aer/backends/unitary_simulator.py diff --git a/qiskit/providers/aer/backends/wrappers/CMakeLists.txt b/qiskit_aer/backends/wrappers/CMakeLists.txt similarity index 93% rename from qiskit/providers/aer/backends/wrappers/CMakeLists.txt rename to qiskit_aer/backends/wrappers/CMakeLists.txt index 6cbed9513d..c66eb1a434 100644 --- a/qiskit/providers/aer/backends/wrappers/CMakeLists.txt +++ b/qiskit_aer/backends/wrappers/CMakeLists.txt @@ -43,7 +43,7 @@ target_include_directories(controller_wrappers PRIVATE ${AER_SIMULATOR_CPP_SRC_D PRIVATE ${AER_SIMULATOR_CPP_EXTERNAL_LIBS}) target_link_libraries(controller_wrappers ${AER_LIBRARIES}) target_compile_definitions(controller_wrappers PRIVATE ${AER_COMPILER_DEFINITIONS}) -install(TARGETS controller_wrappers LIBRARY DESTINATION qiskit/providers/aer/backends) +install(TARGETS controller_wrappers LIBRARY DESTINATION qiskit_aer/backends) # Install redistributable dependencies -install(FILES ${BACKEND_REDIST_DEPS} DESTINATION qiskit/providers/aer/backends) +install(FILES ${BACKEND_REDIST_DEPS} DESTINATION qiskit_aer/backends) diff --git a/qiskit/providers/aer/backends/wrappers/bindings.cc b/qiskit_aer/backends/wrappers/bindings.cc similarity index 100% rename from qiskit/providers/aer/backends/wrappers/bindings.cc rename to qiskit_aer/backends/wrappers/bindings.cc diff --git a/qiskit/providers/aer/extensions/__init__.py b/qiskit_aer/extensions/__init__.py similarity index 90% rename from qiskit/providers/aer/extensions/__init__.py rename to qiskit_aer/extensions/__init__.py index dc31e6e534..4911b12244 100644 --- a/qiskit/providers/aer/extensions/__init__.py +++ b/qiskit_aer/extensions/__init__.py @@ -12,10 +12,10 @@ """ =========================================================== -Circuit Extensions (:mod:`qiskit.providers.aer.extensions`) +Circuit Extensions (:mod:`qiskit_aer.extensions`) =========================================================== -.. currentmodule:: qiskit.providers.aer.extensions +.. currentmodule:: qiskit_aer.extensions Snapshots ========= @@ -25,7 +25,7 @@ Adding nonlocal noise to a noise model is deprecated as of qiskit-aer 0.9.0 and will be removed no earlier than 3 months from that release date. They have been superceded by the save instructions in the - :mod:`qiskit.providers.aer.library` module. + :mod:`qiskit_aer.library` module. Snapshot instructions allow taking a snapshot of the current state of the simulator without effecting the outcome of the simulation. These can be diff --git a/qiskit/providers/aer/extensions/snapshot.py b/qiskit_aer/extensions/snapshot.py similarity index 99% rename from qiskit/providers/aer/extensions/snapshot.py rename to qiskit_aer/extensions/snapshot.py index 4af22b1eaf..b196f614c4 100644 --- a/qiskit/providers/aer/extensions/snapshot.py +++ b/qiskit_aer/extensions/snapshot.py @@ -49,7 +49,7 @@ def __init__(self, This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the save instructions in - :mod:`qiskit.providers.aer.library` module. + :mod:`qiskit_aer.library` module. """ warn('The `Snapshot` instruction will be deprecated in the' ' future. It has been superseded by the `SaveStatevector`' diff --git a/qiskit/providers/aer/extensions/snapshot_density_matrix.py b/qiskit_aer/extensions/snapshot_density_matrix.py similarity index 95% rename from qiskit/providers/aer/extensions/snapshot_density_matrix.py rename to qiskit_aer/extensions/snapshot_density_matrix.py index ccfcdf9c50..dd817c74eb 100644 --- a/qiskit/providers/aer/extensions/snapshot_density_matrix.py +++ b/qiskit_aer/extensions/snapshot_density_matrix.py @@ -36,7 +36,7 @@ def __init__(self, label, num_qubits): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.SaveDensityMatrix` instruction. + :class:`qiskit_aer.library.SaveDensityMatrix` instruction. """ warn('The `SnapshotDensityMatrix` instruction has been deprecated as of' ' qiskit-aer 0.9. It has been superseded by the `SaveDensityMatrix`' @@ -64,7 +64,7 @@ def snapshot_density_matrix(self, label, qubits=None): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.save_density_matrix` + :class:`qiskit_aer.library.save_density_matrix` circuit method. """ warn('The `snapshot_density_matrix` circuit method has been deprecated as of' diff --git a/qiskit/providers/aer/extensions/snapshot_expectation_value.py b/qiskit_aer/extensions/snapshot_expectation_value.py similarity index 95% rename from qiskit/providers/aer/extensions/snapshot_expectation_value.py rename to qiskit_aer/extensions/snapshot_expectation_value.py index 655092ee4f..8e977efe5e 100644 --- a/qiskit/providers/aer/extensions/snapshot_expectation_value.py +++ b/qiskit_aer/extensions/snapshot_expectation_value.py @@ -43,8 +43,8 @@ def __init__(self, label, op, single_shot=False, variance=False): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.SaveExpectationValue` and - :class:`qiskit.providers.aer.library.SaveExpectationValueVariance` + :class:`qiskit_aer.library.SaveExpectationValue` and + :class:`qiskit_aer.library.SaveExpectationValueVariance` instructions. """ warn('The `SnapshotExpectationValue` instruction has been deprecated as of' @@ -152,8 +152,8 @@ def snapshot_expectation_value(self, label, op, qubits, This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :func:`qiskit.providers.aer.library.save_expectation_value` and - :func:`qiskit.providers.aer.library.save_expectation_value_variance` + :func:`qiskit_aer.library.save_expectation_value` and + :func:`qiskit_aer.library.save_expectation_value_variance` circuit methods. """ warn('The `snapshot_expectation_value` circuit method has been deprecated as of' diff --git a/qiskit/providers/aer/extensions/snapshot_probabilities.py b/qiskit_aer/extensions/snapshot_probabilities.py similarity index 91% rename from qiskit/providers/aer/extensions/snapshot_probabilities.py rename to qiskit_aer/extensions/snapshot_probabilities.py index 1e38298087..9db5ca4960 100644 --- a/qiskit/providers/aer/extensions/snapshot_probabilities.py +++ b/qiskit_aer/extensions/snapshot_probabilities.py @@ -37,8 +37,8 @@ def __init__(self, label, num_qubits, variance=False): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.SaveProbabilities` and - :class:`qiskit.providers.aer.library.SaveProbabilitiesDict` + :class:`qiskit_aer.library.SaveProbabilities` and + :class:`qiskit_aer.library.SaveProbabilitiesDict` instructions. """ warn('The `SnapshotProbabilities` instruction has been deprecated as of' @@ -69,8 +69,8 @@ def snapshot_probabilities(self, label, qubits, variance=False): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :func:`qiskit.providers.aer.library.save_probabilities` and - :func:`qiskit.providers.aer.library.save_probabilities_dict` + :func:`qiskit_aer.library.save_probabilities` and + :func:`qiskit_aer.library.save_probabilities_dict` circuit methods. """ warn('The `snapshot_probabilities` circuit method has been deprecated as of' diff --git a/qiskit/providers/aer/extensions/snapshot_stabilizer.py b/qiskit_aer/extensions/snapshot_stabilizer.py similarity index 95% rename from qiskit/providers/aer/extensions/snapshot_stabilizer.py rename to qiskit_aer/extensions/snapshot_stabilizer.py index bcf71f175f..dd4e923bab 100644 --- a/qiskit/providers/aer/extensions/snapshot_stabilizer.py +++ b/qiskit_aer/extensions/snapshot_stabilizer.py @@ -42,7 +42,7 @@ def __init__(self, label, num_qubits=0): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.SaveStabilizer` instruction. + :class:`qiskit_aer.library.SaveStabilizer` instruction. """ warn('The `SnapshotStabilizer` instruction will be deprecated in the' ' future. It has been superseded by the `save_stabilizer`' @@ -72,7 +72,7 @@ def snapshot_stabilizer(self, label): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :func:`qiskit.providers.aer.library.save_stabilizer` circuit + :func:`qiskit_aer.library.save_stabilizer` circuit method. """ warn('The `snapshot_stabilizer` circuit method has been deprecated as of' diff --git a/qiskit/providers/aer/extensions/snapshot_statevector.py b/qiskit_aer/extensions/snapshot_statevector.py similarity index 95% rename from qiskit/providers/aer/extensions/snapshot_statevector.py rename to qiskit_aer/extensions/snapshot_statevector.py index c305749ec3..5ef61e193c 100644 --- a/qiskit/providers/aer/extensions/snapshot_statevector.py +++ b/qiskit_aer/extensions/snapshot_statevector.py @@ -41,7 +41,7 @@ def __init__(self, label, num_qubits=0): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.SaveStatevector` instruction. + :class:`qiskit_aer.library.SaveStatevector` instruction. """ warn('The `SnapshotStatevector` instruction will be deprecated in the' 'future. It has been superseded by the `SaveStatevector`' @@ -71,7 +71,7 @@ def snapshot_statevector(self, label): This instruction has been deprecated and will be removed no earlier than 3 months from the 0.9.0 release date. It has been superseded by the - :class:`qiskit.providers.aer.library.save_statevector` circuit + :class:`qiskit_aer.library.save_statevector` circuit method. """ warn('The `snapshot_statevector` circuit method has been deprecated as of' diff --git a/qiskit/providers/aer/jobs/__init__.py b/qiskit_aer/jobs/__init__.py similarity index 91% rename from qiskit/providers/aer/jobs/__init__.py rename to qiskit_aer/jobs/__init__.py index f6aa51ca29..e929458f40 100644 --- a/qiskit/providers/aer/jobs/__init__.py +++ b/qiskit_aer/jobs/__init__.py @@ -13,10 +13,10 @@ # that they have been altered from the originals. """ ================================================ -Aer Jobs (:mod:`qiskit.providers.aer.jobs`) +Aer Jobs (:mod:`qiskit_aer.jobs`) ================================================ -.. currentmodule:: qiskit.providers.aer.jobs +.. currentmodule:: qiskit_aer.jobs This module contains classes and functions to manage Aer jobs. diff --git a/qiskit/providers/aer/jobs/aerjob.py b/qiskit_aer/jobs/aerjob.py similarity index 100% rename from qiskit/providers/aer/jobs/aerjob.py rename to qiskit_aer/jobs/aerjob.py diff --git a/qiskit/providers/aer/jobs/aerjobset.py b/qiskit_aer/jobs/aerjobset.py similarity index 99% rename from qiskit/providers/aer/jobs/aerjobset.py rename to qiskit_aer/jobs/aerjobset.py index 164f77d98a..5b32625371 100644 --- a/qiskit/providers/aer/jobs/aerjobset.py +++ b/qiskit_aer/jobs/aerjobset.py @@ -427,7 +427,7 @@ def worker_job(self, worker: retrive job used to submit with this job id. Returns: - A list of :class:`~qiskit.providers.aer.AerJob` + A list of :class:`~qiskit_aer.AerJob` instances that represents the submitted jobs. Raises: diff --git a/qiskit/providers/aer/jobs/utils.py b/qiskit_aer/jobs/utils.py similarity index 100% rename from qiskit/providers/aer/jobs/utils.py rename to qiskit_aer/jobs/utils.py diff --git a/qiskit/providers/aer/library/__init__.py b/qiskit_aer/library/__init__.py similarity index 95% rename from qiskit/providers/aer/library/__init__.py rename to qiskit_aer/library/__init__.py index 786a90d787..da05a836aa 100644 --- a/qiskit/providers/aer/library/__init__.py +++ b/qiskit_aer/library/__init__.py @@ -11,10 +11,10 @@ # that they have been altered from the originals. """ ========================================================= -Instruction Library (:mod:`qiskit.providers.aer.library`) +Instruction Library (:mod:`qiskit_aer.library`) ========================================================= -.. currentmodule:: qiskit.providers.aer.library +.. currentmodule:: qiskit_aer.library This library contains custom qiskit :class:`~qiskit.QuantumCircuit` :class:`~qiskit.circuit.Instruction` subclasses that can be used @@ -90,8 +90,8 @@ to all qubits in a run circuit. .. note:: - The :class:`~qiskit.providers.aer.StatevectorSimulator` (and - :class:`~qiskit.providers.aer.UnitarySimulator`) backend automatically + The :class:`~qiskit_aer.StatevectorSimulator` (and + :class:`~qiskit_aer.UnitarySimulator`) backend automatically append every run circuit with the a :func:`SaveStatevector`` (:func:`SaveUnitary``) instruction using the default label. Hence adding any additional save instructions of that type will require specifying a diff --git a/qiskit/providers/aer/library/control_flow_instructions/__init__.py b/qiskit_aer/library/control_flow_instructions/__init__.py similarity index 100% rename from qiskit/providers/aer/library/control_flow_instructions/__init__.py rename to qiskit_aer/library/control_flow_instructions/__init__.py diff --git a/qiskit/providers/aer/library/control_flow_instructions/jump.py b/qiskit_aer/library/control_flow_instructions/jump.py similarity index 100% rename from qiskit/providers/aer/library/control_flow_instructions/jump.py rename to qiskit_aer/library/control_flow_instructions/jump.py diff --git a/qiskit/providers/aer/library/control_flow_instructions/mark.py b/qiskit_aer/library/control_flow_instructions/mark.py similarity index 100% rename from qiskit/providers/aer/library/control_flow_instructions/mark.py rename to qiskit_aer/library/control_flow_instructions/mark.py diff --git a/qiskit/providers/aer/library/default_qubits.py b/qiskit_aer/library/default_qubits.py similarity index 100% rename from qiskit/providers/aer/library/default_qubits.py rename to qiskit_aer/library/default_qubits.py diff --git a/qiskit/providers/aer/library/instructions_table.csv b/qiskit_aer/library/instructions_table.csv similarity index 100% rename from qiskit/providers/aer/library/instructions_table.csv rename to qiskit_aer/library/instructions_table.csv diff --git a/qiskit/providers/aer/library/save_instructions/__init__.py b/qiskit_aer/library/save_instructions/__init__.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/__init__.py rename to qiskit_aer/library/save_instructions/__init__.py diff --git a/qiskit/providers/aer/library/save_instructions/save_amplitudes.py b/qiskit_aer/library/save_instructions/save_amplitudes.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_amplitudes.py rename to qiskit_aer/library/save_instructions/save_amplitudes.py diff --git a/qiskit/providers/aer/library/save_instructions/save_clifford.py b/qiskit_aer/library/save_instructions/save_clifford.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_clifford.py rename to qiskit_aer/library/save_instructions/save_clifford.py diff --git a/qiskit/providers/aer/library/save_instructions/save_data.py b/qiskit_aer/library/save_instructions/save_data.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_data.py rename to qiskit_aer/library/save_instructions/save_data.py diff --git a/qiskit/providers/aer/library/save_instructions/save_density_matrix.py b/qiskit_aer/library/save_instructions/save_density_matrix.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_density_matrix.py rename to qiskit_aer/library/save_instructions/save_density_matrix.py diff --git a/qiskit/providers/aer/library/save_instructions/save_expectation_value.py b/qiskit_aer/library/save_instructions/save_expectation_value.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_expectation_value.py rename to qiskit_aer/library/save_instructions/save_expectation_value.py diff --git a/qiskit/providers/aer/library/save_instructions/save_matrix_product_state.py b/qiskit_aer/library/save_instructions/save_matrix_product_state.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_matrix_product_state.py rename to qiskit_aer/library/save_instructions/save_matrix_product_state.py diff --git a/qiskit/providers/aer/library/save_instructions/save_probabilities.py b/qiskit_aer/library/save_instructions/save_probabilities.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_probabilities.py rename to qiskit_aer/library/save_instructions/save_probabilities.py diff --git a/qiskit/providers/aer/library/save_instructions/save_stabilizer.py b/qiskit_aer/library/save_instructions/save_stabilizer.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_stabilizer.py rename to qiskit_aer/library/save_instructions/save_stabilizer.py diff --git a/qiskit/providers/aer/library/save_instructions/save_state.py b/qiskit_aer/library/save_instructions/save_state.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_state.py rename to qiskit_aer/library/save_instructions/save_state.py diff --git a/qiskit/providers/aer/library/save_instructions/save_statevector.py b/qiskit_aer/library/save_instructions/save_statevector.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_statevector.py rename to qiskit_aer/library/save_instructions/save_statevector.py diff --git a/qiskit/providers/aer/library/save_instructions/save_superop.py b/qiskit_aer/library/save_instructions/save_superop.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_superop.py rename to qiskit_aer/library/save_instructions/save_superop.py diff --git a/qiskit/providers/aer/library/save_instructions/save_unitary.py b/qiskit_aer/library/save_instructions/save_unitary.py similarity index 100% rename from qiskit/providers/aer/library/save_instructions/save_unitary.py rename to qiskit_aer/library/save_instructions/save_unitary.py diff --git a/qiskit/providers/aer/library/set_instructions/__init__.py b/qiskit_aer/library/set_instructions/__init__.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/__init__.py rename to qiskit_aer/library/set_instructions/__init__.py diff --git a/qiskit/providers/aer/library/set_instructions/set_density_matrix.py b/qiskit_aer/library/set_instructions/set_density_matrix.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_density_matrix.py rename to qiskit_aer/library/set_instructions/set_density_matrix.py diff --git a/qiskit/providers/aer/library/set_instructions/set_matrix_product_state.py b/qiskit_aer/library/set_instructions/set_matrix_product_state.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_matrix_product_state.py rename to qiskit_aer/library/set_instructions/set_matrix_product_state.py diff --git a/qiskit/providers/aer/library/set_instructions/set_stabilizer.py b/qiskit_aer/library/set_instructions/set_stabilizer.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_stabilizer.py rename to qiskit_aer/library/set_instructions/set_stabilizer.py diff --git a/qiskit/providers/aer/library/set_instructions/set_statevector.py b/qiskit_aer/library/set_instructions/set_statevector.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_statevector.py rename to qiskit_aer/library/set_instructions/set_statevector.py diff --git a/qiskit/providers/aer/library/set_instructions/set_superop.py b/qiskit_aer/library/set_instructions/set_superop.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_superop.py rename to qiskit_aer/library/set_instructions/set_superop.py diff --git a/qiskit/providers/aer/library/set_instructions/set_unitary.py b/qiskit_aer/library/set_instructions/set_unitary.py similarity index 100% rename from qiskit/providers/aer/library/set_instructions/set_unitary.py rename to qiskit_aer/library/set_instructions/set_unitary.py diff --git a/qiskit/providers/aer/noise/__init__.py b/qiskit_aer/noise/__init__.py similarity index 95% rename from qiskit/providers/aer/noise/__init__.py rename to qiskit_aer/noise/__init__.py index 8e28620f66..dfe18526ad 100644 --- a/qiskit/providers/aer/noise/__init__.py +++ b/qiskit_aer/noise/__init__.py @@ -12,10 +12,10 @@ r""" ================================================ -Noise Models (:mod:`qiskit.providers.aer.noise`) +Noise Models (:mod:`qiskit_aer.noise`) ================================================ -.. currentmodule:: qiskit.providers.aer.noise +.. currentmodule:: qiskit_aer.noise This module contains classes and functions to build a noise model for simulating a Qiskit quantum circuit in the presence of errors. @@ -25,7 +25,7 @@ ===================== The :class:`NoiseModel` class is used to represent noise model for the -:class:`~qiskit.providers.aer.QasmSimulator`. It can be used to construct +:class:`~qiskit_aer.QasmSimulator`. It can be used to construct custom noise models for simulator, to to automatically generate a basic device noise model for an IBMQ backend. @@ -45,7 +45,7 @@ from qiskit import QuantumCircuit, execute from qiskit import IBMQ, Aer from qiskit.visualization import plot_histogram - from qiskit.providers.aer.noise import NoiseModel + from qiskit_aer.noise import NoiseModel # Build noise model from backend properties provider = IBMQ.load_account() @@ -90,7 +90,7 @@ from qiskit import QuantumCircuit, execute, Aer from qiskit.visualization import plot_histogram - import qiskit.providers.aer.noise as noise + import qiskit_aer.noise as noise # Error probabilities prob_1 = 0.001 # 1-qubit gate diff --git a/qiskit/providers/aer/noise/device/__init__.py b/qiskit_aer/noise/device/__init__.py similarity index 100% rename from qiskit/providers/aer/noise/device/__init__.py rename to qiskit_aer/noise/device/__init__.py diff --git a/qiskit/providers/aer/noise/device/models.py b/qiskit_aer/noise/device/models.py similarity index 99% rename from qiskit/providers/aer/noise/device/models.py rename to qiskit_aer/noise/device/models.py index 4cd7ca59fa..5c71f0f07c 100644 --- a/qiskit/providers/aer/noise/device/models.py +++ b/qiskit_aer/noise/device/models.py @@ -205,7 +205,7 @@ def basic_device_gate_errors(properties, filterwarnings( "ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils" + module="qiskit_aer.noise.errors.errorutils" ) depol_error = _device_depolarizing_error( qubits, error_param, relax_error, standard_gates, warnings=warnings) diff --git a/qiskit/providers/aer/noise/device/parameters.py b/qiskit_aer/noise/device/parameters.py similarity index 100% rename from qiskit/providers/aer/noise/device/parameters.py rename to qiskit_aer/noise/device/parameters.py diff --git a/qiskit/providers/aer/noise/errors/__init__.py b/qiskit_aer/noise/errors/__init__.py similarity index 100% rename from qiskit/providers/aer/noise/errors/__init__.py rename to qiskit_aer/noise/errors/__init__.py diff --git a/qiskit/providers/aer/noise/errors/errorutils.py b/qiskit_aer/noise/errors/errorutils.py similarity index 99% rename from qiskit/providers/aer/noise/errors/errorutils.py rename to qiskit_aer/noise/errors/errorutils.py index 8db5758949..69ba78f060 100644 --- a/qiskit/providers/aer/noise/errors/errorutils.py +++ b/qiskit_aer/noise/errors/errorutils.py @@ -231,7 +231,7 @@ def _standard_gate_instruction(instruction, ignore_phase=True): with warnings.catch_warnings(): warnings.filterwarnings("ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils") + module="qiskit_aer.noise.errors.errorutils") # Check for single-qubit reset Kraus if name == "kraus": @@ -711,7 +711,7 @@ def _make_unitary_instruction(mat, qubits, standard_gates=True): with warnings.catch_warnings(): warnings.filterwarnings("ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils") + module="qiskit_aer.noise.errors.errorutils") res = _standard_gate_instruction(instruction) else: res = [instruction] @@ -906,7 +906,7 @@ def kraus2instructions(kraus_ops, standard_gates, atol=ATOL_DEFAULT): with warnings.catch_warnings(): warnings.filterwarnings("ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils") + module="qiskit_aer.noise.errors.errorutils") instructions.append(make_kraus_instruction(non_unitaries, qubits)) probabilities.append(prob_kraus) # Normalize probabilities to account for any rounding errors diff --git a/qiskit/providers/aer/noise/errors/quantum_error.py b/qiskit_aer/noise/errors/quantum_error.py similarity index 99% rename from qiskit/providers/aer/noise/errors/quantum_error.py rename to qiskit_aer/noise/errors/quantum_error.py index c653a42088..7bfa6645b9 100644 --- a/qiskit/providers/aer/noise/errors/quantum_error.py +++ b/qiskit_aer/noise/errors/quantum_error.py @@ -136,7 +136,7 @@ def __init__(self, with warnings.catch_warnings(): warnings.filterwarnings("ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils") + module="qiskit_aer.noise.errors.errorutils") noise_ops = kraus2instructions( noise_ops, standard_gates, atol=atol) else: @@ -301,7 +301,7 @@ def _to_circuit(cls, op): warnings.filterwarnings( "ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise.errors.errorutils" + module="qiskit_aer.noise.errors.errorutils" ) circ.append(UnitaryGate(label=dic['name'], data=standard_gate_unitary(dic['name'])), diff --git a/qiskit/providers/aer/noise/errors/readout_error.py b/qiskit_aer/noise/errors/readout_error.py similarity index 100% rename from qiskit/providers/aer/noise/errors/readout_error.py rename to qiskit_aer/noise/errors/readout_error.py diff --git a/qiskit/providers/aer/noise/errors/standard_errors.py b/qiskit_aer/noise/errors/standard_errors.py similarity index 100% rename from qiskit/providers/aer/noise/errors/standard_errors.py rename to qiskit_aer/noise/errors/standard_errors.py diff --git a/qiskit/providers/aer/noise/noise_model.py b/qiskit_aer/noise/noise_model.py similarity index 98% rename from qiskit/providers/aer/noise/noise_model.py rename to qiskit_aer/noise/noise_model.py index 91c0ab3e76..6d1d1c676a 100644 --- a/qiskit/providers/aer/noise/noise_model.py +++ b/qiskit_aer/noise/noise_model.py @@ -77,10 +77,10 @@ class NoiseModel: """Noise model class for Qiskit Aer simulators. This class is used to represent noise model for the - :class:`~qiskit.providers.aer.QasmSimulator`. It can be used to construct + :class:`~qiskit_aer.QasmSimulator`. It can be used to construct custom noise models for simulator, or to automatically generate a basic device noise model for an IBMQ backend. See the - :mod:`~qiskit.providers.aer.noise` module documentation for additional + :mod:`~qiskit_aer.noise` module documentation for additional information. **Example: Basic device noise model** @@ -92,7 +92,7 @@ class NoiseModel: .. code-block:: python from qiskit import IBMQ, Aer - from qiskit.providers.aer.noise import NoiseModel + from qiskit_aer.noise import NoiseModel provider = IBMQ.load_account() backend = provider.get_backend('ibmq_vigo') @@ -108,7 +108,7 @@ class NoiseModel: .. code-block:: python - import qiskit.providers.aer.noise as noise + import qiskit_aer.noise as noise # Error probabilities prob_1 = 0.001 # 1-qubit gate @@ -145,9 +145,9 @@ def __init__(self, basis_gates=None): Additional Information: Errors added to the noise model will have their instruction appended to the noise model basis_gates if the instruction is in - the :class:`~qiskit.providers.aer.QasmSimulator` basis_gates. If + the :class:`~qiskit_aer.QasmSimulator` basis_gates. If the instruction is not in the - :class:`~qiskit.providers.aer.QasmSimulator` basis_gates it is + :class:`~qiskit_aer.QasmSimulator` basis_gates it is assumed to be a label for a standard gate, and that gate should be added to the `NoiseModel` basis_gates either using the init method, or the :meth:`add_basis_gates` method. @@ -389,12 +389,12 @@ def from_backend(cls, backend, filterwarnings( "ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise" + module="qiskit_aer.noise" ) filterwarnings( "ignore", category=PendingDeprecationWarning, - module="qiskit.providers.aer.noise" + module="qiskit_aer.noise" ) gate_errors = basic_device_gate_errors( properties, @@ -974,7 +974,7 @@ def from_dict(noise_dict): with catch_warnings(): filterwarnings("ignore", category=DeprecationWarning, - module="qiskit.providers.aer.noise") + module="qiskit_aer.noise") qerror = QuantumError(noise_ops) qerror._id = error.get('id', None) or qerror.id if all_gate_qubits is not None: diff --git a/qiskit/providers/aer/noise/noiseerror.py b/qiskit_aer/noise/noiseerror.py similarity index 100% rename from qiskit/providers/aer/noise/noiseerror.py rename to qiskit_aer/noise/noiseerror.py diff --git a/qiskit/providers/aer/noise/passes/__init__.py b/qiskit_aer/noise/passes/__init__.py similarity index 100% rename from qiskit/providers/aer/noise/passes/__init__.py rename to qiskit_aer/noise/passes/__init__.py diff --git a/qiskit/providers/aer/noise/passes/local_noise_pass.py b/qiskit_aer/noise/passes/local_noise_pass.py similarity index 100% rename from qiskit/providers/aer/noise/passes/local_noise_pass.py rename to qiskit_aer/noise/passes/local_noise_pass.py diff --git a/qiskit/providers/aer/noise/passes/relaxation_noise_pass.py b/qiskit_aer/noise/passes/relaxation_noise_pass.py similarity index 100% rename from qiskit/providers/aer/noise/passes/relaxation_noise_pass.py rename to qiskit_aer/noise/passes/relaxation_noise_pass.py diff --git a/qiskit/providers/aer/primitives/__init__.py b/qiskit_aer/primitives/__init__.py similarity index 89% rename from qiskit/providers/aer/primitives/__init__.py rename to qiskit_aer/primitives/__init__.py index eb5f93f6e0..cb02fb0856 100644 --- a/qiskit/providers/aer/primitives/__init__.py +++ b/qiskit_aer/primitives/__init__.py @@ -12,10 +12,10 @@ """ =================================================== -Primitives (:mod:`qiskit.providers.aer.primitives`) +Primitives (:mod:`qiskit_aer.primitives`) =================================================== -.. currentmodule:: qiskit.providers.aer.primitives +.. currentmodule:: qiskit_aer.primitives This module is Aer implementation of primitives. See the docs https://qiskit.org/documentation/apidoc/primitives.html for general descriptions. diff --git a/qiskit/providers/aer/primitives/estimator.py b/qiskit_aer/primitives/estimator.py similarity index 100% rename from qiskit/providers/aer/primitives/estimator.py rename to qiskit_aer/primitives/estimator.py diff --git a/qiskit/providers/aer/primitives/sampler.py b/qiskit_aer/primitives/sampler.py similarity index 100% rename from qiskit/providers/aer/primitives/sampler.py rename to qiskit_aer/primitives/sampler.py diff --git a/qiskit/providers/aer/pulse/__init__.py b/qiskit_aer/pulse/__init__.py similarity index 93% rename from qiskit/providers/aer/pulse/__init__.py rename to qiskit_aer/pulse/__init__.py index a8913ceb87..f15cd681d7 100644 --- a/qiskit/providers/aer/pulse/__init__.py +++ b/qiskit_aer/pulse/__init__.py @@ -14,10 +14,10 @@ """ ======================================================= -Pulse System Models (:mod:`qiskit.providers.aer.pulse`) +Pulse System Models (:mod:`qiskit_aer.pulse`) ======================================================= -.. currentmodule:: qiskit.providers.aer.pulse +.. currentmodule:: qiskit_aer.pulse This module contains classes and functions to build a pulse system model for simulating a Qiskit pulse schedule. diff --git a/qiskit/providers/aer/pulse/controllers/__init__.py b/qiskit_aer/pulse/controllers/__init__.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/__init__.py rename to qiskit_aer/pulse/controllers/__init__.py diff --git a/qiskit/providers/aer/pulse/controllers/digest_pulse_qobj.py b/qiskit_aer/pulse/controllers/digest_pulse_qobj.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/digest_pulse_qobj.py rename to qiskit_aer/pulse/controllers/digest_pulse_qobj.py diff --git a/qiskit/providers/aer/pulse/controllers/mc_controller.py b/qiskit_aer/pulse/controllers/mc_controller.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/mc_controller.py rename to qiskit_aer/pulse/controllers/mc_controller.py diff --git a/qiskit/providers/aer/pulse/controllers/pulse_controller.py b/qiskit_aer/pulse/controllers/pulse_controller.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/pulse_controller.py rename to qiskit_aer/pulse/controllers/pulse_controller.py diff --git a/qiskit/providers/aer/pulse/controllers/pulse_de_solver.py b/qiskit_aer/pulse/controllers/pulse_de_solver.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/pulse_de_solver.py rename to qiskit_aer/pulse/controllers/pulse_de_solver.py diff --git a/qiskit/providers/aer/pulse/controllers/pulse_sim_options.py b/qiskit_aer/pulse/controllers/pulse_sim_options.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/pulse_sim_options.py rename to qiskit_aer/pulse/controllers/pulse_sim_options.py diff --git a/qiskit/providers/aer/pulse/controllers/unitary_controller.py b/qiskit_aer/pulse/controllers/unitary_controller.py similarity index 100% rename from qiskit/providers/aer/pulse/controllers/unitary_controller.py rename to qiskit_aer/pulse/controllers/unitary_controller.py diff --git a/qiskit/providers/aer/pulse/de/DE_Methods.py b/qiskit_aer/pulse/de/DE_Methods.py similarity index 100% rename from qiskit/providers/aer/pulse/de/DE_Methods.py rename to qiskit_aer/pulse/de/DE_Methods.py diff --git a/qiskit/providers/aer/pulse/de/DE_Options.py b/qiskit_aer/pulse/de/DE_Options.py similarity index 100% rename from qiskit/providers/aer/pulse/de/DE_Options.py rename to qiskit_aer/pulse/de/DE_Options.py diff --git a/qiskit/providers/aer/pulse/de/__init__.py b/qiskit_aer/pulse/de/__init__.py similarity index 100% rename from qiskit/providers/aer/pulse/de/__init__.py rename to qiskit_aer/pulse/de/__init__.py diff --git a/qiskit/providers/aer/pulse/de/type_utils.py b/qiskit_aer/pulse/de/type_utils.py similarity index 100% rename from qiskit/providers/aer/pulse/de/type_utils.py rename to qiskit_aer/pulse/de/type_utils.py diff --git a/qiskit/providers/aer/pulse/system_models/__init__.py b/qiskit_aer/pulse/system_models/__init__.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/__init__.py rename to qiskit_aer/pulse/system_models/__init__.py diff --git a/qiskit/providers/aer/pulse/system_models/duffing_model_generators.py b/qiskit_aer/pulse/system_models/duffing_model_generators.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/duffing_model_generators.py rename to qiskit_aer/pulse/system_models/duffing_model_generators.py diff --git a/qiskit/providers/aer/pulse/system_models/hamiltonian_model.py b/qiskit_aer/pulse/system_models/hamiltonian_model.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/hamiltonian_model.py rename to qiskit_aer/pulse/system_models/hamiltonian_model.py diff --git a/qiskit/providers/aer/pulse/system_models/pulse_system_model.py b/qiskit_aer/pulse/system_models/pulse_system_model.py similarity index 99% rename from qiskit/providers/aer/pulse/system_models/pulse_system_model.py rename to qiskit_aer/pulse/system_models/pulse_system_model.py index 67a0af9b59..74e8dde177 100644 --- a/qiskit/providers/aer/pulse/system_models/pulse_system_model.py +++ b/qiskit_aer/pulse/system_models/pulse_system_model.py @@ -26,7 +26,7 @@ class PulseSystemModel(): r"""Physical model object for pulse simulator. This class contains model information required by the - :class:`~qiskit.providers.aer.PulseSimulator`. It contains: + :class:`~qiskit_aer.PulseSimulator`. It contains: * ``"hamiltonian"``: a :class:`HamiltonianModel` object representing the Hamiltonian of the system. diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/__init__.py b/qiskit_aer/pulse/system_models/string_model_parser/__init__.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/__init__.py rename to qiskit_aer/pulse/system_models/string_model_parser/__init__.py diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/apply_str_func_to_qobj.py b/qiskit_aer/pulse/system_models/string_model_parser/apply_str_func_to_qobj.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/apply_str_func_to_qobj.py rename to qiskit_aer/pulse/system_models/string_model_parser/apply_str_func_to_qobj.py diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/gen_operator.py b/qiskit_aer/pulse/system_models/string_model_parser/gen_operator.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/gen_operator.py rename to qiskit_aer/pulse/system_models/string_model_parser/gen_operator.py diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/operator_from_string.py b/qiskit_aer/pulse/system_models/string_model_parser/operator_from_string.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/operator_from_string.py rename to qiskit_aer/pulse/system_models/string_model_parser/operator_from_string.py diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/operator_generators.py b/qiskit_aer/pulse/system_models/string_model_parser/operator_generators.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/operator_generators.py rename to qiskit_aer/pulse/system_models/string_model_parser/operator_generators.py diff --git a/qiskit/providers/aer/pulse/system_models/string_model_parser/string_model_parser.py b/qiskit_aer/pulse/system_models/string_model_parser/string_model_parser.py similarity index 100% rename from qiskit/providers/aer/pulse/system_models/string_model_parser/string_model_parser.py rename to qiskit_aer/pulse/system_models/string_model_parser/string_model_parser.py diff --git a/qiskit/providers/aer/utils/__init__.py b/qiskit_aer/utils/__init__.py similarity index 89% rename from qiskit/providers/aer/utils/__init__.py rename to qiskit_aer/utils/__init__.py index bdebbcf793..26fb383918 100644 --- a/qiskit/providers/aer/utils/__init__.py +++ b/qiskit_aer/utils/__init__.py @@ -12,13 +12,13 @@ """ ============================================= -Utilities (:mod:`qiskit.providers.aer.utils`) +Utilities (:mod:`qiskit_aer.utils`) ============================================= -.. currentmodule:: qiskit.providers.aer.utils +.. currentmodule:: qiskit_aer.utils This module contains utility functions for modifying -:class:`~qiskit.providers.aer.noise.NoiseModel` objects and ``QuantumCircuits`` +:class:`~qiskit_aer.noise.NoiseModel` objects and ``QuantumCircuits`` using noise models. diff --git a/qiskit/providers/aer/utils/noise_model_inserter.py b/qiskit_aer/utils/noise_model_inserter.py similarity index 98% rename from qiskit/providers/aer/utils/noise_model_inserter.py rename to qiskit_aer/utils/noise_model_inserter.py index 73f615f19b..aeb91395d7 100644 --- a/qiskit/providers/aer/utils/noise_model_inserter.py +++ b/qiskit_aer/utils/noise_model_inserter.py @@ -33,7 +33,7 @@ def insert_noise(circuits, noise_model, transpile=False): original circuit with ``Kraus`` instructions inserted after all instructions referenced in the ``noise_model``. The resulting circuit cannot be ran on a quantum computer but can be executed on the - :class:`~qiskit.providers.aer.QasmSimulator`. + :class:`~qiskit_aer.QasmSimulator`. """ is_circuits_list = isinstance(circuits, (list, tuple)) circuits = circuits if is_circuits_list else [circuits] diff --git a/qiskit/providers/aer/utils/noise_remapper.py b/qiskit_aer/utils/noise_remapper.py similarity index 100% rename from qiskit/providers/aer/utils/noise_remapper.py rename to qiskit_aer/utils/noise_remapper.py diff --git a/qiskit/providers/aer/utils/noise_transformation.py b/qiskit_aer/utils/noise_transformation.py similarity index 100% rename from qiskit/providers/aer/utils/noise_transformation.py rename to qiskit_aer/utils/noise_transformation.py diff --git a/qiskit/providers/aer/version.py b/qiskit_aer/version.py similarity index 100% rename from qiskit/providers/aer/version.py rename to qiskit_aer/version.py diff --git a/setup.py b/setup.py index 1beb129179..2a9866c529 100644 --- a/setup.py +++ b/setup.py @@ -83,18 +83,10 @@ def install_needed_req(import_name, package_name=None, min_version=None, max_ver if not _DISABLE_CONAN: setup_requirements.append('conan>=1.22.2') -requirements = common_requirements + ['qiskit-terra>=0.20.0', 'scipy>=1.0'] - -if not hasattr(setuptools, - 'find_namespace_packages') or not inspect.ismethod( - setuptools.find_namespace_packages): - print("Your setuptools version:'{}' does not support PEP 420 " - "(find_namespace_packages). Upgrade it to version >='40.1.0' and " - "repeat install.".format(setuptools.__version__)) - sys.exit(1) +requirements = common_requirements + ['qiskit-terra>=0.21.0', 'scipy>=1.0'] VERSION_PATH = os.path.join(os.path.dirname(__file__), - "qiskit", "providers", "aer", "VERSION.txt") + "qiskit_aer", "VERSION.txt") with open(VERSION_PATH, "r") as version_file: VERSION = version_file.read().strip() @@ -112,7 +104,7 @@ def install_needed_req(import_name, package_name=None, min_version=None, max_ver setup( name=PACKAGE_NAME, version=VERSION, - packages=setuptools.find_namespace_packages(include=['qiskit.*']), + packages=setuptools.find_packages(exclude=["test*"]), cmake_source_dir='.', description="Qiskit Aer - High performance simulators for Qiskit", long_description=README, diff --git a/src/framework/pybind_json.hpp b/src/framework/pybind_json.hpp index 4bcb9a7e66..de06755d73 100755 --- a/src/framework/pybind_json.hpp +++ b/src/framework/pybind_json.hpp @@ -219,7 +219,7 @@ json_t JSON::iterable_to_json_list(const py::handle& obj){ } void std::to_json(json_t &js, const py::handle &obj) { - static py::object PyNoiseModel = py::module::import("qiskit.providers.aer.noise.noise_model").attr("NoiseModel"); + static py::object PyNoiseModel = py::module::import("qiskit_aer.noise.noise_model").attr("NoiseModel"); static py::object PyQasmQobj = py::module::import("qiskit.qobj.qasm_qobj").attr("QasmQobj"); if (py::isinstance(obj)) { js = obj.cast(); diff --git a/src/open_pulse/CMakeLists.txt b/src/open_pulse/CMakeLists.txt index 8811540e2d..ecc6463f6f 100644 --- a/src/open_pulse/CMakeLists.txt +++ b/src/open_pulse/CMakeLists.txt @@ -16,4 +16,4 @@ endfunction() numpy_pybind11_add_module(pulse_utils pulse_utils_bindings.cpp pulse_utils.cpp numeric_integrator.cpp zspmv.cpp) numpy_pybind11_add_module(test_python_to_cpp test_python_to_cpp.cpp) -install(TARGETS pulse_utils test_python_to_cpp LIBRARY DESTINATION "qiskit/providers/aer/pulse/controllers/") +install(TARGETS pulse_utils test_python_to_cpp LIBRARY DESTINATION "qiskit_aer/pulse/controllers/") diff --git a/test/benchmark/simulator_benchmark.py b/test/benchmark/simulator_benchmark.py index 5ad57fea16..02ed5100f6 100644 --- a/test/benchmark/simulator_benchmark.py +++ b/test/benchmark/simulator_benchmark.py @@ -16,8 +16,8 @@ import numpy as np from time import time from qiskit.compiler import transpile, assemble -from qiskit.providers.aer import AerSimulator, UnitarySimulator -from qiskit.providers.aer.noise import NoiseModel, amplitude_damping_error, depolarizing_error +from qiskit_aer import AerSimulator, UnitarySimulator +from qiskit_aer.noise import NoiseModel, amplitude_damping_error, depolarizing_error from benchmark.circuit_library_circuits import CircuitLibraryCircuits @@ -151,7 +151,7 @@ def add_measure_all(base): def add_expval(base, num_terms): circuit = base.copy() - from qiskit.providers.aer.extensions import snapshot_expectation_value + from qiskit_aer.extensions import snapshot_expectation_value from numpy.random import default_rng rng = default_rng(1) paulis = [''.join(s) for s in diff --git a/test/terra/backends/aer_simulator/test_auto_method.py b/test/terra/backends/aer_simulator/test_auto_method.py index b76b72aaaf..f193d34707 100644 --- a/test/terra/backends/aer_simulator/test_auto_method.py +++ b/test/terra/backends/aer_simulator/test_auto_method.py @@ -14,11 +14,11 @@ """ from ddt import ddt -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors import QuantumError -from qiskit.providers.aer.noise.errors import amplitude_damping_error -from qiskit.providers.aer.noise.errors import mixed_unitary_error -from qiskit.providers.aer.noise.errors import pauli_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors import QuantumError +from qiskit_aer.noise.errors import amplitude_damping_error +from qiskit_aer.noise.errors import mixed_unitary_error +from qiskit_aer.noise.errors import pauli_error from test.terra.backends.simulator_test_case import ( SimulatorTestCase) from test.terra.reference import ref_2q_clifford diff --git a/test/terra/backends/aer_simulator/test_control_flow.py b/test/terra/backends/aer_simulator/test_control_flow.py index bf69ee536e..5b2a8a2072 100644 --- a/test/terra/backends/aer_simulator/test_control_flow.py +++ b/test/terra/backends/aer_simulator/test_control_flow.py @@ -18,12 +18,12 @@ import logging from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) -from qiskit.providers.aer import AerSimulator +from qiskit_aer import AerSimulator from qiskit import QuantumCircuit, transpile from qiskit.circuit import Parameter, Qubit, QuantumRegister, ClassicalRegister from qiskit.circuit.controlflow import * -from qiskit.providers.aer.library.default_qubits import default_qubits -from qiskit.providers.aer.library.control_flow_instructions import AerMark, AerJump +from qiskit_aer.library.default_qubits import default_qubits +from qiskit_aer.library.control_flow_instructions import AerMark, AerJump @ddt class TestControlFlow(SimulatorTestCase): diff --git a/test/terra/backends/aer_simulator/test_executors.py b/test/terra/backends/aer_simulator/test_executors.py index e1d8f9ce1e..91cb599ff4 100644 --- a/test/terra/backends/aer_simulator/test_executors.py +++ b/test/terra/backends/aer_simulator/test_executors.py @@ -21,7 +21,7 @@ from qiskit.circuit.random import random_circuit from qiskit.quantum_info import Statevector from test.terra.reference import ref_kraus_noise -from qiskit.providers.aer.jobs import AerJob, AerJobSet +from qiskit_aer.jobs import AerJob, AerJobSet from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) diff --git a/test/terra/backends/aer_simulator/test_fusion.py b/test/terra/backends/aer_simulator/test_fusion.py index 36d1c06ed4..c39e237d6c 100644 --- a/test/terra/backends/aer_simulator/test_fusion.py +++ b/test/terra/backends/aer_simulator/test_fusion.py @@ -20,8 +20,8 @@ from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit from qiskit.circuit.library import QuantumVolume, QFT, RealAmplitudes from qiskit.compiler import transpile -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors import (ReadoutError, +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors import (ReadoutError, depolarizing_error, amplitude_damping_error) from test.terra.backends.simulator_test_case import ( diff --git a/test/terra/backends/aer_simulator/test_job_splitting.py b/test/terra/backends/aer_simulator/test_job_splitting.py index a577236990..f7ac7f1e06 100644 --- a/test/terra/backends/aer_simulator/test_job_splitting.py +++ b/test/terra/backends/aer_simulator/test_job_splitting.py @@ -19,7 +19,7 @@ from qiskit import transpile, assemble from qiskit.providers import JobError from qiskit.circuit.random import random_circuit -from qiskit.providers.aer.jobs import split_qobj +from qiskit_aer.jobs import split_qobj from test.terra.reference.ref_save_expval import ( save_expval_circuits, save_expval_circuit_parameterized, diff --git a/test/terra/backends/aer_simulator/test_measure.py b/test/terra/backends/aer_simulator/test_measure.py index 3460fca645..de70b029b9 100644 --- a/test/terra/backends/aer_simulator/test_measure.py +++ b/test/terra/backends/aer_simulator/test_measure.py @@ -17,9 +17,9 @@ from test.terra.reference import ref_measure from qiskit import QuantumCircuit from qiskit import transpile -from qiskit.providers.aer import QasmSimulator -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors import ReadoutError, depolarizing_error +from qiskit_aer import QasmSimulator +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors import ReadoutError, depolarizing_error from qiskit.circuit.library import QuantumVolume from qiskit.quantum_info.random import random_unitary from test.terra.backends.simulator_test_case import ( diff --git a/test/terra/backends/aer_simulator/test_noise.py b/test/terra/backends/aer_simulator/test_noise.py index 2549d22f2d..0f422ba229 100644 --- a/test/terra/backends/aer_simulator/test_noise.py +++ b/test/terra/backends/aer_simulator/test_noise.py @@ -14,7 +14,7 @@ """ from ddt import ddt -from qiskit.providers.aer import noise +from qiskit_aer import noise import qiskit.quantum_info as qi from qiskit import transpile diff --git a/test/terra/backends/aer_simulator/test_options.py b/test/terra/backends/aer_simulator/test_options.py index fa53e78318..b755d38773 100644 --- a/test/terra/backends/aer_simulator/test_options.py +++ b/test/terra/backends/aer_simulator/test_options.py @@ -15,7 +15,7 @@ from ddt import ddt, data from qiskit import QuantumCircuit, transpile -from qiskit.providers.aer.noise import NoiseModel +from qiskit_aer.noise import NoiseModel from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) from qiskit.quantum_info.random import random_unitary diff --git a/test/terra/backends/aer_simulator/test_save_state.py b/test/terra/backends/aer_simulator/test_save_state.py index e4af8351fc..a2b9a35ea9 100644 --- a/test/terra/backends/aer_simulator/test_save_state.py +++ b/test/terra/backends/aer_simulator/test_save_state.py @@ -18,7 +18,7 @@ from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) from qiskit import QuantumCircuit, transpile -from qiskit.providers.aer.library import ( +from qiskit_aer.library import ( SaveStatevector, SaveDensityMatrix, SaveStabilizer, SaveMatrixProductState, SaveUnitary, SaveSuperOp) diff --git a/test/terra/backends/aer_simulator/test_thread_management.py b/test/terra/backends/aer_simulator/test_thread_management.py index 7ae5bff8f7..f1a546c5ca 100644 --- a/test/terra/backends/aer_simulator/test_thread_management.py +++ b/test/terra/backends/aer_simulator/test_thread_management.py @@ -20,8 +20,8 @@ from qiskit import transpile, QuantumCircuit from qiskit.circuit.library import QuantumVolume -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.standard_errors import pauli_error from test.terra.decorators import requires_omp, requires_multiprocessing from test.terra.backends.simulator_test_case import SimulatorTestCase diff --git a/test/terra/backends/aer_simulator/test_truncate.py b/test/terra/backends/aer_simulator/test_truncate.py index 58a3d685d5..fd34aad604 100644 --- a/test/terra/backends/aer_simulator/test_truncate.py +++ b/test/terra/backends/aer_simulator/test_truncate.py @@ -10,8 +10,9 @@ """ from ddt import ddt from qiskit import transpile, QuantumCircuit, Aer -from qiskit.providers.aer.noise import NoiseModel from qiskit.providers.fake_provider import FakeQuito +from qiskit_aer.noise import NoiseModel +from qiskit.test import mock from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) diff --git a/test/terra/backends/aer_simulator/test_wrapper_qasm_simulator.py b/test/terra/backends/aer_simulator/test_wrapper_qasm_simulator.py index 5f79d43f83..8b4117f218 100644 --- a/test/terra/backends/aer_simulator/test_wrapper_qasm_simulator.py +++ b/test/terra/backends/aer_simulator/test_wrapper_qasm_simulator.py @@ -15,7 +15,7 @@ from ddt import ddt, data -from qiskit.providers.aer import QasmSimulator, AerError +from qiskit_aer import QasmSimulator, AerError from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_methods) diff --git a/test/terra/backends/aer_simulator/test_wrapper_statevector_simulator.py b/test/terra/backends/aer_simulator/test_wrapper_statevector_simulator.py index 0ee9b6d844..88fc603db4 100644 --- a/test/terra/backends/aer_simulator/test_wrapper_statevector_simulator.py +++ b/test/terra/backends/aer_simulator/test_wrapper_statevector_simulator.py @@ -25,7 +25,7 @@ from test.terra.reference import ref_diagonal_gate from qiskit import transpile -from qiskit.providers.aer import StatevectorSimulator, AerError +from qiskit_aer import StatevectorSimulator, AerError from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_devices) diff --git a/test/terra/backends/aer_simulator/test_wrapper_unitary_simulator.py b/test/terra/backends/aer_simulator/test_wrapper_unitary_simulator.py index 9040d77a79..f08e6a4fdc 100644 --- a/test/terra/backends/aer_simulator/test_wrapper_unitary_simulator.py +++ b/test/terra/backends/aer_simulator/test_wrapper_unitary_simulator.py @@ -21,7 +21,7 @@ from test.terra.reference import ref_diagonal_gate from qiskit import transpile -from qiskit.providers.aer import UnitarySimulator, AerError +from qiskit_aer import UnitarySimulator, AerError from test.terra.backends.simulator_test_case import ( SimulatorTestCase, supported_devices) diff --git a/test/terra/backends/pulse_sim_independent.py b/test/terra/backends/pulse_sim_independent.py index 7e41eb7029..3c1b37f164 100644 --- a/test/terra/backends/pulse_sim_independent.py +++ b/test/terra/backends/pulse_sim_independent.py @@ -4,8 +4,8 @@ import numpy as np from scipy.linalg import expm -from qiskit.providers.aer.pulse.de.DE_Methods import ScipyODE -from qiskit.providers.aer.pulse.de.DE_Options import DE_Options +from qiskit_aer.pulse.de.DE_Methods import ScipyODE +from qiskit_aer.pulse.de.DE_Options import DE_Options I = np.eye(2, dtype=complex) X = np.array([[0., 1.], [1., 0.]]) diff --git a/test/terra/backends/simulator_test_case.py b/test/terra/backends/simulator_test_case.py index 9f3fa91484..0e2c63e1ed 100644 --- a/test/terra/backends/simulator_test_case.py +++ b/test/terra/backends/simulator_test_case.py @@ -13,15 +13,15 @@ AerSimulator test case class """ -from qiskit.providers.aer.backends.backend_utils import available_devices +from qiskit_aer.backends.backend_utils import available_devices import ddt import itertools as it -from qiskit.providers.aer import AerSimulator +from qiskit_aer import AerSimulator from test.terra.common import QiskitAerTestCase from qiskit.circuit import QuantumCircuit from qiskit.compiler import assemble -from qiskit.providers.aer.backends.backend_utils import cpp_execute -from qiskit.providers.aer.backends.controller_wrappers import aer_controller_execute +from qiskit_aer.backends.backend_utils import cpp_execute +from qiskit_aer.backends.controller_wrappers import aer_controller_execute class SimulatorTestCase(QiskitAerTestCase): diff --git a/test/terra/backends/test_compatibility.py b/test/terra/backends/test_compatibility.py index f1170603b1..3f4d352334 100644 --- a/test/terra/backends/test_compatibility.py +++ b/test/terra/backends/test_compatibility.py @@ -19,7 +19,7 @@ import numpy as np import qiskit.quantum_info as qi -import qiskit.providers.aer.backends.compatibility as cqi +import qiskit_aer.backends.compatibility as cqi class TestResultCompatibility(QiskitAerTestCase): diff --git a/test/terra/backends/test_config_pulse_simulator.py b/test/terra/backends/test_config_pulse_simulator.py index 1f4b519efc..2c5788451c 100644 --- a/test/terra/backends/test_config_pulse_simulator.py +++ b/test/terra/backends/test_config_pulse_simulator.py @@ -22,14 +22,14 @@ from qiskit import QuantumCircuit, transpile, schedule from qiskit.providers.fake_provider import FakeArmonk, FakeAthens -from qiskit.providers.aer.backends import PulseSimulator +from qiskit_aer.backends import PulseSimulator from qiskit.pulse import (Schedule, Play, ShiftPhase, SetPhase, Delay, Acquire, Waveform, DriveChannel, ControlChannel, AcquireChannel, MemorySlot) -from qiskit.providers.aer.aererror import AerError +from qiskit_aer.aererror import AerError -from qiskit.providers.aer.pulse.system_models.pulse_system_model import PulseSystemModel -from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel +from qiskit_aer.pulse.system_models.pulse_system_model import PulseSystemModel +from qiskit_aer.pulse.system_models.hamiltonian_model import HamiltonianModel from qiskit.providers.models.backendconfiguration import UchannelLO diff --git a/test/terra/backends/test_parameterized_qobj.py b/test/terra/backends/test_parameterized_qobj.py index 4f29c4fd96..bf03ba5baa 100644 --- a/test/terra/backends/test_parameterized_qobj.py +++ b/test/terra/backends/test_parameterized_qobj.py @@ -30,8 +30,8 @@ save_expval_circuit_parameterized, save_expval_final_statevecs, ) -from qiskit.providers.aer.library import SaveStatevector -from qiskit.providers.aer import AerSimulator, AerError +from qiskit_aer.library import SaveStatevector +from qiskit_aer import AerSimulator, AerError class TestParameterizedQobj(common.QiskitAerTestCase): diff --git a/test/terra/backends/test_pulse_simulator.py b/test/terra/backends/test_pulse_simulator.py index 45730492fd..b5b91ddb87 100644 --- a/test/terra/backends/test_pulse_simulator.py +++ b/test/terra/backends/test_pulse_simulator.py @@ -22,7 +22,7 @@ from scipy.linalg import expm from scipy.special import erf -from qiskit.providers.aer.backends import PulseSimulator +from qiskit_aer.backends import PulseSimulator from qiskit.circuit import QuantumCircuit from qiskit.compiler import transpile @@ -30,13 +30,13 @@ from qiskit.pulse import (Schedule, Play, ShiftPhase, SetPhase, Delay, Acquire, Waveform, DriveChannel, ControlChannel, AcquireChannel, MemorySlot, SetFrequency, ShiftFrequency) -from qiskit.providers.aer.pulse.de.DE_Methods import ScipyODE -from qiskit.providers.aer.pulse.de.DE_Options import DE_Options -from qiskit.providers.aer.pulse.system_models.pulse_system_model import PulseSystemModel -from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel +from qiskit_aer.pulse.de.DE_Methods import ScipyODE +from qiskit_aer.pulse.de.DE_Options import DE_Options +from qiskit_aer.pulse.system_models.pulse_system_model import PulseSystemModel +from qiskit_aer.pulse.system_models.hamiltonian_model import HamiltonianModel from qiskit.providers.models.backendconfiguration import UchannelLO -from qiskit.providers.aer.aererror import AerError from qiskit.providers.fake_provider import FakeArmonk +from qiskit_aer.aererror import AerError from .pulse_sim_independent import (simulate_1q_model, simulate_2q_exchange_model, diff --git a/test/terra/common.py b/test/terra/common.py index 9d159b86bb..dea9e2e973 100644 --- a/test/terra/common.py +++ b/test/terra/common.py @@ -27,7 +27,7 @@ import fixtures import numpy as np from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit -from qiskit.providers.aer import __path__ as main_path +from qiskit_aer import __path__ as main_path from qiskit.quantum_info import Operator, Statevector from qiskit.quantum_info.operators.predicates import matrix_equal from qiskit.test.base import FullQiskitTestCase diff --git a/test/terra/decorators.py b/test/terra/decorators.py index 8f9fae67f8..e24819adf9 100644 --- a/test/terra/decorators.py +++ b/test/terra/decorators.py @@ -18,7 +18,7 @@ import multiprocessing from qiskit import QuantumCircuit, execute -from qiskit.providers.aer import AerProvider, AerSimulator +from qiskit_aer import AerProvider, AerSimulator # Backwards compatibility for Terra <= 0.13 diff --git a/test/terra/extensions/test_save_amplitudes.py b/test/terra/extensions/test_save_amplitudes.py index 378f14c470..a7f9898cc0 100644 --- a/test/terra/extensions/test_save_amplitudes.py +++ b/test/terra/extensions/test_save_amplitudes.py @@ -14,7 +14,7 @@ import unittest from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.library import SaveAmplitudes +from qiskit_aer.library import SaveAmplitudes from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_save_expval.py b/test/terra/extensions/test_save_expval.py index 4488ec2809..3f1496c346 100644 --- a/test/terra/extensions/test_save_expval.py +++ b/test/terra/extensions/test_save_expval.py @@ -14,7 +14,7 @@ from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.library import SaveExpectationValue, SaveExpectationValueVariance +from qiskit_aer.library import SaveExpectationValue, SaveExpectationValueVariance from qiskit.quantum_info.operators import Pauli from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_snapshot_density_matrix.py b/test/terra/extensions/test_snapshot_density_matrix.py index 02effd535e..a30e2fb39a 100644 --- a/test/terra/extensions/test_snapshot_density_matrix.py +++ b/test/terra/extensions/test_snapshot_density_matrix.py @@ -15,7 +15,7 @@ from warnings import filterwarnings from qiskit import QuantumCircuit, assemble from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.extensions.snapshot_density_matrix import SnapshotDensityMatrix +from qiskit_aer.extensions.snapshot_density_matrix import SnapshotDensityMatrix from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_snapshot_expectation_value.py b/test/terra/extensions/test_snapshot_expectation_value.py index 82ddffc0b7..e3e9b051bc 100644 --- a/test/terra/extensions/test_snapshot_expectation_value.py +++ b/test/terra/extensions/test_snapshot_expectation_value.py @@ -17,7 +17,7 @@ from qiskit import QuantumCircuit, assemble from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.extensions.snapshot_expectation_value import SnapshotExpectationValue +from qiskit_aer.extensions.snapshot_expectation_value import SnapshotExpectationValue from qiskit.quantum_info.operators import Pauli, Operator from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_snapshot_probabilities.py b/test/terra/extensions/test_snapshot_probabilities.py index 4952449c81..9d83041c37 100644 --- a/test/terra/extensions/test_snapshot_probabilities.py +++ b/test/terra/extensions/test_snapshot_probabilities.py @@ -15,7 +15,7 @@ from warnings import filterwarnings from qiskit import QuantumCircuit, assemble from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.extensions.snapshot_probabilities import SnapshotProbabilities +from qiskit_aer.extensions.snapshot_probabilities import SnapshotProbabilities from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_snapshot_stabilizer.py b/test/terra/extensions/test_snapshot_stabilizer.py index 62f0fd9544..d7af89d1b2 100644 --- a/test/terra/extensions/test_snapshot_stabilizer.py +++ b/test/terra/extensions/test_snapshot_stabilizer.py @@ -15,7 +15,7 @@ from warnings import filterwarnings from qiskit import QuantumCircuit, assemble from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.extensions.snapshot_stabilizer import SnapshotStabilizer +from qiskit_aer.extensions.snapshot_stabilizer import SnapshotStabilizer from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_snapshot_statevector.py b/test/terra/extensions/test_snapshot_statevector.py index aaacee467d..1d6491f12d 100644 --- a/test/terra/extensions/test_snapshot_statevector.py +++ b/test/terra/extensions/test_snapshot_statevector.py @@ -15,7 +15,7 @@ from warnings import filterwarnings from qiskit import QuantumCircuit, assemble from qiskit.extensions.exceptions import ExtensionError -from qiskit.providers.aer.extensions.snapshot_statevector import SnapshotStatevector +from qiskit_aer.extensions.snapshot_statevector import SnapshotStatevector from ..common import QiskitAerTestCase diff --git a/test/terra/extensions/test_wrappers.py b/test/terra/extensions/test_wrappers.py index a7147b9000..b1e4d25ff4 100644 --- a/test/terra/extensions/test_wrappers.py +++ b/test/terra/extensions/test_wrappers.py @@ -17,9 +17,9 @@ from multiprocessing import Pool from qiskit import transpile, QuantumCircuit -from qiskit.providers.aer.backends import AerSimulator -from qiskit.providers.aer.backends.controller_wrappers import aer_controller_execute -from qiskit.providers.aer.backends.backend_utils import LIBRARY_DIR +from qiskit_aer.backends import AerSimulator +from qiskit_aer.backends.controller_wrappers import aer_controller_execute +from qiskit_aer.backends.backend_utils import LIBRARY_DIR from test.terra.common import QiskitAerTestCase diff --git a/test/terra/noise/passes/test_local_noise_pass.py b/test/terra/noise/passes/test_local_noise_pass.py index ac0e769d78..f1258221c5 100644 --- a/test/terra/noise/passes/test_local_noise_pass.py +++ b/test/terra/noise/passes/test_local_noise_pass.py @@ -13,7 +13,7 @@ LocalNoisePass class tests """ -from qiskit.providers.aer.noise import ReadoutError, LocalNoisePass +from qiskit_aer.noise import ReadoutError, LocalNoisePass from qiskit.circuit import QuantumCircuit from qiskit.circuit.library.standard_gates import SXGate, HGate, CXGate diff --git a/test/terra/noise/passes/test_relaxation_noise_pass.py b/test/terra/noise/passes/test_relaxation_noise_pass.py index 2eb3e62f85..7973db9322 100644 --- a/test/terra/noise/passes/test_relaxation_noise_pass.py +++ b/test/terra/noise/passes/test_relaxation_noise_pass.py @@ -14,7 +14,7 @@ """ import ddt -from qiskit.providers.aer.noise import thermal_relaxation_error, RelaxationNoisePass +from qiskit_aer.noise import thermal_relaxation_error, RelaxationNoisePass import qiskit.quantum_info as qi from qiskit.circuit import QuantumCircuit, Delay diff --git a/test/terra/noise/test_noise_inserter.py b/test/terra/noise/test_noise_inserter.py index 70c761f99b..e7ed620f2c 100644 --- a/test/terra/noise/test_noise_inserter.py +++ b/test/terra/noise/test_noise_inserter.py @@ -15,9 +15,9 @@ import unittest -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error -from qiskit.providers.aer.utils import insert_noise +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.utils import insert_noise from test.terra.common import QiskitAerTestCase from qiskit import QuantumRegister, QuantumCircuit, transpile diff --git a/test/terra/noise/test_noise_model.py b/test/terra/noise/test_noise_model.py index b33fe1adf2..925a004cd6 100644 --- a/test/terra/noise/test_noise_model.py +++ b/test/terra/noise/test_noise_model.py @@ -17,16 +17,16 @@ import unittest import numpy as np -from qiskit.providers.aer.backends import AerSimulator -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.device.models import _excited_population -from qiskit.providers.aer.noise.errors import QuantumError -from qiskit.providers.aer.noise.errors.standard_errors import amplitude_damping_error -from qiskit.providers.aer.noise.errors.standard_errors import kraus_error -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error -from qiskit.providers.aer.noise.errors.standard_errors import reset_error -from qiskit.providers.aer.noise.errors.standard_errors import thermal_relaxation_error -from qiskit.providers.aer.utils.noise_transformation import transform_noise_model +from qiskit_aer.backends import AerSimulator +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.device.models import _excited_population +from qiskit_aer.noise.errors import QuantumError +from qiskit_aer.noise.errors.standard_errors import amplitude_damping_error +from qiskit_aer.noise.errors.standard_errors import kraus_error +from qiskit_aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.noise.errors.standard_errors import reset_error +from qiskit_aer.noise.errors.standard_errors import thermal_relaxation_error +from qiskit_aer.utils.noise_transformation import transform_noise_model from qiskit.circuit import QuantumRegister, ClassicalRegister, QuantumCircuit from qiskit.circuit.library.generalized_gates import PauliGate diff --git a/test/terra/noise/test_noise_remapper.py b/test/terra/noise/test_noise_remapper.py index f6614ec83a..148537f2e0 100644 --- a/test/terra/noise/test_noise_remapper.py +++ b/test/terra/noise/test_noise_remapper.py @@ -4,10 +4,10 @@ import unittest -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors import depolarizing_error -from qiskit.providers.aer.noise.noiseerror import NoiseError -from qiskit.providers.aer.utils import remap_noise_model +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors import depolarizing_error +from qiskit_aer.noise.noiseerror import NoiseError +from qiskit_aer.utils import remap_noise_model from test.terra.common import QiskitAerTestCase diff --git a/test/terra/noise/test_noise_transformation.py b/test/terra/noise/test_noise_transformation.py index dee60fcad2..80e5a9d500 100644 --- a/test/terra/noise/test_noise_transformation.py +++ b/test/terra/noise/test_noise_transformation.py @@ -16,15 +16,15 @@ import unittest import numpy -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.quantum_error import QuantumError -from qiskit.providers.aer.noise.errors.standard_errors import amplitude_damping_error -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error -from qiskit.providers.aer.noise.errors.standard_errors import reset_error -from qiskit.providers.aer.noise.noiseerror import NoiseError -from qiskit.providers.aer.utils import NoiseTransformer -from qiskit.providers.aer.utils import approximate_noise_model -from qiskit.providers.aer.utils import approximate_quantum_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.quantum_error import QuantumError +from qiskit_aer.noise.errors.standard_errors import amplitude_damping_error +from qiskit_aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.noise.errors.standard_errors import reset_error +from qiskit_aer.noise.noiseerror import NoiseError +from qiskit_aer.utils import NoiseTransformer +from qiskit_aer.utils import approximate_noise_model +from qiskit_aer.utils import approximate_quantum_error from test.terra.common import QiskitAerTestCase from qiskit.circuit import Reset diff --git a/test/terra/noise/test_quantum_error.py b/test/terra/noise/test_quantum_error.py index 0bedf23b1b..00bad55dd5 100644 --- a/test/terra/noise/test_quantum_error.py +++ b/test/terra/noise/test_quantum_error.py @@ -20,9 +20,9 @@ from qiskit.circuit import QuantumCircuit, Reset, Measure from qiskit.circuit.library.standard_gates import * from qiskit.extensions import UnitaryGate -from qiskit.providers.aer.noise import QuantumError -from qiskit.providers.aer.noise.errors.errorutils import standard_gate_unitary -from qiskit.providers.aer.noise.noiseerror import NoiseError +from qiskit_aer.noise import QuantumError +from qiskit_aer.noise.errors.errorutils import standard_gate_unitary +from qiskit_aer.noise.noiseerror import NoiseError from qiskit.quantum_info.operators import SuperOp, Kraus, Pauli from test.terra.common import QiskitAerTestCase diff --git a/test/terra/noise/test_readout_error.py b/test/terra/noise/test_readout_error.py index ccf394abb6..12ce4f2e16 100644 --- a/test/terra/noise/test_readout_error.py +++ b/test/terra/noise/test_readout_error.py @@ -18,8 +18,8 @@ import numpy as np -from qiskit.providers.aer.noise.noiseerror import NoiseError -from qiskit.providers.aer.noise.errors.readout_error import ReadoutError +from qiskit_aer.noise.noiseerror import NoiseError +from qiskit_aer.noise.errors.readout_error import ReadoutError class TestReadoutError(QiskitAerTestCase): diff --git a/test/terra/noise/test_standard_errors.py b/test/terra/noise/test_standard_errors.py index 816a58d0a6..c6aea52c3f 100644 --- a/test/terra/noise/test_standard_errors.py +++ b/test/terra/noise/test_standard_errors.py @@ -17,17 +17,17 @@ import unittest import numpy as np -from qiskit.providers.aer.noise import QuantumError -from qiskit.providers.aer.noise.errors.standard_errors import amplitude_damping_error -from qiskit.providers.aer.noise.errors.standard_errors import coherent_unitary_error -from qiskit.providers.aer.noise.errors.standard_errors import depolarizing_error -from qiskit.providers.aer.noise.errors.standard_errors import kraus_error -from qiskit.providers.aer.noise.errors.standard_errors import mixed_unitary_error -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error -from qiskit.providers.aer.noise.errors.standard_errors import phase_amplitude_damping_error -from qiskit.providers.aer.noise.errors.standard_errors import phase_damping_error -from qiskit.providers.aer.noise.errors.standard_errors import thermal_relaxation_error -from qiskit.providers.aer.noise.noiseerror import NoiseError +from qiskit_aer.noise import QuantumError +from qiskit_aer.noise.errors.standard_errors import amplitude_damping_error +from qiskit_aer.noise.errors.standard_errors import coherent_unitary_error +from qiskit_aer.noise.errors.standard_errors import depolarizing_error +from qiskit_aer.noise.errors.standard_errors import kraus_error +from qiskit_aer.noise.errors.standard_errors import mixed_unitary_error +from qiskit_aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.noise.errors.standard_errors import phase_amplitude_damping_error +from qiskit_aer.noise.errors.standard_errors import phase_damping_error +from qiskit_aer.noise.errors.standard_errors import thermal_relaxation_error +from qiskit_aer.noise.noiseerror import NoiseError from test.terra.common import QiskitAerTestCase import qiskit.quantum_info as qi diff --git a/test/terra/primitives/test_estimator.py b/test/terra/primitives/test_estimator.py index 7fb7a2bbd4..13966382fe 100644 --- a/test/terra/primitives/test_estimator.py +++ b/test/terra/primitives/test_estimator.py @@ -26,7 +26,7 @@ from qiskit.primitives import EstimatorResult from qiskit.quantum_info import Operator, SparsePauliOp -from qiskit.providers.aer.primitives import Estimator +from qiskit_aer.primitives import Estimator class TestEstimator(QiskitAerTestCase): diff --git a/test/terra/primitives/test_sampler.py b/test/terra/primitives/test_sampler.py index a442f431ad..2a409fbdd6 100644 --- a/test/terra/primitives/test_sampler.py +++ b/test/terra/primitives/test_sampler.py @@ -25,7 +25,7 @@ from qiskit.primitives import SamplerResult from qiskit import QuantumCircuit -from qiskit.providers.aer.primitives import Sampler +from qiskit_aer.primitives import Sampler @ddt diff --git a/test/terra/pulse/controllers/test_pulse_controller.py b/test/terra/pulse/controllers/test_pulse_controller.py index 517772adba..dcd58bba24 100644 --- a/test/terra/pulse/controllers/test_pulse_controller.py +++ b/test/terra/pulse/controllers/test_pulse_controller.py @@ -14,7 +14,7 @@ import unittest import numpy as np -from qiskit.providers.aer.pulse.controllers.pulse_controller import setup_rhs_dict_freqs +from qiskit_aer.pulse.controllers.pulse_controller import setup_rhs_dict_freqs from ...common import QiskitAerTestCase diff --git a/test/terra/pulse/de/test_de_methods.py b/test/terra/pulse/de/test_de_methods.py index d58c8be49f..b56c7206c9 100644 --- a/test/terra/pulse/de/test_de_methods.py +++ b/test/terra/pulse/de/test_de_methods.py @@ -15,8 +15,8 @@ import unittest import numpy as np from scipy.linalg import expm -from qiskit.providers.aer.pulse.de.DE_Options import DE_Options -from qiskit.providers.aer.pulse.de.DE_Methods import (ODE_Method, +from qiskit_aer.pulse.de.DE_Options import DE_Options +from qiskit_aer.pulse.de.DE_Methods import (ODE_Method, RK4, ScipyODE, QiskitZVODE, diff --git a/test/terra/pulse/de/test_type_utils.py b/test/terra/pulse/de/test_type_utils.py index 6461ee7cf5..697d3bae2e 100644 --- a/test/terra/pulse/de/test_type_utils.py +++ b/test/terra/pulse/de/test_type_utils.py @@ -13,7 +13,7 @@ """tests for type_utils.py""" import numpy as np -from qiskit.providers.aer.pulse.de.type_utils import (convert_state, +from qiskit_aer.pulse.de.type_utils import (convert_state, type_spec_from_instance, StateTypeConverter) diff --git a/test/terra/pulse/test_duffing_model_generators.py b/test/terra/pulse/test_duffing_model_generators.py index 53eeafaea3..a07fb6af59 100644 --- a/test/terra/pulse/test_duffing_model_generators.py +++ b/test/terra/pulse/test_duffing_model_generators.py @@ -16,10 +16,10 @@ import unittest from numpy import array, array_equal, kron from test.terra.common import QiskitAerTestCase -from qiskit.providers.aer.pulse.system_models.pulse_system_model import PulseSystemModel -from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel -from qiskit.providers.aer.pulse.system_models import duffing_model_generators as model_gen -from qiskit.providers.aer.pulse.system_models.string_model_parser.operator_generators import get_oper +from qiskit_aer.pulse.system_models.pulse_system_model import PulseSystemModel +from qiskit_aer.pulse.system_models.hamiltonian_model import HamiltonianModel +from qiskit_aer.pulse.system_models import duffing_model_generators as model_gen +from qiskit_aer.pulse.system_models.string_model_parser.operator_generators import get_oper from qiskit.providers.models.backendconfiguration import UchannelLO from qiskit.quantum_info.operators.operator import Operator diff --git a/test/terra/pulse/test_system_models.py b/test/terra/pulse/test_system_models.py index 54773cbcd9..26d8ca206c 100644 --- a/test/terra/pulse/test_system_models.py +++ b/test/terra/pulse/test_system_models.py @@ -19,9 +19,9 @@ from numpy.linalg import norm from test.terra.common import QiskitAerTestCase from qiskit.providers.fake_provider import FakeOpenPulse2Q -from qiskit.providers.aer.pulse.system_models.pulse_system_model import PulseSystemModel -from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel from qiskit.providers.fake_provider import FakeArmonk +from qiskit_aer.pulse.system_models.pulse_system_model import PulseSystemModel +from qiskit_aer.pulse.system_models.hamiltonian_model import HamiltonianModel from qiskit.providers.models.backendconfiguration import UchannelLO diff --git a/test/terra/reference/ref_kraus_noise.py b/test/terra/reference/ref_kraus_noise.py index 53b2218527..dd840e9a94 100644 --- a/test/terra/reference/ref_kraus_noise.py +++ b/test/terra/reference/ref_kraus_noise.py @@ -17,8 +17,8 @@ from test.terra.utils.utils import list2dict from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.standard_errors import amplitude_damping_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.standard_errors import amplitude_damping_error # Backwards compatibility for Terra <= 0.13 if not hasattr(QuantumCircuit, 'i'): diff --git a/test/terra/reference/ref_pauli_noise.py b/test/terra/reference/ref_pauli_noise.py index c21bd5198e..8b5dbc6351 100644 --- a/test/terra/reference/ref_pauli_noise.py +++ b/test/terra/reference/ref_pauli_noise.py @@ -17,8 +17,8 @@ from test.terra.utils.utils import list2dict from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.standard_errors import pauli_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.standard_errors import pauli_error # Backwards compatibility for Terra <= 0.13 if not hasattr(QuantumCircuit, 'i'): diff --git a/test/terra/reference/ref_readout_noise.py b/test/terra/reference/ref_readout_noise.py index 39fe1fcfe9..89a7b56228 100644 --- a/test/terra/reference/ref_readout_noise.py +++ b/test/terra/reference/ref_readout_noise.py @@ -17,7 +17,7 @@ from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit from qiskit.circuit import Instruction -from qiskit.providers.aer.noise import NoiseModel +from qiskit_aer.noise import NoiseModel # ========================================================================== diff --git a/test/terra/reference/ref_reset_noise.py b/test/terra/reference/ref_reset_noise.py index c0f842c36a..a2d91bd979 100644 --- a/test/terra/reference/ref_reset_noise.py +++ b/test/terra/reference/ref_reset_noise.py @@ -17,8 +17,8 @@ from test.terra.utils.utils import list2dict from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit -from qiskit.providers.aer.noise import NoiseModel -from qiskit.providers.aer.noise.errors.standard_errors import reset_error +from qiskit_aer.noise import NoiseModel +from qiskit_aer.noise.errors.standard_errors import reset_error # Backwards compatibility for Terra <= 0.13 if not hasattr(QuantumCircuit, 'i'): diff --git a/test/terra/test_python_to_cpp.py b/test/terra/test_python_to_cpp.py index 0b158bf020..91f1171015 100644 --- a/test/terra/test_python_to_cpp.py +++ b/test/terra/test_python_to_cpp.py @@ -12,7 +12,7 @@ import unittest import numpy as np -from qiskit.providers.aer.pulse.controllers.test_python_to_cpp import \ +from qiskit_aer.pulse.controllers.test_python_to_cpp import \ test_py_list_to_cpp_vec, test_py_list_of_lists_to_cpp_vector_of_vectors,\ test_py_dict_string_numeric_to_cpp_map_string_numeric,\ test_py_dict_string_list_of_list_of_doubles_to_cpp_map_string_vec_of_vecs_of_doubles,\ diff --git a/tools/verify_wheels.py b/tools/verify_wheels.py index 7f1da3fff0..e7b117cdff 100644 --- a/tools/verify_wheels.py +++ b/tools/verify_wheels.py @@ -15,15 +15,15 @@ from qiskit.quantum_info import Operator, Statevector from qiskit.quantum_info.operators.predicates import matrix_equal -from qiskit.providers.aer.pulse.system_models.duffing_model_generators import duffing_system_model +from qiskit_aer.pulse.system_models.duffing_model_generators import duffing_system_model from qiskit.pulse import (Schedule, Play, Acquire, Waveform, DriveChannel, AcquireChannel, MemorySlot) -from qiskit.providers.aer import AerSimulator -from qiskit.providers.aer import QasmSimulator -from qiskit.providers.aer import StatevectorSimulator -from qiskit.providers.aer import UnitarySimulator -from qiskit.providers.aer import PulseSimulator +from qiskit_aer import AerSimulator +from qiskit_aer import QasmSimulator +from qiskit_aer import StatevectorSimulator +from qiskit_aer import UnitarySimulator +from qiskit_aer import PulseSimulator # Backwards compatibility for Terra <= 0.13 if not hasattr(QuantumCircuit, 'i'): diff --git a/tox.ini b/tox.ini index abedfdfe3e..aeea2b9fe8 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US LC_ALL=en_US.utf-8 + SETUPTOOLS_ENABLE_FEATURES=legacy-editable deps = -r requirements-dev.txt commands = @@ -31,8 +32,8 @@ deps = pycodestyle pylint commands = - pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit/providers/aer - pylint -j 2 -rn qiskit/providers/aer + pycodestyle --ignore=E402,W504 --max-line-length=100 qiskit_aer + pylint -j 2 -rn qiskit_aer [testenv:docs] deps =