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
14 changes: 7 additions & 7 deletions apps/rocm/src/chat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
//! above.

use crate::automations::{render_automations_text, render_daemon_text};
use crate::engine_runtime_select::{apply_app_path_env, service_model_names_match};
use crate::freeform_planner::{
format_structured_tool_call, infer_engine_from_request, plan_freeform_request_with_context,
serve_args_request_cpu_device,
Expand All @@ -37,13 +38,12 @@ use crate::service_launch::is_loopback_host;
use crate::uninstall_plan::render_uninstall_dry_run;
use crate::update_cmd::render_update_text;
use crate::{
ChatInferenceParams, apply_app_path_env, build_codex_bridge_gpu_snapshot,
build_codex_bridge_snapshot, builtin_codex_bridge_engine_inventory, cli_version_string,
read_tail_lines, record_cli_audit_event, render_config_text,
render_engine_inventory_text_with_paths, render_examine_text, render_examine_text_with_paths,
render_logs_browser_text, render_logs_text,
render_model_registry_verbose_text_with_context_and_host, render_service_logs_text,
render_services_text, render_setup_status_text, service_model_names_match,
ChatInferenceParams, build_codex_bridge_gpu_snapshot, build_codex_bridge_snapshot,
builtin_codex_bridge_engine_inventory, cli_version_string, read_tail_lines,
record_cli_audit_event, render_config_text, render_engine_inventory_text_with_paths,
render_examine_text, render_examine_text_with_paths, render_logs_browser_text,
render_logs_text, render_model_registry_verbose_text_with_context_and_host,
render_service_logs_text, render_services_text, render_setup_status_text,
therock_install_version_selector, validate_service_id,
};
use crate::{chat_host_facts, comfyui, providers, therock};
Expand Down
24 changes: 13 additions & 11 deletions apps/rocm/src/engine_ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@
//! `decode_engine_response`, `with_scoped_builtin_engine_env`,
//! `builtin_engine_request`, and `ScopedEnvVar` have no callers outside this
//! module and stay private. Shared helpers this module calls back into at the
//! crate root — `apply_app_path_env`, `app_path_env_vars`,
//! `with_sigpipe_ignored`, `optional_arg`, `engine_recipe_json_arg`,
//! `device_policy_name`, `missing_packaged_engine_reason` — stay in
//! `main.rs` and are reached unqualified via `use crate::{...}`, same as for
//! other mechanically relocated modules. `parse_device_policy` moved out of
//! `main.rs` into `gpu_policy.rs` in ROCMAI-214 (Phase 6f); it is reached via
//! `use crate::gpu_policy::parse_device_policy;` instead.
//! crate root — `with_sigpipe_ignored`, `device_policy_name`,
//! `missing_packaged_engine_reason` — stay in `main.rs` and are reached
//! unqualified via `use crate::{...}`, same as for other mechanically
//! relocated modules. `parse_device_policy` moved out of `main.rs` into
//! `gpu_policy.rs` in ROCMAI-214 (Phase 6f); it is reached via `use
//! crate::gpu_policy::parse_device_policy;` instead. `apply_app_path_env`,
//! `app_path_env_vars`, `optional_arg`, and `engine_recipe_json_arg` moved out
//! of `main.rs` into `engine_runtime_select.rs` in ROCMAI-215 (Phase 6f); this
//! file's `use` list below points there now instead of at the crate root.

use std::ffi::OsString;
use std::io::{self, BufRead, Read, Write};
Expand All @@ -70,11 +72,11 @@ use rocm_engine_protocol::{
use serde::Serialize;
use serde::de::DeserializeOwned;

use crate::gpu_policy::parse_device_policy;
use crate::{
app_path_env_vars, apply_app_path_env, device_policy_name, engine_recipe_json_arg,
missing_packaged_engine_reason, optional_arg, with_sigpipe_ignored,
use crate::engine_runtime_select::{
app_path_env_vars, apply_app_path_env, engine_recipe_json_arg, optional_arg,
};
use crate::gpu_policy::parse_device_policy;
use crate::{device_policy_name, missing_packaged_engine_reason, with_sigpipe_ignored};

static BUILTIN_ENGINE_ENV_LOCK: OnceLock<Mutex<()>> = OnceLock::new();

Expand Down
Loading
Loading