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

Subpackages use BoundaryValueDiffEqCore #221

Merged
merged 5 commits into from
Oct 15, 2024
Merged

Subpackages use BoundaryValueDiffEqCore #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e4dbfc
Subpackages use BoundaryValueDiffEqCore
ErikQQY Oct 15, 2024
993a296
Bump versions
ErikQQY Oct 15, 2024
ce6af81
Only Core export BVPJacobianAlgorithm
ErikQQY Oct 15, 2024
2dc000a
revert
ErikQQY Oct 15, 2024
8cb6081
Use core package in BoundaryValueDiffEq
ErikQQY Oct 15, 2024
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
1 change: 1 addition & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
Expand Down
6 changes: 3 additions & 3 deletions lib/BoundaryValueDiffEqFIRK/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "BoundaryValueDiffEqFIRK"
uuid = "85d9eb09-370e-4000-bb32-543851f73618"
version = "1.0.0"
version = "1.0.1"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
BoundaryValueDiffEq = "764a87c0-6b3e-53db-9096-fe964310641d"
BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
Expand Down Expand Up @@ -35,7 +35,7 @@ Adapt = "4"
Aqua = "0.8.7"
ArrayInterface = "7.7"
BandedMatrices = "1.4"
BoundaryValueDiffEq = "5.10"
BoundaryValueDiffEqCore = "1.0.0"
ConcreteStructs = "0.2.3"
DiffEqBase = "6.146"
DiffEqDevTools = "2.44"
Expand Down
42 changes: 20 additions & 22 deletions lib/BoundaryValueDiffEqFIRK/src/BoundaryValueDiffEqFIRK.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,32 @@ module BoundaryValueDiffEqFIRK

import PrecompileTools: @compile_workload, @setup_workload

using ADTypes, Adapt, ArrayInterface, DiffEqBase, ForwardDiff, LinearAlgebra,
NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase, Setfield,
SparseDiffTools
using ADTypes, Adapt, ArrayInterface, BoundaryValueDiffEqCore, DiffEqBase, ForwardDiff,
LinearAlgebra, NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase,
Setfield, SparseDiffTools

using PreallocationTools: PreallocationTools, DiffCache

# Special Matrix Types
using BandedMatrices, FastAlmostBandedMatrices, SparseArrays

include("../../BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl")
import ..BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!,
recursive_unflatten!, __concrete_nonlinearsolve_algorithm,
diff!, __FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __maybe_allocate_diffcache,
__get_bcresid_prototype, __similar, __vec, __vec_f,
__vec_f!, __vec_bc, __vec_bc!,
recursive_flatten_twopoint!, __unsafe_nonlinearfunction,
__internal_nlsolve_problem, MaybeDiffCache,
__extract_mesh, __extract_u0, __has_initial_guess,
__initial_guess_length, __initial_guess_on_mesh,
__flatten_initial_guess, __build_solution, __Fix3,
__sparse_jacobian_cache, __sparsity_detection_alg,
_sparse_like, ColoredMatrix
import BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!, recursive_unflatten!,
__concrete_nonlinearsolve_algorithm, diff!,
__FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __maybe_allocate_diffcache,
__get_bcresid_prototype, __similar, __vec, __vec_f,
__vec_f!, __vec_bc, __vec_bc!, recursive_flatten_twopoint!,
__unsafe_nonlinearfunction, __internal_nlsolve_problem,
MaybeDiffCache, __extract_mesh, __extract_u0,
__has_initial_guess, __initial_guess_length,
__initial_guess_on_mesh, __flatten_initial_guess,
__build_solution, __Fix3, __sparse_jacobian_cache,
__sparsity_detection_alg, _sparse_like, ColoredMatrix

import ADTypes: AbstractADType
import ArrayInterface: matrix_colors, parameterless_type, undefmatrix, fast_scalar_indexing
Expand Down
6 changes: 3 additions & 3 deletions lib/BoundaryValueDiffEqMIRK/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "BoundaryValueDiffEqMIRK"
uuid = "1a22d4ce-7765-49ea-b6f2-13c8438986a6"
version = "1.0.0"
version = "1.0.1"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
BoundaryValueDiffEq = "764a87c0-6b3e-53db-9096-fe964310641d"
BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
Expand Down Expand Up @@ -35,7 +35,7 @@ Adapt = "4"
Aqua = "0.8.7"
ArrayInterface = "7.7"
BandedMatrices = "1.4"
BoundaryValueDiffEq = "5.10"
BoundaryValueDiffEqCore = "1.0.0"
ConcreteStructs = "0.2.3"
DiffEqBase = "6.146"
DiffEqDevTools = "2.44"
Expand Down
41 changes: 20 additions & 21 deletions lib/BoundaryValueDiffEqMIRK/src/BoundaryValueDiffEqMIRK.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,32 @@ module BoundaryValueDiffEqMIRK

