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

Update RecursiveArrayTools.jl compatibility to version 3 #2194

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
+21 −13
Draft

Update RecursiveArrayTools.jl compatibility to version 3 #2194

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
abc6be4
Upgrade
huiyuxie Dec 8, 2024
edeb119
Project.toml
huiyuxie Dec 8, 2024
7e13e11
Change CI
huiyuxie Dec 8, 2024
4f40843
Fix
huiyuxie Dec 8, 2024
a8ed008
Update Julia
huiyuxie Dec 8, 2024
2f78d56
Update SciMLBase
huiyuxie Dec 8, 2024
63d73a3
Update Makie
huiyuxie Dec 8, 2024
21a241d
Update Makie
huiyuxie Dec 8, 2024
8664da2
Update CairoMakie
huiyuxie Dec 8, 2024
41c6ba5
Merge branch 'main' into callback
huiyuxie Dec 10, 2024
e2ed514
Fix
huiyuxie Dec 11, 2024
876c33e
Merge branch 'main' into callback
huiyuxie Dec 11, 2024
c9783b5
Merge branch 'callback' of https://github.com/huiyuxie/Trixi.jl into …
huiyuxie Dec 11, 2024
be6feae
Fix
huiyuxie Dec 12, 2024
0292601
Fix
huiyuxie Dec 12, 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
7 changes: 4 additions & 3 deletions Project.toml
View file
Open in desktop
huiyuxie marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
Octavian = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
huiyuxie marked this conversation as resolved.
Show resolved Hide resolved
P4est = "7d669430-f675-4ae7-b43e-fab78ec5a902"
Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Expand Down Expand Up @@ -83,7 +84,7 @@ LinearAlgebra = "1"
LinearMaps = "2.7, 3.0"
LoopVectorization = "0.12.151"
MPI = "0.20.6"
Makie = "0.19, 0.20"
Makie = "0.21"
huiyuxie marked this conversation as resolved.
Show resolved Hide resolved
MuladdMacro = "0.2.2"
NLsolve = "4.5.1"
Octavian = "0.3.21"
Expand All @@ -94,10 +95,10 @@ PrecompileTools = "1.1"
Preferences = "1.3"
Printf = "1"
RecipesBase = "1.1"
RecursiveArrayTools = "2.38.10"
RecursiveArrayTools = "3"
Reexport = "1.0"
Requires = "1.1"
SciMLBase = "1.90, 2"
SciMLBase = "2.67.0"
SimpleUnPack = "1.1"
SparseArrays = "1"
StableRNGs = "1.0.2"
Expand Down
24 changes: 16 additions & 8 deletions src/auxiliary/precompile.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ function _precompile_manual_()
@assert Base.precompile(Tuple{DiscreteCallback{typeof(Trixi.summary_callback),
typeof(Trixi.summary_callback),
typeof(Trixi.initialize_summary_callback),
typeof(SciMLBase.FINALIZE_DEFAULT)}})
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}})
@assert Base.precompile(Tuple{typeof(summary_box), Base.TTY, String,
Vector{Pair{String, Any}}})
# TODO: AMRCallback, ControllerThreeLevel, indicators
Expand Down Expand Up @@ -523,7 +524,8 @@ function _precompile_manual_()
summary_callback_type = DiscreteCallback{typeof(Trixi.summary_callback),
typeof(Trixi.summary_callback),
typeof(Trixi.initialize_summary_callback),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, summary_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
summary_callback_type})
Expand All @@ -533,14 +535,16 @@ function _precompile_manual_()

alive_callback_type = DiscreteCallback{AliveCallback, AliveCallback,
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, alive_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
alive_callback_type})

restart_callback_type = DiscreteCallback{SaveRestartCallback, SaveRestartCallback,
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, restart_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
restart_callback_type})
Expand All @@ -549,7 +553,8 @@ function _precompile_manual_()
save_solution_callback_type = DiscreteCallback{SaveSolutionCallback{typeof(solution_variables)},
SaveSolutionCallback{typeof(solution_variables)},
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY,
save_solution_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY},
Expand All @@ -561,23 +566,26 @@ function _precompile_manual_()
stepsize_callback_type = DiscreteCallback{StepsizeCallback{RealT},
StepsizeCallback{RealT},
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, stepsize_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
stepsize_callback_type})

glm_speed_callback_type = DiscreteCallback{GlmSpeedCallback{RealT},
GlmSpeedCallback{RealT},
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, glm_speed_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
glm_speed_callback_type})

lbm_collision_callback_type = DiscreteCallback{typeof(Trixi.lbm_collision_callback),
typeof(Trixi.lbm_collision_callback),
typeof(Trixi.initialize!),
typeof(SciMLBase.FINALIZE_DEFAULT)}
typeof(SciMLBase.FINALIZE_DEFAULT),
typeof(nothing)}
@assert Base.precompile(Tuple{typeof(show), Base.TTY, lbm_collision_callback_type})
@assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain",
lbm_collision_callback_type})
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Aqua = "0.8"
CairoMakie = "0.10"
CairoMakie = "0.12"
Convex = "0.16"
DelimitedFiles = "1"
DoubleFloats = "1.4.0"
Expand Down
Loading