Skip to content

Commit 9a3f0dd

Browse files
iche033codebot
andauthored
Set model_discovery_timeout_seconds when building eval docker image (#466)
* Add arg for configuring model discovery timeout Signed-off-by: Ian Chen <iche@intrinsic.ai> * Expose model_discovery_timeout_seconds Signed-off-by: Ian Chen <iche@intrinsic.ai> * Add python toml dependency to eval dockerfile (#470) --------- Signed-off-by: Ian Chen <iche@intrinsic.ai> Co-authored-by: Morgan Quigley <morganquigley@intrinsic.ai>
1 parent 5769605 commit 9a3f0dd

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

aic_bringup/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ ros2 launch aic_bringup aic_gz_bringup.launch.py [parameters]
134134
- `start_aic_engine` (default: `"false"`) - Start the `aic_engine` orchestrator node for evaluation.
135135
- `shutdown_on_aic_engine_exit` (default: `"false"`) - Shutdown the entire launch file when `aic_engine` exits, propagating its exit code. Only takes effect when `start_aic_engine` is `true`. Useful for automated evaluation where the container should exit after trial completion.
136136
- `aic_engine_config_file` (default: `"aic_engine/config/sample_config.yaml"`) - Absolute path to YAML file with the AIC engine configuration.
137+
- `model_discovery_timeout_seconds` (default: `"30"`) - Timeout for discovering the participant model.
137138

138139
---
139140

aic_bringup/launch/aic_gz_bringup.launch.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ def launch_setup(context, *args, **kwargs):
9595
start_aic_engine = LaunchConfiguration("start_aic_engine")
9696
shutdown_on_aic_engine_exit = LaunchConfiguration("shutdown_on_aic_engine_exit")
9797
aic_engine_config_file = LaunchConfiguration("aic_engine_config_file")
98+
model_discovery_timeout_seconds = LaunchConfiguration(
99+
"model_discovery_timeout_seconds"
100+
)
98101

99102
gripper_initial_pos = "0.00655"
100103
cable_type_str = LaunchConfiguration("cable_type").perform(context)
@@ -238,7 +241,11 @@ def launch_setup(context, *args, **kwargs):
238241
executable="aic_engine",
239242
output="screen",
240243
parameters=[
241-
{"config_file_path": aic_engine_config_file, "use_sim_time": True},
244+
{
245+
"config_file_path": aic_engine_config_file,
246+
"use_sim_time": True,
247+
"model_discovery_timeout_seconds": model_discovery_timeout_seconds,
248+
},
242249
],
243250
condition=IfCondition(start_aic_engine),
244251
)
@@ -761,6 +768,13 @@ def generate_launch_description():
761768
)
762769
)
763770

771+
declared_arguments.append(
772+
DeclareLaunchArgument(
773+
"model_discovery_timeout_seconds",
774+
default_value="30",
775+
description="Timeout for discovering the participant model.",
776+
)
777+
)
764778
return LaunchDescription(
765779
declared_arguments + [OpaqueFunction(function=launch_setup)]
766780
)

docker/aic_eval/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY --chmod=u=rwX,go=rX --parents **/package.xml /ws_aic/src/aic
1111
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked --mount=type=cache,target=/var/lib/apt,sharing=locked \
1212
apt update && apt upgrade -y && \
1313
# undeclared deps
14-
apt install python3-numpy && \
14+
apt -y install python3-numpy python3-toml && \
1515
cd /ws_aic/src && \
1616
vcs import . < /ws_aic/src/aic/aic.repos --recursive && \
1717
# Install Gazebo dependencies.

docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
build:
77
dockerfile: docker/aic_eval/Dockerfile
88
context: ..
9-
command: gazebo_gui:=false launch_rviz:=false ground_truth:=false start_aic_engine:=true shutdown_on_aic_engine_exit:=true
9+
command: gazebo_gui:=false launch_rviz:=false ground_truth:=false start_aic_engine:=true shutdown_on_aic_engine_exit:=true model_discovery_timeout_seconds:=600
1010
gpus: all
1111
networks:
1212
- default

0 commit comments

Comments
 (0)