Skip to content

Commit

Permalink
Merge branch 'devel' into pr-qex
Browse files Browse the repository at this point in the history
  • Loading branch information
kottmanj authored Jun 6, 2024
2 parents 8283341 + fe4a468 commit a76682c
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_backends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8]
python-version: ['3.9']

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8]
python-version: ['3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_basic_autograd.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Tequila-Test-Basic-Autograd
name: Tequila-Test-Basic-JAX

on:
push:
Expand All @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ['3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand All @@ -28,8 +28,8 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip uninstall -y jax jaxlib
pip install autograd
pip uninstall autograd -y
pip install jax jaxlib
- name: Lint with flake8
run: |
pip install flake8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_chemistry_madness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: ['3.10']

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_chemistry_pyscf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_conda_madness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_ml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/ci_optimizers.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci_pyquil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# remove qulacs from dependencies (issues with windows and mac)
# users need to install themselves if they want it
cat requirements.txt | sed "s|qulacs|#qulacs|g" > tmp.txt
#cat requirements.txt | sed "s|qulacs|#qulacs|g" > tmp.txt
rm requirements.txt
mv tmp.txt requirements.txt
python setup.py sdist bdist_wheel
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/release.yml

This file was deleted.

10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Tequila can execute the underlying quantum expectation values on state of the ar
- [talks and slides](https://kottmanj.github.io/talks_and_material/)

# Installation
Recommended Python version is 3.9 - 3.10.
Recommended Python version is 3.9 (3.10).
Tequila supports linux, osx and windows. However, not all optional dependencies are supported on windows.

## Install from PyPi
Expand Down Expand Up @@ -251,11 +251,7 @@ Quantum Equation of Motion with Orbital Optimization for Computing Molecular Pro
Let us know, if you want your research project and/or tutorial to be included in this list!

# Dependencies
Support for additional optimizers or quantum backends can be activated by intalling them in your environment.
Tequila will then detect them automatically.
Currently those are: [Phoenics](https://github.com/aspuru-guzik-group/phoenics)
and [GPyOpt](https://sheffieldml.github.io/GPyOpt/).
Quantum backends are treated in the same way.
Support for specific backends (quantum simulators, optimizers, quantum chemistry) can be activated by intalling them in your environment.

## Quantum Backends
Currently supported
Expand Down Expand Up @@ -389,5 +385,3 @@ Tequila runs on Mac OSX.
You might get in trouble with installing qulacs since it currently does not work with Apple's clang compiler.
You need to install latest GNU compile (at least gcc-7 and g++7) and set them as default before installing qulacs over pip.

## Qibo and GPyOpt
Currently you can't use Qibo and GPyOpt within the same environment.
17 changes: 0 additions & 17 deletions requirements_gpyopt.txt

This file was deleted.

0 comments on commit a76682c

Please sign in to comment.