make LinearVerbosity concrete, remove setproperty!

jClugstor · jClugstor · commit b703efc69206 · 2025-10-03T10:04:36.000-04:00
diff --git a/src/verbosity.jl b/src/verbosity.jl
@@ -1,23 +1,25 @@
-mutable struct LinearVerbosity{Enabled} <: AbstractVerbositySpecifier{Enabled}
+LinearSolve.@concrete struct LinearVerbosity{Enabled} <:
+                                      AbstractVerbositySpecifier{Enabled}
     # Error control
-    default_lu_fallback::MessageLevel
+    default_lu_fallback
     # Performance
-    no_right_preconditioning::MessageLevel
+    no_right_preconditioning
     # Numerical
-    using_iterative_solvers::MessageLevel
-    using_IterativeSolvers::MessageLevel
-    IterativeSolvers_iterations::MessageLevel
-    KrylovKit_verbosity::MessageLevel
-    KrylovJL_verbosity::MessageLevel
-    HYPRE_verbosity::MessageLevel
-    pardiso_verbosity::MessageLevel
-    blas_errors::MessageLevel
-    blas_invalid_args::MessageLevel
-    blas_info::MessageLevel
-    blas_success::MessageLevel
-    condition_number::MessageLevel
+    using_iterative_solvers
+    using_IterativeSolvers
+    IterativeSolvers_iterations
+    KrylovKit_verbosity
+    KrylovJL_verbosity
+    HYPRE_verbosity
+    pardiso_verbosity
+    blas_errors
+    blas_invalid_args
+    blas_info
+    blas_success
+    condition_number
+end
 
-    function LinearVerbosity{true}(;
+function LinearVerbosity{true}(;
         # Error control defaults
         default_lu_fallback = WarnLevel(),
         # Performance defaults
@@ -35,23 +37,21 @@ mutable struct LinearVerbosity{Enabled} <: AbstractVerbositySpecifier{Enabled}
         blas_info = Silent(),
         blas_success = Silent(),
         condition_number = Silent())
+    LinearVerbosity{true}(default_lu_fallback, no_right_preconditioning,
+        using_iterative_solvers, using_IterativeSolvers,
+        IterativeSolvers_iterations, KrylovKit_verbosity,
+        KrylovJL_verbosity, HYPRE_verbosity, pardiso_verbosity,
+        blas_errors, blas_invalid_args, blas_info, blas_success, condition_number)
+end
 
-        new{true}(default_lu_fallback, no_right_preconditioning,
-                     using_iterative_solvers, using_IterativeSolvers,
-                     IterativeSolvers_iterations, KrylovKit_verbosity,
-                     KrylovJL_verbosity, HYPRE_verbosity, pardiso_verbosity,
-                     blas_errors, blas_invalid_args, blas_info, blas_success, condition_number)
-    end
 
-    function LinearVerbosity{false}()
-        new{false}(Silent(), Silent(),
+function LinearVerbosity{false}()
+    LinearVerbosity{false}(Silent(), Silent(),
         Silent(), Silent(),
         Silent(), Silent(),
         Silent(), Silent(), Silent(),
         Silent(), Silent(), Silent(), Silent(), Silent())
-    end
 end
-
 LinearVerbosity(enabled::Bool) = enabled ? LinearVerbosity{true}() : LinearVerbosity{false}()
 
 function LinearVerbosity(verbose::VerbosityPreset)
@@ -121,23 +121,23 @@ end
 
 function LinearVerbosity(; error_control=nothing, performance=nothing, numerical=nothing, kwargs...)
     # Validate group arguments
-    if error_control !== nothing && !(error_control isa MessageLevel)
-        throw(ArgumentError("error_control must be a SciMLLogging.MessageLevel, got $(typeof(error_control))"))
+    if error_control !== nothing && !(error_control isa AbstractMessageLevel)
+        throw(ArgumentError("error_control must be a SciMLLogging.AbstractMessageLevel, got $(typeof(error_control))"))
     end
-    if performance !== nothing && !(performance isa MessageLevel)
-        throw(ArgumentError("performance must be a SciMLLogging.MessageLevel, got $(typeof(performance))"))
+    if performance !== nothing && !(performance isa AbstractMessageLevel)
+        throw(ArgumentError("performance must be a SciMLLogging.AbstractMessageLevel, got $(typeof(performance))"))
     end
-    if numerical !== nothing && !(numerical isa MessageLevel)
-        throw(ArgumentError("numerical must be a SciMLLogging.MessageLevel, got $(typeof(numerical))"))
+    if numerical !== nothing && !(numerical isa AbstractMessageLevel)
+        throw(ArgumentError("numerical must be a SciMLLogging.AbstractMessageLevel, got $(typeof(numerical))"))
     end
 
     # Validate individual kwargs
     for (key, value) in kwargs
         if !(key in error_control_options || key in performance_options || key in numerical_options)
             throw(ArgumentError("Unknown verbosity option: $key. Valid options are: $(tuple(error_control_options..., performance_options..., numerical_options...))"))
         end
-        if !(value isa MessageLevel)
-            throw(ArgumentError("$key must be a SciMLLogging.MessageLevel, got $(typeof(value))"))
+        if !(value isa AbstractMessageLevel)
+            throw(ArgumentError("$key must be a SciMLLogging.AbstractMessageLevel, got $(typeof(value))"))
         end
     end
 
@@ -222,47 +222,6 @@ function group_options(verbosity::LinearVerbosity, group::Symbol)
     end
 end
 
-function Base.setproperty!(verbosity::LinearVerbosity, name::Symbol, value)
-    # Check if this is a group name
-    if name === :error_control
-        if value isa MessageLevel
-            for opt in error_control_options
-                setfield!(verbosity, opt, value)
-            end
-        else
-            error("error_control must be set to a SciMLLogging.MessageLevel")
-        end
-    elseif name === :performance
-        if value isa MessageLevel
-            for opt in performance_options
-                setfield!(verbosity, opt, value)
-            end
-        else
-            error("performance must be set to a SciMLLogging.MessageLevel")
-        end
-    elseif name === :numerical
-        if value isa MessageLevel
-            for opt in numerical_options
-                setfield!(verbosity, opt, value)
-            end
-        else
-            error("numerical must be set to a SciMLLogging.MessageLevel")
-        end
-    else
-        # Check if this is an individual option
-        if name in error_control_options || name in performance_options || name in numerical_options
-            if value isa MessageLevel
-                setfield!(verbosity, name, value)
-            else
-                error("$name must be set to a SciMLLogging.MessageLevel")
-            end
-        else
-            # Fall back to default behavior for unknown properties
-            setfield!(verbosity, name, value)
-        end
-    end
-end
-
 function Base.getproperty(verbosity::LinearVerbosity, name::Symbol)
     # Check if this is a group name
     if name === :error_control
diff --git a/test/verbosity.jl b/test/verbosity.jl
@@ -2,6 +2,7 @@ using LinearSolve
 using LinearSolve: LinearVerbosity, option_group, group_options, BLISLUFactorization
 using SciMLLogging
 using Test
+
 @testset "LinearVerbosity Tests" begin
     @testset "Default constructor" begin
         v1 = LinearVerbosity()
@@ -132,76 +133,15 @@ using Test
         @test :using_IterativeSolvers in keys(numerical_group)
         @test :pardiso_verbosity in keys(numerical_group)
 
-        # Test values are MessageLevel types
-        @test error_group.default_lu_fallback isa SciMLLogging.MessageLevel
-        @test performance_group.no_right_preconditioning isa SciMLLogging.MessageLevel
-        @test numerical_group.KrylovKit_verbosity isa SciMLLogging.MessageLevel
+        # Test values are AbstractMessageLevel types
+        @test error_group.default_lu_fallback isa SciMLLogging.AbstractMessageLevel
+        @test performance_group.no_right_preconditioning isa SciMLLogging.AbstractMessageLevel
+        @test numerical_group.KrylovKit_verbosity isa SciMLLogging.AbstractMessageLevel
 
         # Individual field access should still work
         @test v.default_lu_fallback isa SciMLLogging.WarnLevel
         @test v.KrylovKit_verbosity isa SciMLLogging.WarnLevel
     end
-
-    @testset "Group setproperty! setting" begin
-        v = LinearVerbosity()
-
-        # Test setting entire error_control group
-        v.error_control = ErrorLevel()
-        @test v.default_lu_fallback isa SciMLLogging.ErrorLevel
-
-        # Test setting entire performance group
-        v.performance = InfoLevel()
-        @test v.no_right_preconditioning isa SciMLLogging.InfoLevel
-
-        # Test setting entire numerical group
-        v.numerical = Silent()
-        @test v.KrylovKit_verbosity isa SciMLLogging.Silent
-        @test v.using_IterativeSolvers isa SciMLLogging.Silent
-        @test v.pardiso_verbosity isa SciMLLogging.Silent
-        @test v.HYPRE_verbosity isa SciMLLogging.Silent
-
-        # Test that other groups aren't affected
-        @test v.default_lu_fallback isa SciMLLogging.ErrorLevel  # error_control unchanged
-        @test v.no_right_preconditioning isa SciMLLogging.InfoLevel  # performance unchanged
-
-        # Test individual setting still works after group setting
-        v.KrylovKit_verbosity = WarnLevel()
-        @test v.KrylovKit_verbosity isa SciMLLogging.WarnLevel
-        # Other numerical options should still be Silent
-        @test v.using_IterativeSolvers isa SciMLLogging.Silent
-    end
-
-    @testset "Group setproperty! error handling" begin
-        v = LinearVerbosity()
-
-        # Test error for invalid group value type
-        @test_throws ErrorException v.error_control = "invalid"
-        @test_throws ErrorException v.performance = 123
-        @test_throws ErrorException v.numerical = :invalid
-
-        # Test error for invalid individual option type
-        @test_throws ErrorException v.KrylovKit_verbosity = "invalid"
-        @test_throws ErrorException v.default_lu_fallback = 123
-    end
-
-    @testset "getproperty and setproperty! consistency" begin
-        v = LinearVerbosity()
-
-        # Set a group and verify getproperty reflects the change
-        v.numerical = ErrorLevel()
-        numerical_group = v.numerical
-
-        @test all(x -> x isa SciMLLogging.ErrorLevel, values(numerical_group))
-
-        # Set individual option and verify both individual and group access work
-        v.KrylovKit_verbosity = InfoLevel()
-        @test v.KrylovKit_verbosity isa SciMLLogging.InfoLevel
-
-        updated_numerical = v.numerical
-        @test updated_numerical.KrylovKit_verbosity isa SciMLLogging.InfoLevel
-        # Other numerical options should still be Error
-        @test updated_numerical.using_IterativeSolvers isa SciMLLogging.ErrorLevel
-    end
 end
 
 
