mirror of
https://github.com/ANL-CEEESA/UnitCommitment.jl.git
synced 2025-12-07 16:58:51 -06:00
web: backend: Make JobProcessor more abstract
This commit is contained in:
@@ -2,8 +2,6 @@
|
||||
# Copyright (C) 2025, UChicago Argonne, LLC. All rights reserved.
|
||||
# Released under the modified BSD license. See COPYING.md for more details.
|
||||
|
||||
using UnitCommitment
|
||||
|
||||
import Base: put!
|
||||
|
||||
Base.@kwdef mutable struct JobProcessor
|
||||
@@ -11,7 +9,7 @@ Base.@kwdef mutable struct JobProcessor
|
||||
processing::Channel{String} = Channel{String}(Inf)
|
||||
shutdown::Channel{Bool} = Channel{Bool}(1)
|
||||
worker_task::Union{Task,Nothing} = nothing
|
||||
optimizer = nothing
|
||||
work_fn::Function
|
||||
end
|
||||
|
||||
function Base.put!(processor::JobProcessor, job_id::String)
|
||||
@@ -38,28 +36,21 @@ function run!(processor::JobProcessor)
|
||||
|
||||
# Move job from pending to processing queue
|
||||
job_id = take!(processor.pending)
|
||||
@info "Processing job: $job_id"
|
||||
job_dir = joinpath(basedir, "jobs", job_id)
|
||||
log_path = joinpath(job_dir, "output.log")
|
||||
put!(processor.processing, job_id)
|
||||
|
||||
# Run optimization
|
||||
# Prepare directories
|
||||
job_dir = joinpath(basedir, "jobs", job_id)
|
||||
log_path = joinpath(job_dir, "output.log")
|
||||
mkpath(job_dir)
|
||||
|
||||
# Run work function
|
||||
try
|
||||
@info "Processing job: $job_id"
|
||||
open(log_path, "w") do io
|
||||
redirect_stdout(io) do
|
||||
redirect_stderr(io) do
|
||||
json_path = joinpath(job_dir, "input.json.gz")
|
||||
instance = UnitCommitment.read(json_path)
|
||||
model = UnitCommitment.build_model(;
|
||||
instance,
|
||||
optimizer = processor.optimizer,
|
||||
)
|
||||
UnitCommitment.optimize!(model)
|
||||
solution = UnitCommitment.solution(model)
|
||||
return UnitCommitment.write(
|
||||
joinpath(job_dir, "output.json"),
|
||||
solution,
|
||||
)
|
||||
processor.work_fn(job_id)
|
||||
@info "Job $job_id done"
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -67,6 +58,7 @@ function run!(processor::JobProcessor)
|
||||
# Remove job from processing queue
|
||||
take!(processor.processing)
|
||||
catch e
|
||||
@error "Failed job: $job_id" e
|
||||
open(log_path, "a") do io
|
||||
println(io, "\nError: ", e)
|
||||
println(io, "\nStacktrace:")
|
||||
|
||||
Reference in New Issue
Block a user