Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/MOI/MOI_callbacks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ function MOI.set(model::Optimizer, ::CallbackFunction, f::Function)
cb = @cfunction(_cboptnode, Cint, (XPRSprob, Ptr{Cvoid}, Ptr{Cint}))
ret = XPRSaddcboptnode(model, cb, model.callback_data, 0)
_check(model, ret)
# Disable calling the callback from anything other than the main thread
ret = XPRSsetintcontrol(model, XPRS_CALLBACKFROMMAINTHREAD, 1)
_check(model, ret)
return
end

Expand Down
7 changes: 0 additions & 7 deletions src/MOI/MOI_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,6 @@ function MOI.empty!(model::Optimizer)
MOI.set(model, name, value)
end
MOI.set(model, MOI.RawOptimizerAttribute("MPSNAMELENGTH"), 64)
callback_main_thread = if get_version() >= v"46"
"CALLBACKFROMMAINTHREAD"
else
# Kept for compatibility with older versions
"CALLBACKFROMMASTERTHREAD"
end
MOI.set(model, MOI.RawOptimizerAttribute(callback_main_thread), 1)
MOI.set(
model,
MOI.RawOptimizerAttribute("XPRESS_WARNING_WINDOWS"),
Expand Down
Loading