import PrecompileTools: @compile_workload, @setup_workload

using ADTypes, Adapt, ArrayInterface, DiffEqBase, ForwardDiff, LinearAlgebra,
NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase, Setfield,
SparseDiffTools
using ADTypes, Adapt, ArrayInterface, BoundaryValueDiffEqCore, DiffEqBase, ForwardDiff,
LinearAlgebra, NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase,
Setfield, SparseDiffTools

using PreallocationTools: PreallocationTools, DiffCache

# Special Matrix Types
using BandedMatrices, FastAlmostBandedMatrices, SparseArrays

include("../../BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl")
import ..BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!,
recursive_unflatten!, __concrete_nonlinearsolve_algorithm,
diff!, __FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __maybe_allocate_diffcache,
__get_bcresid_prototype, __similar, __vec, __vec_f,
__vec_f!, __vec_bc, __vec_bc!,
recursive_flatten_twopoint!, __unsafe_nonlinearfunction,
__internal_nlsolve_problem, __extract_mesh, __extract_u0,
__has_initial_guess, __initial_guess_length,
__initial_guess_on_mesh, __flatten_initial_guess,
__build_solution, __Fix3, __sparse_jacobian_cache,
__sparsity_detection_alg, _sparse_like, ColoredMatrix
import BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!, recursive_unflatten!,
__concrete_nonlinearsolve_algorithm, diff!,
__FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __maybe_allocate_diffcache,
__get_bcresid_prototype, __similar, __vec, __vec_f,
__vec_f!, __vec_bc, __vec_bc!, recursive_flatten_twopoint!,
__unsafe_nonlinearfunction, __internal_nlsolve_problem,
__extract_mesh, __extract_u0, __has_initial_guess,
__initial_guess_length, __initial_guess_on_mesh,
__flatten_initial_guess, __build_solution, __Fix3,
__sparse_jacobian_cache, __sparsity_detection_alg,
_sparse_like, ColoredMatrix

import ADTypes: AbstractADType
import ArrayInterface: matrix_colors, parameterless_type, undefmatrix, fast_scalar_indexing
Expand Down
5 changes: 2 additions & 3 deletions lib/BoundaryValueDiffEqShooting/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "BoundaryValueDiffEqShooting"
uuid = "ed55bfe0-3725-4db6-871e-a1dc9f42a757"
version = "1.0.0"
version = "1.0.1"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
BoundaryValueDiffEq = "764a87c0-6b3e-53db-9096-fe964310641d"
BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
Expand Down Expand Up @@ -36,7 +36,6 @@ Adapt = "4"
Aqua = "0.8.7"
ArrayInterface = "7.7"
BandedMatrices = "1.4"
BoundaryValueDiffEq = "5.10"
ConcreteStructs = "0.2.3"
DiffEqBase = "6.146"
DiffEqDevTools = "2.44"
Expand Down
48 changes: 23 additions & 25 deletions lib/BoundaryValueDiffEqShooting/src/BoundaryValueDiffEqShooting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,35 @@ module BoundaryValueDiffEqShooting

import PrecompileTools: @compile_workload, @setup_workload

using ADTypes, Adapt, ArrayInterface, DiffEqBase, ForwardDiff, LinearAlgebra,
NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase, Setfield,
SparseDiffTools
using ADTypes, Adapt, ArrayInterface, BoundaryValueDiffEqCore, DiffEqBase, ForwardDiff,
LinearAlgebra, NonlinearSolve, Preferences, RecursiveArrayTools, Reexport, SciMLBase,
Setfield, SparseDiffTools

using PreallocationTools: PreallocationTools, DiffCache

# Special Matrix Types
using BandedMatrices, FastAlmostBandedMatrices, SparseArrays

