diff --git a/dev_tools/build_sphinx_docs.sh b/dev_tools/build_sphinx_docs.sh index 537f66844..84ce4b129 100644 --- a/dev_tools/build_sphinx_docs.sh +++ b/dev_tools/build_sphinx_docs.sh @@ -4,10 +4,6 @@ # or mock the desired packages in docs/source/conf.py pip install sphinx sphinx_rtd_theme nbsphinx -# This environment seems to work for building the docs. -# Something fishy otherwise. -pip install -r requirements.txt - # Support for LaTeX sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended pandoc dvipng diff --git a/dev_tools/requirements.txt b/dev_tools/requirements.txt deleted file mode 100644 index 304513540..000000000 --- a/dev_tools/requirements.txt +++ /dev/null @@ -1,188 +0,0 @@ -alabaster==0.7.12 -amazon-braket-default-simulator==1.1.1.post2 -amazon-braket-schemas==1.1.3 -amazon-braket-sdk==1.5.15 -argon2-cffi==21.1.0 -attrs==20.3.0 -Babel==2.9.1 -backcall==0.2.0 -backoff==1.10.0 -beautifulsoup4==4.10.0 -bitarray==2.0.1 -bleach==4.1.0 -boltons==20.2.1 -boto3==1.17.66 -botocore==1.20.66 -cachetools==4.2.2 -certifi==2020.12.5 -cffi==1.14.5 -chardet==4.0.0 -charset-normalizer==2.0.7 -cirq==0.10.0 -cirq-aqt==0.13.1 -cirq-core==0.12.0 -cirq-google==0.12.0 -cirq-ionq==0.13.1 -cirq-pasqal==0.13.1 -cirq-rigetti==0.13.1 -cirq-web==0.13.1 -coverage==5.5 -cryptography==3.4.7 -cycler==0.10.0 -debugpy==1.5.1 -decorator==4.4.2 -defusedxml==0.7.1 -deprecation==2.1.0 -dill==0.3.3 -dlx==1.0.4 -docplex==2.20.204 -docutils==0.17.1 -duet==0.2.3 -entrypoints==0.3 -fastdtw==0.3.4 -fastjsonschema==2.15.0 -fonttools==4.27.1 -future==0.18.2 -geometric==0.9.7.2 -google-api-core==1.26.3 -google-auth==1.30.0 -google-cloud==0.34.0 -googleapis-common-protos==1.53.0 -graphviz==0.16 -grpcio==1.37.1 -h11==0.9.0 -h5py==2.9.0 -httpcore==0.11.1 -httpx==0.15.5 -idna==2.10 -imagesize==1.2.0 -inflection==0.5.1 -iniconfig==1.1.1 -ipykernel==5.5.5 -ipython==7.23.1 -ipython-genutils==0.2.0 -ipywidgets==7.6.5 -iso8601==0.1.16 -jedi==0.18.0 -Jinja2==2.11.3 -jmespath==0.10.0 -joblib==1.0.1 -jsonschema==3.2.0 -jupyter==1.0.0 -jupyter-client==6.1.12 -jupyter-console==6.4.0 -jupyter-core==4.7.1 -jupyterlab-pygments==0.1.2 -jupyterlab-widgets==1.0.2 -kiwisolver==1.3.1 -lark==0.11.3 -lark-parser==0.11.3 -lxml==4.6.3 -MarkupSafe==2.0.1 -matplotlib==3.4.1 -matplotlib-inline==0.1.2 -mistune==0.8.4 -more-itertools==8.8.0 -mpmath==1.2.1 -msgpack==0.6.2 -multitasking==0.0.9 -nbclient==0.5.4 -nbconvert==6.2.0 -nbformat==5.1.3 -nbsphinx==0.8.7 -nest-asyncio==1.5.1 -networkx==2.5.1 -notebook==6.4.5 -ntlm-auth==1.5.0 -numpy==1.20.1 -openfermion==1.0.1 -openfermionpyscf==0.5 -opt-einsum==3.3.0 -packaging==20.9 -pandas==1.2.3 -pandocfilters==1.5.0 -parso==0.8.2 -pexpect==4.8.0 -pickleshare==0.7.5 -Pillow==8.2.0 -pluggy==1.0.0.dev0 -ply==3.11 -prometheus-client==0.11.0 -prompt-toolkit==3.0.18 -protobuf==3.13.0 -psutil==5.8.0 -ptyprocess==0.7.0 -PubChemPy==1.0.4 -py==1.10.0 -py3Dmol==0.9.1 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pybind11==2.6.2 -pycparser==2.20 -pydantic==1.8.1 -Pygments==2.9.0 -PyJWT==1.7.1 -pylatexenc==2.10 -pyparsing==3.0.0b2 -pyquil==3.0.1 -pyrsistent==0.17.3 -pyscf==1.7.6 -pytest==6.2.4 -python-constraint==1.4.0 -python-dateutil==2.8.1 -python-rapidjson==1.5 -pytket==0.11.0 -pytket-qiskit==0.13.0 -pytz==2021.1 -pyzmq==19.0.2 -qcs-api-client==0.8.0 -qtconsole==5.1.1 -QtPy==1.11.2 -Quandl==3.6.0 -Qulacs==0.3.0 -requests==2.25.1 -requests-ntlm==1.1.0 -retry==0.9.2 -retrying==1.3.3 -retworkx==0.8.0 -rfc3339==6.2 -rfc3986==1.5.0 -rpcq==3.9.2 -rsa==4.7.2 -ruamel.yaml==0.17.17 -ruamel.yaml.clib==0.2.6 -s3transfer==0.4.2 -scikit-learn==0.24.1 -scipy==1.6.1 -Send2Trash==1.8.0 -setuptools-scm==6.3.2 -six==1.15.0 -sniffio==1.2.0 -snowballstemmer==2.1.0 -sortedcontainers==2.3.0 -soupsieve==2.2.1 -Sphinx==4.2.0 -sphinx-rtd-theme==1.0.0 -sphinxcontrib-applehelp==1.0.2 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.5 -sseclient==0.0.27 -sympy==1.7.1 -terminado==0.12.1 -testpath==0.5.0 -threadpoolctl==2.1.0 -toml==0.10.2 -tomli==1.2.1 -tornado==6.1 -tqdm==4.60.0 -traitlets==5.0.5 -typing-extensions==3.10.0.0 -urllib3==1.26.4 -wcwidth==0.2.5 -webencodings==0.5.1 -websockets==9.0.1 -widgetsnbextension==3.5.1 -yfinance==0.1.55 diff --git a/docs/source/index.rst b/docs/source/index.rst index 6d0b5022f..79c6ad37a 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -11,7 +11,6 @@ Welcome to tangelo's documentation! :caption: Contents: README - tutorials tangelo Indices and tables diff --git a/tangelo/linq/qpu_connection/qemist_cloud_connection.py b/tangelo/linq/qpu_connection/qemist_cloud_connection.py index c7e2f6544..8e051d278 100644 --- a/tangelo/linq/qpu_connection/qemist_cloud_connection.py +++ b/tangelo/linq/qpu_connection/qemist_cloud_connection.py @@ -20,7 +20,7 @@ """ try: - from qemist_client import util + import qemist_client as qclient except ModuleNotFoundError: print("qemist_client python package not found (optional dependency for hardware experiment submission)") @@ -45,8 +45,8 @@ def job_submit(circuit, n_shots, backend): job_options = {'shots': n_shots, 'backend': backend} # Submit the problem - qemist_cloud_job_id = util.solve_quantum_circuits_async(serialized_fragment=circuit_data, - serialized_solver=job_options)[0] + qemist_cloud_job_id = qclient.util.solve_quantum_circuits_async(serialized_fragment=circuit_data, + serialized_solver=job_options)[0] return qemist_cloud_job_id @@ -60,7 +60,7 @@ def job_status(qemist_cloud_job_id): Returns: str: current status of the problem, as a string. """ - res = util.get_problem_status(qemist_cloud_job_id) + res = qclient.util.get_problem_status(qemist_cloud_job_id) return res @@ -75,7 +75,7 @@ def job_cancel(qemist_cloud_job_id): Returns: dict: cancelled problems / subproblems. """ - res = util.cancel_problems(qemist_cloud_job_id) + res = qclient.util.cancel_problems(qemist_cloud_job_id) # TODO: If res is coming out as an error code, we should raise an error return res @@ -95,7 +95,7 @@ def job_result(qemist_cloud_job_id): """ try: - util.monitor_problem_status(problem_handle=qemist_cloud_job_id, verbose=False) + qclient.util.monitor_problem_status(problem_handle=qemist_cloud_job_id, verbose=False) except KeyboardInterrupt: print(f"\nYour problem is still running with id {qemist_cloud_job_id}.\n") @@ -117,7 +117,7 @@ def job_result(qemist_cloud_job_id): # Once a result is available, retrieve it. # If the util module is not found earlier, an error has been raised. - output = util.get_quantum_results(problem_handle=qemist_cloud_job_id)[qemist_cloud_job_id] + output = qclient.util.get_quantum_results(problem_handle=qemist_cloud_job_id)[qemist_cloud_job_id] # Amazon Braket: parsing of output freqs = output['result']['results']['measurement_probabilities'] @@ -155,6 +155,6 @@ def job_estimate(circuit, n_shots, backend=None): if backend: job_options['backend'] = backend - price_estimate = util.check_qpu_cost(circuit_data, job_options) + price_estimate = qclient.util.check_qpu_cost(circuit_data, job_options) return price_estimate