Adding operator support to time evolution problem #606
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,4 +10,5 @@ Manifest.toml | |
| benchmarks/benchmarks_output.json | ||
|
|
||
| .ipynb_checkpoints | ||
| .devcontainer/* | ||
| *.ipynb | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,17 +6,17 @@ _mesolve_make_L_QobjEvo(H::Union{QuantumObjectEvolution,Tuple}, c_ops) = liouvil | |||||
| _mesolve_make_L_QobjEvo(H::Nothing, c_ops::Nothing) = throw(ArgumentError("Both H and | ||||||
| c_ops are Nothing. You are probably running the wrong function.")) | ||||||
|
|
||||||
| function _gen_mesolve_solution(sol, prob::TimeEvolutionProblem{ST}) where {ST<:Union{Operator,OperatorKet,SuperOperator}} | ||||||
| if prob.states_type == Operator | ||||||
| ρt = map(ϕ -> QuantumObject(vec2mat(ϕ), type = prob.states_type, dims = prob.dimensions), sol.u) | ||||||
| else | ||||||
| ρt = map(ϕ -> QuantumObject(ϕ, type = prob.states_type, dims = prob.dimensions), sol.u) | ||||||
| end | ||||||
|
|
||||||
| kwargs = NamedTuple(sol.prob.kwargs) # Convert to NamedTuple for Zygote.jl compatibility | ||||||
|
|
||||||
| return TimeEvolutionSol( | ||||||
| prob.times, | ||||||
| sol.t, | ||||||
| ρt, | ||||||
| _get_expvals(sol, SaveFuncMESolve), | ||||||
|
|
@@ -86,8 +86,8 @@ function mesolveProblem( | |||||
| progress_bar::Union{Val,Bool} = Val(true), | ||||||
| inplace::Union{Val,Bool} = Val(true), | ||||||
| kwargs..., | ||||||
| ) where {HOpType<:Union{Operator,SuperOperator},StateOpType<:Union{Ket,Operator,OperatorKet,SuperOperator}} | ||||||
| (isoper(H) && (isket(ψ0) || isoper(ψ0)) && isnothing(c_ops)) && return sesolveProblem( | ||||||
| H, | ||||||
| ψ0, | ||||||
| tlist; | ||||||
|
|
@@ -107,11 +107,25 @@ function mesolveProblem( | |||||
| check_dimensions(L_evo, ψ0) | ||||||
|
|
||||||
| T = Base.promote_eltype(L_evo, ψ0) | ||||||
| # ρ0 = if isoperket(ψ0) # Convert it to dense vector with complex element type | ||||||
| # to_dense(_complex_float_type(T), copy(ψ0.data)) | ||||||
| # else | ||||||
| # to_dense(_complex_float_type(T), mat2vec(ket2dm(ψ0).data)) | ||||||
| # end | ||||||
| if isoper(ψ0) | ||||||
| ρ0 = to_dense(_complex_float_type(T), mat2vec(ψ0.data)) | ||||||
| state_type = Operator() | ||||||
| elseif isoperket(ψ0) | ||||||
| ρ0 = to_dense(_complex_float_type(T), copy(ψ0.data)) | ||||||
| state_type = OperatorKet() | ||||||
| elseif isket(ψ0) | ||||||
| ρ0 = to_dense(_complex_float_type(T), mat2vec(ket2dm(ψ0).data)) | ||||||
| state_type = Operator() | ||||||
| elseif issuper(ψ0) | ||||||
| ρ0 = to_dense(_complex_float_type(T), copy(ψ0.data)) | ||||||
| state_type = SuperOperator() | ||||||
| end | ||||||
|
|
||||||
| L = cache_operator(L_evo.data, ρ0) | ||||||
|
|
||||||
| kwargs2 = _merge_saveat(tlist, e_ops, DEFAULT_ODE_SOLVER_OPTIONS; kwargs...) | ||||||
|
|
@@ -122,7 +136,7 @@ function mesolveProblem( | |||||
|
|
||||||
| prob = ODEProblem{getVal(inplace),FullSpecialize}(L, ρ0, tspan, params; kwargs4...) | ||||||
|
|
||||||
| return TimeEvolutionProblem(prob, tlist, state_type, L_evo.dimensions) | ||||||
| end | ||||||
|
|
||||||
| @doc raw""" | ||||||
|
|
@@ -188,8 +202,8 @@ function mesolve( | |||||
| progress_bar::Union{Val,Bool} = Val(true), | ||||||
| inplace::Union{Val,Bool} = Val(true), | ||||||
| kwargs..., | ||||||
| ) where {HOpType<:Union{Operator,SuperOperator},StateOpType<:Union{Ket,Operator,OperatorKet,SuperOperator}} | ||||||
| (isoper(H) && (isket(ψ0) || isoper(ψ0)) && isnothing(c_ops)) && return sesolve( | ||||||
| H, | ||||||
| ψ0, | ||||||
| tlist; | ||||||
|
|
@@ -230,7 +244,7 @@ end | |||||
| function mesolve(prob::TimeEvolutionProblem, alg::AbstractODEAlgorithm = DP5(); kwargs...) | ||||||
| sol = solve(prob.prob, alg; kwargs...) | ||||||
|
|
||||||
| return _gen_mesolve_solution(sol, prob) | ||||||
| end | ||||||
|
|
||||||
| @doc raw""" | ||||||
|
|
@@ -298,8 +312,8 @@ function mesolve_map( | |||||
| params::Union{NullParameters,Tuple} = NullParameters(), | ||||||
| progress_bar::Union{Val,Bool} = Val(true), | ||||||
| kwargs..., | ||||||
| ) where {HOpType<:Union{Operator,SuperOperator},StateOpType<:Union{Ket,Operator,OperatorKet,SuperOperator}} | ||||||
| (isoper(H) && (all(isket, ψ0) || all(isoper, ψ0)) && isnothing(c_ops)) && return sesolve_map( | ||||||
| H, | ||||||
| ψ0, | ||||||
| tlist; | ||||||
|
|
@@ -315,10 +329,14 @@ function mesolve_map( | |||||
| # Convert to appropriate format based on state type | ||||||
| ψ0_iter = map(ψ0) do state | ||||||
| T = _complex_float_type(eltype(state)) | ||||||
| if isoper(state) | ||||||
| to_dense(_complex_float_type(T), mat2vec(state.data)) | ||||||
| elseif isoperket(state) | ||||||
| to_dense(_complex_float_type(T), copy(state.data)) | ||||||
| elseif isket(state) | ||||||
| to_dense(_complex_float_type(T), mat2vec(ket2dm(state).data)) | ||||||
| elseif issuper(state) | ||||||
| to_dense(_complex_float_type(T), copy(state.data)) | ||||||
| end | ||||||
| end | ||||||
| if params isa NullParameters | ||||||
|
|
@@ -347,7 +365,7 @@ mesolve_map( | |||||
| tlist::AbstractVector, | ||||||
| c_ops::Union{Nothing,AbstractVector,Tuple} = nothing; | ||||||
| kwargs..., | ||||||
| ) where {HOpType<:Union{Operator,SuperOperator},StateOpType<:Union{Ket,Operator,OperatorKet,SuperOperator}} = | ||||||
| mesolve_map(H, [ψ0], tlist, c_ops; kwargs...) | ||||||
|
|
||||||
| # this method is for advanced usage | ||||||
|
|
@@ -357,14 +375,14 @@ mesolve_map( | |||||
| # | ||||||
| # Return: An array of TimeEvolutionSol objects with the size same as the given iter. | ||||||
| function mesolve_map( | ||||||
| prob::TimeEvolutionProblem{StateOpType, <:AbstractDimensions, <:ODEProblem}, | ||||||
| iter::AbstractArray, | ||||||
| alg::AbstractODEAlgorithm = DP5(), | ||||||
| ensemblealg::EnsembleAlgorithm = EnsembleThreads(); | ||||||
| prob_func::Union{Function,Nothing} = nothing, | ||||||
| output_func::Union{Tuple,Nothing} = nothing, | ||||||
| progress_bar::Union{Val,Bool} = Val(true), | ||||||
| ) where {StateOpType<:Union{Ket,Operator,OperatorKet,SuperOperator}} | ||||||
| # generate ensemble problem | ||||||
| ntraj = length(iter) | ||||||
| _prob_func = isnothing(prob_func) ? (prob, i, repeat) -> _se_me_map_prob_func(prob, i, repeat, iter) : prob_func | ||||||
|
|
@@ -380,14 +398,14 @@ function mesolve_map( | |||||
| ens_prob = TimeEvolutionProblem( | ||||||
| EnsembleProblem(prob.prob, prob_func = _prob_func, output_func = _output_func[1], safetycopy = false), | ||||||
| prob.times, | ||||||
| StateOpType(), | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||
| prob.dimensions, | ||||||
| (progr = _output_func[2], channel = _output_func[3]), | ||||||
| ) | ||||||
|
|
||||||
| sol = _ensemble_dispatch_solve(ens_prob, alg, ensemblealg, ntraj) | ||||||
|
|
||||||
| # handle solution and make it become an Array of TimeEvolutionSol | ||||||
| sol_vec = [_gen_mesolve_solution(sol[:, i], prob) for i in eachindex(sol)] # map is type unstable | ||||||
| return reshape(sol_vec, size(iter)) | ||||||
| end | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.