Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump main before release #403

Merged
merged 9 commits into from
Jun 19, 2024
1 change: 0 additions & 1 deletion .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
- name: Install pyscf
run: |
python -m pip install pyscf
python -m pip install git+https://github.com/pyscf/semiempirical
if: always()

- name: Install rdkit, openbabel-wheel
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
test_suite="tangelo",
install_requires=['h5py', 'bitarray', 'openfermion'],
extras_require={
'pyscf': ['pyscf'] #'pyscf-semiempirical @ git+https://github.com/pyscf/[email protected]'], # pyscf-semiempirical PyPI sdist is missing C extension files
'pyscf': ['pyscf']
}
)
2 changes: 1 addition & 1 deletion tangelo/algorithms/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.

from .variational import BuiltInAnsatze, VQESolver, ADAPTSolver, SA_VQESolver, SA_OO_Solver
from .classical import FCISolver, CCSDSolver, MINDO3Solver, MP2Solver
from .classical import FCISolver, CCSDSolver, MP2Solver
from .projective import QITESolver
1 change: 0 additions & 1 deletion tangelo/algorithms/classical/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@

from .fci_solver import FCISolver
from .ccsd_solver import CCSDSolver
from .semi_empirical_solver import MINDO3Solver
from .mp2_solver import MP2Solver
76 changes: 0 additions & 76 deletions tangelo/algorithms/classical/semi_empirical_solver.py

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import numpy as np
from scipy.spatial.transform import Rotation as R

from tangelo.algorithms import CCSDSolver, FCISolver, VQESolver, MINDO3Solver, ADAPTSolver, QITESolver
from tangelo.algorithms import CCSDSolver, FCISolver, VQESolver, ADAPTSolver, QITESolver
from tangelo.problem_decomposition.oniom._helpers.capping_groups import elements, chemical_groups
from tangelo.toolboxes.molecular_computation.molecule import SecondQuantizedMolecule, get_default_integral_solver

Expand Down Expand Up @@ -145,7 +145,7 @@ def __init__(self, solver_low: str = None, options_low: dict = None, solver_high
self.solver_high = solver_high.upper() if solver_high is not None else solver_high
self.options_high = options_high if options_high is not None else default_solver_options

self.supported_classical_solvers = {"HF": None, "CCSD": CCSDSolver, "FCI": FCISolver, "MINDO3": MINDO3Solver}
self.supported_classical_solvers = {"HF": None, "CCSD": CCSDSolver, "FCI": FCISolver}
self.supported_quantum_solvers = {"VQE": VQESolver, "ADAPT": ADAPTSolver, "QITE": QITESolver}

# Check if the solvers are implemented in ONIOM.
Expand Down Expand Up @@ -242,8 +242,7 @@ def get_energy(molecule, solver):
# In case of RHF solver (inside SecondQuantizedMolecule object).
if isinstance(solver, str):
energy = molecule.mf_energy
# The remaining case is for VQESolver, CCSDSolver, FCISolver and
# MINDO3Solver.
# The remaining case is for VQESolver, CCSDSolver, FCISolver.
else:
energy = solver.simulate()

Expand Down
Loading