move all contraction to cotengra

jcmgray · Oct 13, 2023 · 4021b38 · 4021b38
1 parent 4f2f8c1
commit 4021b38
Show file tree

Hide file tree

Showing 20 changed files with 12,669 additions and 717 deletions.
diff --git a/ci/requirements/py-base.yml b/ci/requirements/py-base.yml
@@ -3,15 +3,14 @@ channels:
   - conda-forge
 dependencies:
   - autoray>=0.6.6
+  - cotengra
   - coverage
   - cytoolz
-  - diskcache
   - joblib
   - matplotlib
   - networkx
   - numba>=0.56
   - numpy
-  - opt_einsum>=3.2
   - psutil
   - pytest
   - pytest-cov

diff --git a/ci/requirements/py-jax.yml b/ci/requirements/py-jax.yml
@@ -3,15 +3,14 @@ channels:
   - conda-forge
 dependencies:
   - autoray>=0.6.6
+  - cotengra
   - coverage
   - cytoolz
-  - diskcache
   - joblib
   - matplotlib
   - networkx
   - numba>=0.56
   - numpy
-  - opt_einsum>=3.2
   - psutil
   - pytest
   - pytest-cov

diff --git a/ci/requirements/py-slepc.yml b/ci/requirements/py-slepc.yml
@@ -3,17 +3,16 @@ channels:
   - defaults
 dependencies:
   - autoray>=0.6.6
+  - cotengra
   - coverage
   - cytoolz
-  - diskcache
   - joblib
   - matplotlib
   - mpi4py>=3.1
   - networkx
   - numba>=0.56
   - numpy
   - openmpi
-  - opt_einsum>=3.2
   - petsc=*=*complex*
   - petsc4py
   - psutil

diff --git a/ci/requirements/py-tensorflow.yml b/ci/requirements/py-tensorflow.yml
@@ -3,15 +3,14 @@ channels:
   - conda-forge
 dependencies:
   - autoray>=0.6.6
+  - cotengra
   - coverage
   - cytoolz
-  - diskcache
   - joblib
   - matplotlib
   - networkx
   - numba>=0.56
   - numpy
-  - opt_einsum>=3.2
   - psutil
   - pytest
   - pytest-cov

diff --git a/ci/requirements/py-torch.yml b/ci/requirements/py-torch.yml
@@ -4,16 +4,15 @@ channels:
   - conda-forge
 dependencies:
   - autoray>=0.6.6
+  - cotengra
   - coverage
   - cpuonly
   - cytoolz
-  - diskcache
   - joblib
   - matplotlib
   - networkx
   - numba>=0.56
   - numpy
-  - opt_einsum>=3.2
   - psutil
   - pytest
   - pytest-cov

diff --git a/docs/examples/ex_tensorflow_optimize_pbc_mps.ipynb b/docs/examples/ex_tensorflow_optimize_pbc_mps.ipynb
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -33,10 +33,10 @@ For ease and performance (i.e. mkl compiled libraries), `conda <https://conda.io
 
 In addition, the tensor network library, :mod:`quimb.tensor`, requires:
 
-* `opt_einsum <https://github.com/dgasmith/opt_einsum>`_
+* `cotengra <https://github.com/jcmgray/cotengra>`_
 * `autoray <https://github.com/jcmgray/autoray>`_
 
-``opt_einsum`` efficiently optimizes tensor contraction expressions. It can be installed with ``pip`` or from `conda-forge <https://conda-forge.org>`_ and is a required dependency since various bits of the core ``quimb`` module now make use tensor-network functionality behind the scenes.
+``cotengra`` efficiently optimizes tensor contraction expressions. It can be installed with ``pip`` or from `conda-forge <https://conda-forge.org>`_ and is a required dependency since various bits of the core ``quimb`` module now make use tensor-network functionality behind the scenes.
 ``autoray`` allows backend agnostic numeric code for various tensor network operations so that many libraries other than ``numpy`` can be used. It can be installed via ``pip`` from `pypi <https://pypi.org/project/autoray/>`_ or via ``conda`` `from conda-forge <https://anaconda.org/conda-forge/autoray>`_.
 
 

diff --git a/docs/tensor-basics.ipynb b/docs/tensor-basics.ipynb