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.

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

Use let model=model in variable macro to improve type stability #3500

Merged
merged 5 commits into from
Sep 14, 2023

Conversation

odow
Copy link
Member

@odow odow commented Sep 11, 2023

Closes #3499

We probably need something similar in the other macros as well.

This is quite hard to test, because wrapping things in a function fixes the problem...

@codecov
Copy link

codecov bot commented Sep 11, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (ca73f21) 98.13% compared to head (2cd6bca) 98.14%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3500   +/-   ##
=======================================
  Coverage   98.13%   98.14%           
=======================================
  Files          37       37           
  Lines        5536     5545    +9     
=======================================
+ Hits         5433     5442    +9     
  Misses        103      103           
Files Changed Coverage Δ
src/macros.jl 98.00% <100.00%> (+0.02%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@odow
Copy link
Member Author

odow commented Sep 11, 2023

@ExpandingMan could you try this branch?

@odow odow requested a review from blegat September 11, 2023 23:09
@ExpandingMan
Copy link
Contributor

This does seem to work yes. To be honest, I'm rather confused about what's going on here, I'm running inside a function where there should be no problems with inference. Guess it can be chalked up to some weird compiler quirk? 🤷

Regardless, looks fixed, thanks.

@odow
Copy link
Member Author

odow commented Sep 12, 2023

Do you have a reproducible example with the Any?

What's going on here is a little complicated. The @variable macro ends up creating a function that looks like map(index -> add_variable(model, index...), 1:0) where model is captured in the closure. But when run in global scope (or anywhere that the compiler doesn't know the type of model, it can only prove that add_variable returns GenericVariableRef (or Any, in your case) instead of VariableRef if it knew the type of model.

The solution is to add a let model = model before this map so that the compiler can figure out the type.

@odow odow mentioned this pull request Sep 12, 2023
25 tasks
@ExpandingMan
Copy link
Contributor

I did get the Any when I was trying in global scope, I did not create an MWE for it happening inside a function.

Since I'm not entirely sure what's going on here, I should resist the urge to be sanctimonious, but, for whatever it's worth, I think this package's macros should output a lot less code, and the vast majority of macros should be exchangeable with simple function calls. Elaborate macro code is way too hard to diagnose and reason about.

@odow
Copy link
Member Author

odow commented Sep 12, 2023

I think this package's macros should output a lot less code, and the vast majority of macros should be exchangeable with simple function calls. Elaborate macro code is way too hard to diagnose and reason about.

I think we all agree on this. It's an item on our roadmap: https://jump.dev/JuMP.jl/stable/developers/roadmap/

src/macros.jl Outdated

# Wrap the entire code block in a let statement to make the model act as
# a type stable local variable.
creation_code = quote
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be done in _finalize_macro to fix other macros as well ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it has to go here, because it if we move it to _finalize_macro, it'll create something like:

quote
    JuMP._valid_model(m, :m)
    let m = m
        begin
            JuMP._error_if_cannot_register(m, :x)
            var"#3###277" = begin
                (JuMP.Containers.container)(((var"##278",)->begin
                            JuMP.add_variable(m, JuMP.model_convert(m, JuMP.build_variable(JuMP.var"#_error#115"{LineNumberNode}(:(#= REPL[5]:1 =#), Core.Box((:m, :(x[1:0])))), JuMP.VariableInfo(false, NaN, false, NaN, false, NaN, false, NaN, false, false))), if JuMP.set_string_names_on_creation(m)
                                    JuMP.string("x", "[", JuMP.string(var"##278"), "]")
                                else
                                    ""
                                end)
                        end), (JuMP.Containers).vectorized_product((JuMP.Base).OneTo(1:0)), JuMP.Containers.AutoContainerType, Any[Symbol("##278")])
            end
            m[:x] = var"#3###277"
            x = var"#3###277"
        end
    end
end

and then the x = var"#3###277" is a local variable inside the let scope.

I've added it to the other macros.

@odow odow force-pushed the od/macro-let-model branch from d0c4e26 to be6beb3 Compare September 13, 2023 22:12
src/macros.jl Outdated Show resolved Hide resolved
src/macros.jl Outdated Show resolved Hide resolved
@odow
Copy link
Member Author

odow commented Sep 13, 2023

This seems to have broken extensions: https://github.com/jump-dev/JuMP.jl/actions/runs/6179053153

@odow odow changed the title Use let model=model in variable macro to improve type stability DNMY: Use let model=model in variable macro to improve type stability Sep 14, 2023
@odow
Copy link
Member Author

odow commented Sep 14, 2023

Ah

julia> using JuMP

julia> model = Model()
A JuMP Model
Feasibility problem with:
Variables: 0
Model mode: AUTOMATIC
CachingOptimizer state: NO_OPTIMIZER
Solver name: No optimizer attached.

julia> @variable(model, x[1:0])
VariableRef[]

julia> m = (; m = model)
(m = A JuMP Model
Feasibility problem with:
Variables: 0
Model mode: AUTOMATIC
CachingOptimizer state: NO_OPTIMIZER
Solver name: No optimizer attached.
Names registered in the model: x,)

julia> @variable(m.m, y[1:0])
ERROR: syntax: invalid let syntax around /Users/oscar/.julia/dev/JuMP/src/macros.jl:3035
Stacktrace:
 [1] top-level scope
   @ REPL[8]:1

@odow
Copy link
Member Author

odow commented Sep 14, 2023

@odow odow changed the title DNMY: Use let model=model in variable macro to improve type stability Use let model=model in variable macro to improve type stability Sep 14, 2023
@odow
Copy link
Member Author

odow commented Sep 14, 2023

Okay, updated.

We can fix something like @variable(model, x[1:0]), but we can't fix something like @variable(get_model(), x[1:0]).

This leads to some weird behavior, like get_model() returning Any[], but I don't know what else we can do. We can't know the return type of the vector if we don't know what get_model() returns.

@blegat
Copy link
Member

blegat commented Sep 14, 2023

We can fix something like @variable(model, x[1:0]), but we can't fix something like @variable(get_model(), x[1:0]).

I think fixing @variable(model, x[1:0]) is enough

@odow odow merged commit fa3d6b8 into master Sep 14, 2023
@odow odow deleted the od/macro-let-model branch September 14, 2023 07:01
@odow odow mentioned this pull request Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

@variable declarations returning empty container should have VariableRef element type
3 participants