Skip to content

add two eac workflows for the optimizer #166

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.

Sign up for GitHub

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

Merged
MarkTNO merged 2 commits into from
Nov 11, 2025
Merged

add two eac workflows for the optimizer #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e1cfc
add two eac workflows for the optimizer
MarkTNO Nov 11, 2025
237bc3e
update optimizer and orchestrator versions
MarkTNO Nov 11, 2025
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
8 changes: 8 additions & 0 deletions config/workflow_config_nwn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"workflow_type_name": "grow_optimizer_default",
"workflow_type_description_name": "Draft Design - Optimization"
},
{
"workflow_type_name": "grow_optimizer_eac",
"workflow_type_description_name": "Draft Design - Optimization – EAC"
},
{
"workflow_type_name": "grow_optimizer_no_heat_losses_gurobi",
"workflow_type_description_name": "Draft Design - Quickscan Validation - Gurobi"
Expand All @@ -15,6 +19,10 @@
"workflow_type_name": "grow_optimizer_default_gurobi",
"workflow_type_description_name": "Draft Design - Optimization - Gurobi"
},
{
"workflow_type_name": "grow_optimizer_eac_gurobi",
"workflow_type_description_name": "Draft Design - Optimization – EAC - Gurobi"
},
{
"workflow_type_name": "simulator",
"workflow_type_description_name": "Conceptual Design - Simulation",
Expand Down
4 changes: 4 additions & 0 deletions config/workflow_config_nwn_no_gurobi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"workflow_type_name": "grow_optimizer_default",
"workflow_type_description_name": "Draft Design - Optimization"
},
{
"workflow_type_name": "grow_optimizer_eac",
"workflow_type_description_name": "Draft Design - Optimization – EAC"
},
{
"workflow_type_name": "simulator",
"workflow_type_description_name": "Conceptual Design - Simulation",
Expand Down
9 changes: 6 additions & 3 deletions docker-compose.override.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@ services:

grow_worker_optimizer: &grow_worker
image: omotes-worker-mesido-dev
build:
context: ..
dockerfile: optimizer-worker/dev.Dockerfile

grow_worker_simulator:
<<: *grow_worker
build:
Copy link

@cwang39403 cwang39403 Nov 11, 2025

Choose a reason for hiding this comment

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

We build image at grow_worker_simulator?

Copy link
Contributor Author

@MarkTNO MarkTNO Nov 11, 2025

Choose a reason for hiding this comment

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

docker compose now builds services concurrently, and since all the grow services build the same image it gives an error now.
With this change it only builds the optimizer image once.

context: ..
dockerfile: optimizer-worker/dev.Dockerfile

grow_worker_optimizer_no_heat_losses:
<<: *grow_worker

grow_worker_optimizer_with_pressure:
<<: *grow_worker

grow_worker_optimizer_eac:
<<: *grow_worker

grow_worker_gurobi:
<<: *grow_worker

Expand Down
12 changes: 9 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ services:
- manual_dev

orchestrator:
image: ghcr.io/project-omotes/omotes_orchestrator:1.2.5
image: ghcr.io/project-omotes/omotes_orchestrator:1.2.6
restart: unless-stopped
networks:
- omotes
Expand Down Expand Up @@ -149,7 +149,7 @@ services:
condition: service_healthy

grow_worker_optimizer: &grow_worker
image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.1.1
image: ghcr.io/project-omotes/omotes-grow-optimizer-worker:2.1.2
restart: unless-stopped
deploy: &grow_worker_deploy
replicas: 2
Expand Down Expand Up @@ -197,14 +197,20 @@ services:
<<: *grow_worker_env
GROW_TASK_TYPE: grow_optimizer_with_pressure

grow_worker_optimizer_eac:
<<: *grow_worker
environment:
<<: *grow_worker_env
GROW_TASK_TYPE: grow_optimizer_eac

grow_worker_gurobi:
<<: *grow_worker
deploy:
<<: *grow_worker_deploy
replicas: 1 # only 1 WLS available with a baseline of 1 active session
environment:
<<: *grow_worker_env
GROW_TASK_TYPE: grow_optimizer_no_heat_losses_gurobi,grow_optimizer_default_gurobi
GROW_TASK_TYPE: grow_optimizer_no_heat_losses_gurobi,grow_optimizer_default_gurobi,grow_optimizer_eac_gurobi
volumes:
- "./gurobi/gurobi.lic:/app/gurobi/gurobi.lic"

Expand Down
3 changes: 2 additions & 1 deletion scripts/start-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
. scripts/_select_docker_compose.sh

$DOCKER_COMPOSE --profile=manual_dev down orchestrator_postgres_db_dev
$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml up --build --wait
$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml build
$DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.override.dev.yml up --wait
3 changes: 2 additions & 1 deletion scripts/test_system_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ sed -i 's/LOG_LEVEL=[a-z]*/LOG_LEVEL=WARNING/gi' ${ENV_FILE}

$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE down -v
./scripts/setup.sh $ENV_FILE "./docker-compose.yml -f ./docker-compose.override.setup.yml"
$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE up --build --abort-on-container-exit
$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE build
$DOCKER_COMPOSE --env-file ${ENV_FILE} -f $DOCKER_COMPOSE_FILE up --abort-on-container-exit