diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index e8baf7489..03e079878 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -46,9 +46,4 @@ jobs: run: | pver=${{ matrix.python-version }} tox -epy${pver/./} -- --run-slow - notebook_flags="" - if [ "$pver" = "3.12" ]; then - echo Skipping tutorials that require cplex - notebook_flags="${notebook_flags} --ignore=docs/circuit_cutting/cutqc/tutorials/tutorial_1_automatic_cut_finding.ipynb" - fi - tox -epy${pver/./}-notebook -- ${notebook_flags} + tox -epy${pver/./}-notebook diff --git a/CITATION.bib b/CITATION.bib index f098dff50..7f90b42a3 100644 --- a/CITATION.bib +++ b/CITATION.bib @@ -12,10 +12,7 @@ @misc{circuit-knitting-toolbox and Edwin Pednault and C. D. Pemmaraju and Pedro Rivero - and Seetharami Seelam and Ibrahim Shehzad - and Dharmashankar Subramanian - and Wei Tang and Stefan Woerner }, title = {{Circuit Knitting Toolbox}}, diff --git a/INSTALL.rst b/INSTALL.rst index 068f40e2b..0d84681b5 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -9,18 +9,8 @@ packages. There are three primary ways to do this: - :ref:`Option 2` - :ref:`Option 3` -CutQC users should consult the :ref:`Platform Support` section to determine -which installation option is appropriate for them. Users who wish to run within a -containerized environment may skip the pre-installation and move straight -to :ref:`Option 3`. - -.. note:: - - If a user wishes to use the circuit cutting toolbox to - automatically find optimized wire cuts for a circuit too large for - the free version of CPLEX, they should acquire a license and install - the `full - version `__. +Users who wish to run within a containerized environment may skip the +pre-installation and move straight to :ref:`Option 3`. Pre-Installation ^^^^^^^^^^^^^^^^ @@ -61,14 +51,6 @@ Upgrade pip and install the CKT package. pip install --upgrade pip pip install circuit-knitting-toolbox -Users intending to use the automatic cut finding functionality in the CutQC package should install the ``cplex`` optional dependency. - -Adjust the options below to suit your needs. - -.. code:: sh - - pip install 'circuit-knitting-toolbox[cplex]' - .. _Option 2: @@ -94,13 +76,11 @@ The next step is to install CKT to the virtual environment. If you plan on runni notebook dependencies in order to run all the visualizations in the notebooks. If you plan on developing in the repository, you may want to install the ``dev`` dependencies. -Users intending to use the automatic cut finding functionality in the CutQC package should install the ``cplex`` optional dependency. - Adjust the options below to suit your needs. .. code:: sh - pip install tox notebook -e '.[notebook-dependencies,dev,cplex]' + pip install tox notebook -e '.[notebook-dependencies,dev]' If you installed the notebook dependencies, you can get started with CKT by running the notebooks in the docs. @@ -166,27 +146,6 @@ the only one that will be saved across different container runs. Platform Support ^^^^^^^^^^^^^^^^ -Users of Mac M1 or M2 chips and Windows users may have issues running certain components of CKT. - -If you are using Linux or macOS with an Intel chip (i.e., not the -new M1 or M2 chips), everything should work natively, so we -recommend either :ref:`Option 1` or :ref:`Option 2`. - -All users on ARM chips, as well as all Windows users, may have to -take care when installing the toolbox, depending on which tools they -intend to use. - - - The automatic wire cut search in the ``cutqc`` package depends - on CPLEX, which is only available on Intel chips and is not yet available - for Python 3.12. - -In each case, one method that is guaranteed to work is to :ref:`use -the toolbox within Docker