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.

Sign up for GitHub

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

Jump to bottom

Remove QuantumControlBase #16

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Remove QuantumControlBase #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ version = "0.1.7+dev"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[compat]
LinearAlgebra = "1"
QuantumControlBase = ">=0.10.0"
QuantumControl = ">=0.10.0"
Random = "1"
SparseArrays = "1"
julia = "1.9"
2 changes: 1 addition & 1 deletion src/evaluate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QuantumControlBase.QuantumPropagators.Controls: evaluate, evaluate!
import QuantumControl.QuantumPropagators.Controls: evaluate, evaluate!


function evaluate(O::GradgenOperator, args...; kwargs...)
Expand Down
8 changes: 4 additions & 4 deletions src/grad_generator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using QuantumControlBase: get_control_derivs
import QuantumControlBase.QuantumPropagators.Controls: get_controls
import QuantumControlBase.QuantumPropagators.Controls: get_parameters
import QuantumControlBase.QuantumPropagators: _exp_prop_convert_operator
using QuantumControl.Controls: get_control_derivs
import QuantumControl.QuantumPropagators.Controls: get_controls
import QuantumControl.QuantumPropagators.Controls: get_parameters
import QuantumControl.QuantumPropagators: _exp_prop_convert_operator


@doc raw"""Extended generator for the standard dynamic gradient.
Expand Down
4 changes: 2 additions & 2 deletions src/grad_vector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QuantumControlBase.QuantumPropagators: _exp_prop_convert_state
import QuantumControlBase.QuantumPropagators.Interfaces: supports_inplace
import QuantumControl.QuantumPropagators: _exp_prop_convert_state
import QuantumControl.QuantumPropagators.Interfaces: supports_inplace


@doc raw"""Extended state-vector for the dynamic gradient.
Expand Down
8 changes: 4 additions & 4 deletions src/gradgen_operator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Random: GLOBAL_RNG
import QuantumControlBase.QuantumPropagators: _exp_prop_convert_operator
import QuantumControlBase.QuantumPropagators.Controls: get_controls
import QuantumControlBase.QuantumPropagators.SpectralRange: random_state
import QuantumControlBase.QuantumPropagators.Interfaces: supports_inplace
import QuantumControl.QuantumPropagators: _exp_prop_convert_operator
import QuantumControl.QuantumPropagators.Controls: get_controls
import QuantumControl.QuantumPropagators.SpectralRange: random_state
import QuantumControl.QuantumPropagators.Interfaces: supports_inplace


"""Static generator for the dynamic gradient.
Expand Down
1 change: 0 additions & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ LocalCoverage = "5f6e1e16-694c-5876-87ef-16b5274f298e"
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486"
QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
QuantumControlTestUtils = "d3fd27c9-1dfb-4e67-b0c0-90d0d87a1e48"
QuantumGradientGenerators = "a563f35e-61db-434d-8c01-8b9e3ccdfd85"
QuantumPropagators = "7bf12567-5742-4b91-a078-644e72a65fc1"
Expand Down
2 changes: 1 addition & 1 deletion test/test_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using Test
using QuantumPropagators.Generators: hamiltonian
using QuantumPropagators.Controls: get_controls
using QuantumControlTestUtils.RandomObjects: random_matrix, random_state_vector
using QuantumControlBase: check_generator
using QuantumControl.Interfaces: check_generator
using QuantumPropagators.Interfaces: check_state
using QuantumGradientGenerators: GradGenerator, GradVector
using StaticArrays: SVector, SMatrix
Expand Down