include("../../BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl")
import ..BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!,
recursive_unflatten!, __concrete_nonlinearsolve_algorithm,
diff!, __any_sparse_ad,
__FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg, __cache_trait,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __default_nonsparse_ad,
__maybe_allocate_diffcache, __get_bcresid_prototype,
__similar, __vec, __vec_f, __vec_f!, __vec_bc, __vec_bc!,
__materialize_jacobian_algorithm,
recursive_flatten_twopoint!, __unsafe_nonlinearfunction,
__internal_nlsolve_problem, NoDiffCacheNeeded,
DiffCacheNeeded, __extract_mesh, __extract_u0,
__has_initial_guess, __initial_guess_length,
__initial_guess_on_mesh, __flatten_initial_guess,
__get_non_sparse_ad, __build_solution, __Fix3,
__sparse_jacobian_cache, __sparsity_detection_alg,
_sparse_like, ColoredMatrix
import BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm,
recursive_flatten, recursive_flatten!, recursive_unflatten!,
__concrete_nonlinearsolve_algorithm, diff!, __any_sparse_ad,
__FastShortcutBVPCompatibleNonlinearPolyalg,
__FastShortcutBVPCompatibleNLLSPolyalg, __cache_trait,
concrete_jacobian_algorithm, eval_bc_residual,
eval_bc_residual!, get_tmp, __maybe_matmul!,
__append_similar!, __extract_problem_details,
__initial_guess, __default_nonsparse_ad,
__maybe_allocate_diffcache, __get_bcresid_prototype,
__similar, __vec, __vec_f, __vec_f!, __vec_bc, __vec_bc!,
__materialize_jacobian_algorithm,
recursive_flatten_twopoint!, __unsafe_nonlinearfunction,
__internal_nlsolve_problem, NoDiffCacheNeeded,
DiffCacheNeeded, __extract_mesh, __extract_u0,
__has_initial_guess, __initial_guess_length,
__initial_guess_on_mesh, __flatten_initial_guess,
__get_non_sparse_ad, __build_solution, __Fix3,
__sparse_jacobian_cache, __sparsity_detection_alg,
_sparse_like, ColoredMatrix

import ADTypes: AbstractADType
import ArrayInterface: matrix_colors, parameterless_type, undefmatrix, fast_scalar_indexing
Expand Down
10 changes: 4 additions & 6 deletions src/BoundaryValueDiffEq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ module BoundaryValueDiffEq

import PrecompileTools: @compile_workload, @setup_workload

using ADTypes, Adapt, ArrayInterface, DiffEqBase, ForwardDiff, LinearAlgebra, Preferences,
RecursiveArrayTools, Reexport, SciMLBase, Setfield, SparseDiffTools
using ADTypes, Adapt, ArrayInterface, BoundaryValueDiffEqCore, DiffEqBase, ForwardDiff,
LinearAlgebra, Preferences, RecursiveArrayTools, Reexport, SciMLBase, Setfield,
SparseDiffTools

using PreallocationTools: PreallocationTools, DiffCache

Expand All @@ -12,6 +13,7 @@ using BandedMatrices, FastAlmostBandedMatrices, SparseArrays

import ADTypes: AbstractADType
import ArrayInterface: matrix_colors, parameterless_type, undefmatrix, fast_scalar_indexing
import BoundaryValueDiffEqCore: BoundaryValueDiffEqAlgorithm, BVPJacobianAlgorithm
import ConcreteStructs: @concrete
import DiffEqBase: solve
import FastClosures: @closure
Expand All @@ -23,10 +25,6 @@ import SciMLBase: AbstractDiffEqInterpolation, StandardBVProblem, __solve, _unwr
@reexport using ADTypes, DiffEqBase, NonlinearSolve, OrdinaryDiffEq, SparseDiffTools,
SciMLBase

include("../lib/BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl")
using ..BoundaryValueDiffEqCore
include("../lib/BoundaryValueDiffEqCore/src/algorithms.jl")

include("../lib/BoundaryValueDiffEqMIRK/src/BoundaryValueDiffEqMIRK.jl")
using ..BoundaryValueDiffEqMIRK

Expand Down
2 changes: 1 addition & 1 deletion test/misc/type_stability_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@testitem "Type Stability" begin
using LinearAlgebra
using LinearAlgebra, BoundaryValueDiffEq

f(u, p, t) = [p[1] * u[1] - p[2] * u[1] * u[2], p[3] * u[1] * u[2] - p[4] * u[2]]
function f!(du, u, p, t)
Expand Down
Loading