Skip to content

Guyen/develop build context folder change 2#144

Merged
coketaste merged 6 commits into
developfrom
guyen/develop-build-context-folder-change-2
Jun 13, 2026
Merged

Guyen/develop build context folder change 2#144
coketaste merged 6 commits into
developfrom
guyen/develop-build-context-folder-change-2

Conversation

@ggankhuy

@ggankhuy ggankhuy commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Motivation

This is a re-push of guyen/develop-build-context-folder-change with conflict resolved after merging with latest main.

Technical Details

This is a re-push of guyen/develop-build-context-folder-change with conflict resolved after merging with latest main.

Test Plan

test migx_universal docker with this change.

Test Result

Submission Checklist

@coketaste coketaste left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@coketaste
coketaste merged commit ef87d05 into develop Jun 13, 2026
mkuznet1 added a commit to mkuznet1/madengine that referenced this pull request Jun 15, 2026
Merges 4 upstream commits (ef87d05..3a68be8) into the multi-node SLURM branch:
- feat: canonicalize launcher aliases; extract MAD_MULTI_NODE_RUNNER resolver
  into _resolve_local_multi_node_runner_env() (upstream ROCm#132)
- fix(run): --skip-model-run now starts container before skipping model script (ROCm#145)
- chore: consolidate optional deps into default dependencies (ROCm#146)
- Guyen/develop build-context folder change 2 (ROCm#144)
Conflict in src/madengine/execution/container_runner.py resolved:
- Upstream's if/else skip_model_run wrapper is the outer structure
- Our try/except RuntimeError (container diagnostics on failure) is placed
  inside the else: branch around model_docker.sh()
- Our elif skip_perf_collection: status branch and fallback or-clause are
  preserved in the else: branch status logic
mkuznet1 added a commit to mkuznet1/madengine that referenced this pull request Jun 15, 2026
Second merge of upstream/develop (ef87d05) on top of prior merge a6b88b2.
Brings in: ROCm#145 (--skip-model-run), ROCm#132 (launcher canonicalize), ROCm#144 (build context).
Conflict in src/madengine/execution/container_runner.py resolved.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants