Update

Author: odow

.github/workflows/ci.yml

@@ -17,11 +17,17 @@ permissions:
   contents: read
 jobs:
   test:
-    name: Julia ${{ matrix.machine.version }} - ${{ matrix.machine.os }}-${{ matrix.machine.arch }}
+    name: Julia ${{ matrix.machine.version }} - ${{ matrix.machine.os }}-${{ matrix.machine.arch }} - ${{ matrix.moi_test_modules }}
     runs-on: ${{ matrix.machine.os }}
     strategy:
       fail-fast: false
       matrix:
+        moi_test_modules:
+          - 'General;Benchmarks;FileFormats;Nonlinear'
+          - 'Bridges/General'
+          - 'Bridges/Constraint;Bridges/Objective;Bridges/Variable'
+          - 'Test'
+          - 'Utilities'
         machine:
           - version: 'nightly'
             os: ubuntu-latest
@@ -61,7 +67,7 @@ jobs:
           allow_reresolve: ${{ !matrix.machine.downgrade }}
           force_latest_compatible_version: ${{ !matrix.machine.downgrade }}
         env:
-          JULIA_CPU_THREADS: 8
+            MOI_TEST_MODULES: ${{ matrix.moi_test_modules }}
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v4
         with:

test/Bridges/identity_bridge.jl test/Bridges/General/identity_bridge.jltest/Bridges/identity_bridge.jl renamed to test/Bridges/General/identity_bridge.jl

@@ -21,7 +21,7 @@ function runtests()
     return
 end
 
-include("utilities.jl")
+include("../utilities.jl")
 
 struct DummyModelAttribute <: MOI.AbstractModelAttribute end
 

test/Bridges/test_bridge_optimizer.jl …Bridges/General/test_bridge_optimizer.jltest/Bridges/test_bridge_optimizer.jl renamed to test/Bridges/General/test_bridge_optimizer.jl test/Bridges/test_bridge_optimizer.jl renamed to test/Bridges/General/test_bridge_optimizer.jl

@@ -21,8 +21,117 @@ function runtests()
     return
 end
 
-include("utilities.jl")
-include("sdpa_models.jl")
+include("../utilities.jl")
+
+# This block implements models similar to the SDPA format. It gives a good
+# example because it does not support a lot of functions, hence the need for
+# a lot of bridges.
+
+MOI.Utilities.@model(
+    StandardSDPAModel,
+    (),
+    (MOI.EqualTo,),
+    (MOI.Nonnegatives, MOI.PositiveSemidefiniteConeTriangle),
+    (),
+    (),
+    (MOI.ScalarAffineFunction,),
+    (MOI.VectorOfVariables,),
+    ()
+)
+
+function MOI.supports_constraint(
+    ::StandardSDPAModel{T},
+    ::Type{MOI.VariableIndex},
+    ::Type{
+        <:Union{
+            MOI.GreaterThan{T},
+            MOI.LessThan{T},
+            MOI.EqualTo{T},
+            MOI.Interval{T},
+            MOI.ZeroOne,
+            MOI.Integer,
+        },
+    },
+) where {T}
+    return false
+end
+
+function MOI.supports_constraint(
+    ::StandardSDPAModel{T},
+    ::Type{MOI.VectorOfVariables},
+    ::Type{MOI.Reals},
+) where {T}
+    return false
+end
+
+function MOI.supports_add_constrained_variables(
+    ::StandardSDPAModel,
+    ::Type{<:Union{MOI.Nonnegatives,MOI.PositiveSemidefiniteConeTriangle}},
+)
+    return true
+end
+
+function MOI.supports_add_constrained_variables(
+    ::StandardSDPAModel,
+    ::Type{MOI.Reals},
+)
+    return false
+end
+
+function MOI.supports(
+    ::StandardSDPAModel{T},
+    ::MOI.ObjectiveFunction{
+        <:Union{
+            MOI.VariableIndex,
+            MOI.ScalarQuadraticFunction{T},
+            MOI.ScalarNonlinearFunction,
+            MOI.VectorOfVariables,
+            MOI.VectorAffineFunction{T},
+            MOI.VectorQuadraticFunction{T},
+            MOI.VectorNonlinearFunction,
+        },
+    },
+) where {T}
+    return false
+end
+
+MOI.Utilities.@model(
+    GeometricSDPAModel,
+    (),
+    (),
+    (MOI.Zeros, MOI.Nonnegatives, MOI.PositiveSemidefiniteConeTriangle),
+    (),
+    (),
+    (),
+    (),
+    (MOI.VectorAffineFunction,)
+)
+
+function MOI.supports_constraint(
+    ::GeometricSDPAModel{T},
+    ::Type{MOI.VariableIndex},
+    ::Type{
+        <:Union{
+            MOI.GreaterThan{T},
+            MOI.LessThan{T},
+            MOI.EqualTo{T},
+            MOI.Interval{T},
+            MOI.ZeroOne,
+            MOI.Integer,
+        },
+    },
+) where {T}
+    return false
+end
+
+function MOI.supports(
+    ::GeometricSDPAModel{T},
+    ::MOI.ObjectiveFunction{
+        <:Union{MOI.VariableIndex,MOI.ScalarQuadraticFunction{T}},
+    },
+) where {T}
+    return false
+end
 
 function test_add_remove_has_bridges()
     T = Int

test/Bridges/test_debug.jl test/Bridges/General/test_debug.jltest/Bridges/test_debug.jl renamed to test/Bridges/General/test_debug.jl

@@ -21,6 +21,11 @@ function runtests()
     end
 end
 
+function test_method_ambiguities()
+    @test isempty(Test.detect_ambiguities(MOI; recursive = true))
+    return
+end
+
 function test_errors_fallback_AddVariableNotAllowed()
     model = DummyModel()
     @test_throws MOI.AddVariableNotAllowed MOI.add_variable(model)

…st/Bridges/test_lazy_bridge_optimizer.jl …es/General/test_lazy_bridge_optimizer.jltest/Bridges/test_lazy_bridge_optimizer.jl renamed to test/Bridges/General/test_lazy_bridge_optimizer.jl test/Bridges/test_lazy_bridge_optimizer.jl renamed to test/Bridges/General/test_lazy_bridge_optimizer.jl

@@ -4,17 +4,73 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
+# To try and speed up the tests, MOI uses a `MOI_TEST_MODULES` environment
+# variable. This environment variable may be missing, or it may be a subset of
+# the following, concatenated with `;` as a separator:
+#
+#  * General
+#  * Benchmarks
+#  * Bridges/General
+#  * Bridges/Constraint
+#  * Bridges/Objective
+#  * Bridges/Variable
+#  * FileFormats
+#  * Nonlinear
+#  * Test
+#  * Utilities
+#
+# If present, the tests run only those submodules defined above. `General` is
+# not a submodule, but it runs all of the top-level tests in MOI.
+
 # This file gets called first. If it doesn't crash, all is well.
 include("issue980.jl")
 
-# Test hygiene of @model macro before calling `import MathOptInterface`
-include("hygiene.jl")
+MODULES_TO_TEST = get(
+    ENV,
+    "MOI_TEST_MODULES",
+    "General;Benchmarks;Bridges/General;Bridges/Constraint;Bridges/Objective;Bridges/Variable;FileFormats;Nonlinear;Test;Utilities",
+)
+
+"""
+    include_with_method_redefinition_check(jl_filename)
+
+This function runs `include(jl_filename)` with an additional check that there
+are no `WARNING: Method definition foo in module Foo overwritten` warnings.
+
+It does this by piping `stderr` to a file, and then parsing the file.
+
+One consequence is that `stderr` is not printed until the _end_ of this
+function. Thus, some warnings may appear in the wrong place.
+
+This function requires Julia to be started with `--warn-overwrite=true`.
+"""
+const init_code = quote
+    function include_with_method_redefinition_check(jl_filename)
+        stderr_filename = tempname()
+        open(stderr_filename, "w") do io
+            return redirect_stderr(() -> include(jl_filename), io)
+        end
+        contents = read(stderr_filename, String)
+        print(stderr, contents)
+        regex =
+            r"WARNING: Method definition (.+?) in module (.+?) at (.+?) overwritten at (.+?)\n"
+        if match(regex, contents) !== nothing
+            error("Found overwritten method in $jl_filename")
+        end
+        return
+    end
+end
 
 import MathOptInterface
 import ParallelTestRunner
 
-testsuite = ParallelTestRunner.find_tests(@__DIR__)
-filter!(testsuite) do (k, v)
-    return startswith(last(splitpath(k)), "test_")
-end
-ParallelTestRunner.runtests(MathOptInterface, ARGS; testsuite)
+is_test_file(f) = startswith(f, "test_") && endswith(f, ".jl")
+
+testsuite = Dict{String,Expr}(
+    file => :(include_with_method_redefinition_check($file)) for
+    submodule in split(MODULES_TO_TEST, ";") for
+    (root, dirs, files) in walkdir(submodule) for
+    file in joinpath.(root, filter(is_test_file, files))
+)
+
+ParallelTestRunner.runtests(MathOptInterface, ARGS; testsuite, init_code)