Skip to content

Commit

Permalink
Linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
caleb-johnson committed Apr 8, 2023
1 parent c39e41f commit b5ff495
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
from qiskit.algorithms.optimizers import SPSA, Optimizer, OptimizerResult
from qiskit.opflow import PauliSumOp, OperatorBase
from qiskit.quantum_info import Statevector
from qiskit_nature.second_q.problems import ElectronicStructureProblem, EigenstateResult, ElectronicBasis
from qiskit_nature.second_q.problems import (
ElectronicStructureProblem,
EigenstateResult,
ElectronicBasis,
)
from qiskit_nature.second_q.algorithms import GroundStateSolver
from qiskit_nature.second_q.drivers import PySCFDriver
from qiskit_ibm_runtime import QiskitRuntimeService, Options
Expand Down Expand Up @@ -349,13 +353,9 @@ def solve(
start_time = time()

if callable(self._optimizer):
self.optimizer(
fun=evaluate_eigenvalue, x0=self._initial_point
)
self.optimizer(fun=evaluate_eigenvalue, x0=self._initial_point)
else:
self.optimizer.minimize(
fun=evaluate_eigenvalue, x0=self._initial_point
)
self.optimizer.minimize(fun=evaluate_eigenvalue, x0=self._initial_point)

elapsed_time = time() - start_time

Expand Down Expand Up @@ -445,7 +445,6 @@ def get_qubit_operators(

hamiltonian_ops, self._energy_shift = cholesky_decomposition(
problem, mo_coeffs, self._orbitals_to_reduce

)
return hamiltonian_ops

Expand Down
9 changes: 7 additions & 2 deletions docs/how-tos/entanglement_forging/freeze-orbitals.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@
"from qiskit_nature.second_q.drivers import PySCFDriver\n",
"from qiskit_nature.second_q.problems import ElectronicStructureProblem\n",
"from qiskit_nature.second_q.mappers import QubitConverter, JordanWignerMapper\n",
"from qiskit_nature.second_q.algorithms import GroundStateEigensolver, NumPyMinimumEigensolverFactory\n",
"from qiskit_nature.second_q.algorithms import (\n",
" GroundStateEigensolver,\n",
" NumPyMinimumEigensolverFactory,\n",
")\n",
"\n",
"from circuit_knitting_toolbox.entanglement_forging import (\n",
" EntanglementForgingAnsatz,\n",
Expand Down Expand Up @@ -76,7 +79,9 @@
"H2_x = radius_2 * np.cos(np.pi / 180 * thetas_in_deg)\n",
"H2_y = radius_2 * np.sin(np.pi / 180 * thetas_in_deg)\n",
"\n",
"driver = PySCFDriver(f\"O 0.0 0.0 0.0; H {H1_x} 0.0 0.0; H {H2_x} {H2_y} 0.0\", basis=\"sto6g\")\n",
"driver = PySCFDriver(\n",
" f\"O 0.0 0.0 0.0; H {H1_x} 0.0 0.0; H {H2_x} {H2_y} 0.0\", basis=\"sto6g\"\n",
")\n",
"driver.run()\n",
"problem = driver.to_problem()\n",
"converter = QubitConverter(JordanWignerMapper())"
Expand Down
51 changes: 34 additions & 17 deletions docs/how-tos/entanglement_forging/use-asymmetric-bitstrings.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,16 @@
"outputs": [],
"source": [
"# Define a molecular system of interest - Methyl radical\n",
"molecule = MoleculeInfo(symbols=\"CHHH\",\n",
" coords=[\n",
" (0.0, 0.0, 0.0),\n",
" (1.0790, 0.0, 0.0),\n",
" (-0.5395, -0.9344, 0.0),\n",
" (-0.5395, 0.9344, 0.0)\n",
" ],\n",
" multiplicity=2\n",
" )\n",
"molecule = MoleculeInfo(\n",
" symbols=\"CHHH\",\n",
" coords=[\n",
" (0.0, 0.0, 0.0),\n",
" (1.0790, 0.0, 0.0),\n",
" (-0.5395, -0.9344, 0.0),\n",
" (-0.5395, 0.9344, 0.0),\n",
" ],\n",
" multiplicity=2,\n",
")\n",
"\n",
"driver = PySCFDriver.from_molecule(molecule)\n",
"driver.run()\n",
Expand Down Expand Up @@ -101,13 +102,27 @@
"nuclear_repulsion_energy = problem_reduced.nuclear_repulsion_energy\n",
"\n",
"# These are the integrals in the molecular orbital basis retrieved from the 6 orbital active space.\n",
"one_body_integrals_alpha = problem_reduced.hamiltonian.electronic_integrals.one_body.alpha[\"+-\"]\n",
"one_body_integrals_beta = problem_reduced.hamiltonian.electronic_integrals.one_body.beta[\"+-\"]\n",
"two_body_integrals_alpha_alpha = problem_reduced.hamiltonian.electronic_integrals.two_body.alpha['++--']\n",
"two_body_integrals_beta_beta = problem_reduced.hamiltonian.electronic_integrals.two_body.beta['++--']\n",
"two_body_integrals_alpha_beta = problem_reduced.hamiltonian.electronic_integrals.two_body.alpha_beta['++--']\n",
"two_body_integrals_beta_alpha = problem_reduced.hamiltonian.electronic_integrals.two_body.beta_alpha['++--']\n",
"two_body_integrals_beta_beta = problem_reduced.hamiltonian.electronic_integrals.two_body.beta['++--']"
"one_body_integrals_alpha = (\n",
" problem_reduced.hamiltonian.electronic_integrals.one_body.alpha[\"+-\"]\n",
")\n",
"one_body_integrals_beta = (\n",
" problem_reduced.hamiltonian.electronic_integrals.one_body.beta[\"+-\"]\n",
")\n",
"two_body_integrals_alpha_alpha = (\n",
" problem_reduced.hamiltonian.electronic_integrals.two_body.alpha[\"++--\"]\n",
")\n",
"two_body_integrals_beta_beta = (\n",
" problem_reduced.hamiltonian.electronic_integrals.two_body.beta[\"++--\"]\n",
")\n",
"two_body_integrals_alpha_beta = (\n",
" problem_reduced.hamiltonian.electronic_integrals.two_body.alpha_beta[\"++--\"]\n",
")\n",
"two_body_integrals_beta_alpha = (\n",
" problem_reduced.hamiltonian.electronic_integrals.two_body.beta_alpha[\"++--\"]\n",
")\n",
"two_body_integrals_beta_beta = (\n",
" problem_reduced.hamiltonian.electronic_integrals.two_body.beta[\"++--\"]\n",
")"
]
},
{
Expand All @@ -124,7 +139,9 @@
"outputs": [],
"source": [
"# Create an ElectronicStructureProblem from our IntegralDriver and performing second quantization transformation\n",
"hamiltonian = ElectronicEnergy.from_raw_integrals(one_body_integrals_alpha, two_body_integrals_alpha_alpha)\n",
"hamiltonian = ElectronicEnergy.from_raw_integrals(\n",
" one_body_integrals_alpha, two_body_integrals_alpha_alpha\n",
")\n",
"hamiltonian.nuclear_repulsion_energy = nuclear_repulsion_energy\n",
"problem = ElectronicStructureProblem(hamiltonian)\n",
"problem.num_particles = (3, 2)\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
"system_data = np.load(Path(\"data\") / \"reactant_2mo.npz\")\n",
"num_molecular_orbitals = 2\n",
"\n",
"hamiltonian = ElectronicEnergy.from_raw_integrals(system_data[\"h1\"], system_data[\"Gamma_eri\"])\n",
"hamiltonian = ElectronicEnergy.from_raw_integrals(\n",
" system_data[\"h1\"], system_data[\"Gamma_eri\"]\n",
")\n",
"hamiltonian.nuclear_repulsion_energy = system_data[\"h0\"]\n",
"problem = ElectronicStructureProblem(hamiltonian)\n",
"problem.num_particles = (system_data[\"na\"], system_data[\"nb\"])\n",
Expand Down

0 comments on commit b5ff495

Please sign in to comment.