Cluster backend

qiskit/providers/aer/aerjob.py

@@ -64,9 +64,11 @@ def __init__(self, backend, job_id, fn, qobj, *args):
         self._args = args
         self._future = None
 
-    def submit(self):
+    def submit(self, executor=None):
         """Submit the job to the backend for execution.
 
+        Args:
+            executor (futures.Executor or None): executor to handle asynchronous jobs
         Raises:
             QobjValidationError: if the JSON serialization of the Qobj passed
             during construction does not validate against the Qobj schema.
@@ -75,11 +77,11 @@ def submit(self):
         """
         if self._future is not None:
             raise JobError("We have already submitted the job!")
-
-        self._future = self._executor.submit(self._fn,
-                                             self._qobj,
-                                             self._job_id,
-                                             *self._args)
+        _exec = executor or self._executor
+        self._future = _exec.submit(self._fn,
+                                    self._qobj,
+                                    self._job_id,
+                                    *self._args)
 
     @requires_submit
     def result(self, timeout=None):

qiskit/providers/aer/backends/aerbackend.py

@@ -27,11 +27,16 @@
 from qiskit.providers.models import BackendStatus
 from qiskit.result import Result
 from qiskit.utils import deprecate_arguments
+from qiskit.circuit import QuantumCircuit
+from qiskit.pulse import Schedule
 from qiskit.qobj import QasmQobj, PulseQobj
 from qiskit.compiler import assemble
 
 from ..aerjob import AerJob
 from ..aererror import AerError
+from .cluster.utils import split
+from .cluster.aerjobset import AerJobSet
+
 
 # Logger
 logger = logging.getLogger(__name__)
@@ -135,6 +140,9 @@ def run(self,
               ``backend_options`` taking precedence. This kwarg is deprecated
               and direct kwarg's should be used for options to pass them to
               ``run_options``.
+
+        Raises:
+            ValueError: if run is not implemented
         """
         # DEPRECATED
         if backend_options is not None:
@@ -146,28 +154,68 @@ def run(self,
                 DeprecationWarning,
                 stacklevel=3)
 
-        if isinstance(circuits, (QasmQobj, PulseQobj)):
-            warnings.warn('Using a qobj for run() is deprecated and will be '
-                          'removed in a future release.',
-                          PendingDeprecationWarning,
-                          stacklevel=2)
-            qobj = circuits
+        executor = None
+        if backend_options and "executor" in backend_options:
+            executor = backend_options["executor"]
+            del backend_options["executor"]
+
+        if "executor" in run_options:
+            executor = run_options["executor"]
+            del run_options["executor"]
+
+        if executor:
+            if isinstance(circuits, (QasmQobj, PulseQobj)):
+                experiments = split(circuits)
+            elif isinstance(circuits, (QuantumCircuit, Schedule)):
+                experiments = [assemble(circuits, self)]
+            elif (
+                    isinstance(circuits, list) and
+                    all(isinstance(circ, QuantumCircuit) for circ in circuits) or
+                    isinstance(circuits, list) and
+                    all(isinstance(circ, Schedule) for circ in circuits)
+            ):
+                experiments = [assemble(circ, self) for circ in circuits]
+            else:
+                raise ValueError(
+                    "run() is not implemented for this "
+                    "type of experiment ({})".format(str(type(circuits))))
+
+            for experiment in experiments:
+                self._add_options_to_qobj(experiment,
+                                          backend_options=backend_options,
+                                          **run_options)
+                # Optional validation
+                if validate:
+                    self._validate(experiment)
+
+            job_id = str(uuid.uuid4())
+            aer_job_set = AerJobSet(self, job_id, self._run, experiments, executor)
+            aer_job_set.submit()
+            return aer_job_set
+
         else:
-            qobj = assemble(circuits, self)
+            if isinstance(circuits, (QasmQobj, PulseQobj)):
+                warnings.warn('Using a qobj for run() is deprecated and will be '
+                              'removed in a future release.',
+                              PendingDeprecationWarning,
+                              stacklevel=2)
+                qobj = circuits
+            else:
+                qobj = assemble(circuits, self)
 
-        # Add backend options to the Job qobj
-        self._add_options_to_qobj(
-            qobj, backend_options=backend_options, **run_options)
+            # Add backend options to the Job qobj
+            self._add_options_to_qobj(
+                qobj, backend_options=backend_options, **run_options)
 
-        # Optional validation
-        if validate:
-            self._validate(qobj)
+            # Optional validation
+            if validate:
+                self._validate(qobj)
 
-        # Submit job
-        job_id = str(uuid.uuid4())
-        aer_job = AerJob(self, job_id, self._run, qobj)
-        aer_job.submit()
-        return aer_job
+            # Submit job
+            job_id = str(uuid.uuid4())
+            aer_job = AerJob(self, job_id, self._run, qobj)
+            aer_job.submit()
+            return aer_job
 
     def configuration(self):
         """Return the simulator backend configuration.
@@ -236,7 +284,7 @@ def status(self):
             pending_jobs=0,
             status_msg='')
 
-    def _run_job(self, job_id, qobj, backend_options, noise_model, validate):
+    def _run_job(self, job_id, qobj, backend_options=None, noise_model=None, validate=False):
         """Run a qobj job"""
         warnings.warn(
             'The `_run_job` method has been deprecated. Use `_run` instead.',
@@ -256,6 +304,9 @@ def _run_job(self, job_id, qobj, backend_options, noise_model, validate):
                                   noise_model=noise_model)
         return self._run(qobj, job_id)
 
+    def _dummy_job(self):
+        return
+
     def _run(self, qobj, job_id=''):
         """Run a job"""
         # Start timer
@@ -347,6 +398,7 @@ def set_option(self, key, value):
                 setattr(self._options, key, getattr(self._default_options(), key))
 
     def set_options(self, **fields):
+        """Set the simulator options"""
         for key, value in fields.items():
             self.set_option(key, value)
 

qiskit/providers/aer/backends/cluster/__init__.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2018, 2019.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+"""
+===========================================================
+Cluster Backend (:mod:`qiskit.providers.aer.backends.cluster`)
+===========================================================
+
+.. currentmodule:: qiskit.providers.aer.backends.cluster
+
+High level mechanism for handling cluster jobs.
+
+Classes
+==========================
+.. autosummary::
+   :toctree: ../stubs/
+
+   ClusterBackend
+"""
+
+from .aerjobset import AerJobSet