From e244563fbbfa0074fca8440438a4b55146a5d5a8 Mon Sep 17 00:00:00 2001 From: Huy Vu2 Date: Fri, 10 Apr 2026 11:26:58 -0700 Subject: [PATCH 1/2] [test] refactor: move diffusion tests to test_groups directory structure Co-Authored-By: Claude Sonnet 4.6 --- .../{ => test_groups}/diffusion/flux/test_flux_conversion.py | 0 .../diffusion/wan/test_wan_conversion.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/functional_tests/{ => test_groups}/diffusion/flux/test_flux_conversion.py (100%) rename tests/functional_tests/{diffusion/wan/test_wan_ckpt_conversion.py => test_groups/diffusion/wan/test_wan_conversion.py} (100%) diff --git a/tests/functional_tests/diffusion/flux/test_flux_conversion.py b/tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py similarity index 100% rename from tests/functional_tests/diffusion/flux/test_flux_conversion.py rename to tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py diff --git a/tests/functional_tests/diffusion/wan/test_wan_ckpt_conversion.py b/tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py similarity index 100% rename from tests/functional_tests/diffusion/wan/test_wan_ckpt_conversion.py rename to tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py From 09c34f71bf291aae775472c4bf337a7994c7193c Mon Sep 17 00:00:00 2001 From: Huy Vu2 Date: Tue, 14 Apr 2026 07:51:05 -0700 Subject: [PATCH 2/2] edit paths for testing --- .../launch_scripts/active/L0_Launch_models_flux.sh | 2 +- .../launch_scripts/active/L0_Launch_wan_ckpt_conversion.sh | 2 +- .../test_groups/diffusion/flux/test_flux_conversion.py | 4 ++-- .../test_groups/diffusion/wan/test_wan_conversion.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/functional_tests/launch_scripts/active/L0_Launch_models_flux.sh b/tests/functional_tests/launch_scripts/active/L0_Launch_models_flux.sh index e0346d9341..c48c4b8926 100755 --- a/tests/functional_tests/launch_scripts/active/L0_Launch_models_flux.sh +++ b/tests/functional_tests/launch_scripts/active/L0_Launch_models_flux.sh @@ -20,5 +20,5 @@ export CUDA_VISIBLE_DEVICES="0,1" uv run coverage run --data-file=/opt/Megatron-Bridge/.coverage --source=/opt/Megatron-Bridge/ --parallel-mode -m pytest \ -o log_cli=true -o log_cli_level=INFO -v -s -x -m "not pleasefixme" --tb=short -rA \ tests/functional_tests/test_groups/diffusion/flux/test_flux_pretrain.py \ - tests/functional_tests/diffusion/flux/test_flux_conversion.py + tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py coverage combine -q diff --git a/tests/functional_tests/launch_scripts/active/L0_Launch_wan_ckpt_conversion.sh b/tests/functional_tests/launch_scripts/active/L0_Launch_wan_ckpt_conversion.sh index 95b18ad72e..d28af4c90e 100755 --- a/tests/functional_tests/launch_scripts/active/L0_Launch_wan_ckpt_conversion.sh +++ b/tests/functional_tests/launch_scripts/active/L0_Launch_wan_ckpt_conversion.sh @@ -17,7 +17,7 @@ set -xeuo pipefail export CUDA_VISIBLE_DEVICES="0" -TEST_FILE="tests/functional_tests/diffusion/wan/test_wan_ckpt_conversion.py" +TEST_FILE="tests/functional_tests/test_groups/diffusion/wan/test_wan_ckpt_conversion.py" # Run all conversion tests in a single invocation so the class-scoped fixtures # (toy model creation, HF->Megatron import) are shared across tests. uv run coverage run \ diff --git a/tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py b/tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py index 06cccfb6dc..0e51bb251b 100644 --- a/tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py +++ b/tests/functional_tests/test_groups/diffusion/flux/test_flux_conversion.py @@ -33,8 +33,8 @@ diffusers = pytest.importorskip("diffusers") FluxTransformer2DModel = diffusers.FluxTransformer2DModel -# Repo root: tests/functional_tests/diffusion/flux -> five parents -REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent.parent +# Repo root: tests/functional_tests/test_groups/diffusion/flux -> six parents +REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent.parent.parent CONVERT_SCRIPT = "examples/diffusion/recipes/flux/conversion/convert_checkpoints.py" diff --git a/tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py b/tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py index ac17c91a35..3647f77dcc 100644 --- a/tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py +++ b/tests/functional_tests/test_groups/diffusion/wan/test_wan_conversion.py @@ -32,8 +32,8 @@ diffusers = pytest.importorskip("diffusers") WanTransformer3DModel = diffusers.WanTransformer3DModel -# Repo root: tests/functional_tests/diffusion/wan -> five parents -REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent.parent +# Repo root: tests/functional_tests/test_groups/diffusion/wan -> six parents +REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent.parent.parent CONVERT_SCRIPT = "examples/diffusion/recipes/wan/conversion/convert_checkpoints.py"