Fix AutoMTK constructors

SciML · Jun 7, 2024 · 7cde295 · 7cde295
1 parent e00e087
commit 7cde295
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/src/legacy.jl b/src/legacy.jl
@@ -11,11 +11,24 @@
 
 @deprecate AutoSparseZygote() AutoSparse(AutoZygote())
 
-function AutoModelingToolkit(sparse = false, cons_sparse = false; kwargs...)
- @warn "AutoModelingToolkit(args...) is deprecated, use AutoSymbolics() or AutoSparse(AutoSymbolics()) instead." maxlog=1
- if sparse || cons_sparse
+function mtk_to_symbolics(obj_sparse::Bool, cons_sparse::Bool)
+ if obj_sparse || cons_sparse
  return AutoSparse(AutoSymbolics())
  else
  return AutoSymbolics()
  end
 end
+
+function AutoModelingToolkit(obj_sparse::Bool, cons_sparse::Bool)
+ Base.depwarn(
+ "`AutoModelingToolkit(obj_sparse, cons_sparse)` is deprecated, use `AutoSymbolics()` or `AutoSparse(AutoSymbolics())` instead.",
+ :AutoModelingToolkit; force = false)
+ return mtk_to_symbolics(obj_sparse, cons_sparse)
+end
+
+function AutoModelingToolkit(; obj_sparse::Bool = false, cons_sparse::Bool = false)
+ Base.depwarn(
+ "`AutoModelingToolkit(; obj_sparse, cons_sparse)` is deprecated, use `AutoSymbolics()` or `AutoSparse(AutoSymbolics())` instead.",
+ :AutoModelingToolkit; force = false)
+ return mtk_to_symbolics(obj_sparse, cons_sparse)
+end
diff --git a/test/legacy.jl b/test/legacy.jl
@@ -1,10 +1,17 @@
 @testset "AutoModelingToolkit" begin
- ad = @test_warn "AutoModelingToolkit(args...) is deprecated, use AutoSymbolics() or AutoSparse(AutoSymbolics()) instead." AutoModelingToolkit()
- @test ad isa AbstractADType
- ad = @test_warn "AutoModelingToolkit(args...) is deprecated, use AutoSymbolics() or AutoSparse(AutoSymbolics()) instead." AutoModelingToolkit(true)
- @test ad isa AbstractADType
- @test ad isa AutoSparse
- @test dense_ad(ad) isa AutoSymbolics
+ ad_sparse1 = @test_deprecated AutoModelingToolkit(;
+ obj_sparse = true, cons_sparse = false)
+ ad_sparse2 = @test_deprecated AutoModelingToolkit(true, false)
+
+ ad_dense1 = @test_deprecated AutoModelingToolkit(;
+ obj_sparse = false, cons_sparse = false)
+ ad_dense2 = @test_deprecated AutoModelingToolkit(false, false)
+ ad_dense3 = @test_deprecated AutoModelingToolkit()
+
+ @test all(
+ isa.((ad_sparse1, ad_sparse2, ad_dense1, ad_dense2, ad_dense3), AbstractADType))
+ @test all(isa.((ad_sparse1, ad_sparse2), AutoSparse{<:AutoSymbolics}))
+ @test all(isa.((ad_dense1, ad_dense2, ad_dense3), AutoSymbolics))
 end
 
 @testset "AutoSparseFastDifferentiation" begin