PTQ-Level Efficiency, QAT-Level Accuracy | 训练后量化的效率,量化感知训练的精度
add small zimage test and fix bug (#1734)
Xin He46b29910ea9c
diff --git a/auto_round/utils/model.py b/auto_round/utils/model.pyindex 6acaa8770..7ed9133f7 100644--- a/auto_round/utils/model.py+++ b/auto_round/utils/model.py@@ -1975,6 +1975,10 @@ def rename_weights_files(path: str, prefix="diffusion_pytorch_model"):# rename safetensorsfiles = sorted(glob.glob(f"{path}/*.safetensors"))total = len(files)+ if total == 1:+ new = f"{prefix}.safetensors"+ os.rename(files[0], os.path.join(path, new))+ returnfor i, f in enumerate(files, 1):new = f"{prefix}-{i:05d}-of-{total:05d}.safetensors"diff --git a/test/fixtures.py b/test/fixtures.pyindex 54bb8abdc..bbd601a87 100644--- a/test/fixtures.py+++ b/test/fixtures.py@@ -132,6 +132,37 @@ def tiny_flux_model_path():shutil.rmtree(tiny_model_path, ignore_errors=True)[email protected](scope="session")+def tiny_z_image_model_path():+ model_name_or_path = "Tongyi-MAI/Z-Image"+ tiny_model_path = "./tmp/tiny_z_image_model_path"+ tiny_model_path = save_tiny_model(+ model_name_or_path,+ tiny_model_path,+ num_layers=1,+ is_diffusion=True,+ from_config=True,+ config_overrides={+ "dim": 256,+ "n_heads": 2,+ "n_kv_heads": 2,+ "n_layers": 1,+ "n_refiner_layers": 1,+ "cap_feat_dim": 512,+ "in_channels": 16,+ "num_attention_heads": 2,+ "num_key_value_heads": 2,+ "attention_head_dim": 128,+ "joint_attention_dim": 256,+ "pooled_projection_dim": 256,+ "hidden_size": 512,+ "intermediate_size": 256,+ },+ )+ yield tiny_model_path+ shutil.rmtree(tiny_model_path, ignore_errors=True)++@pytest.fixture(scope="session")def tiny_untied_qwen_model_path():model_name_or_path = qwen_name_or_pathdiff --git a/test/helpers.py b/test/helpers.pyindex 8c85d39c5..f2a670d4c 100644--- a/test/helpers.py+++ b/test/helpers.py@@ -123,41 +123,6 @@ def get_model_path(model_name: str) -> str:return model_name-def get_captions_dataset_path() -> str:- """Find captions_source.tsv locally or download it to tmp.-- Checks /dataset/, /tf_dataset/, and test/tmp/ for the file.- If not found, downloads from the mlcommons URL to test/tmp/.-- Returns:- str: The path to captions_source.tsv.- """- import urllib.request-- filename = "captions_source.tsv"- url = (- "https://raw.githubusercontent.com/mlcommons/inference/refs/heads/master/"- "text_to_image/coco2014/captions/captions_source.tsv"- )-- local_candidates = [- f"/dataset/{filename}",- f"/tf_dataset/{filename}",- os.path.join(os.path.dirname(__file__), "tmp", filename),- ]- for path in local_candidates:- if os.path.exists(path):- return path-- # Download to tmp- tmp_dir = os.path.join(os.path.dirname(__file__), "tmp")- os.makedirs(tmp_dir, exist_ok=True)- tmp_path = os.path.join(tmp_dir, filename)- print(f"[Helper] Downloading {filename} from {url} to {tmp_path}")- urllib.request.urlretrieve(url, tmp_path)- return tmp_path--opt_name_or_path = get_model_path("facebook/opt-125m")qwen_name_or_path = get_model_path("Qwen/Qwen3-0.6B")lamini_name_or_path = get_model_path("MBZUAI/LaMini-GPT-124M")@@ -328,7 +293,8 @@ def get_tiny_model(and isinstance(v, list)and v[0] in ["diffusers", "transformers"]):- _reduce_config_layers(getattr(model, k).config, num_layers, num_experts)+ tiny_module = _get_module(v[0], v[1], k)+ setattr(model, k, tiny_module)return modelelse:trust_remote_code = kwargs.get("trust_remote_code", True)diff --git a/test/test_cuda/models/test_diffusion.py b/test/test_cuda/models/test_diffusion.pyindex 4caa604f7..489d9e761 100644--- a/test/test_cuda/models/test_diffusion.py+++ b/test/test_cuda/models/test_diffusion.py@@ -8,10 +8,10 @@ import requestsfrom packaging import versionfrom PIL import Image-from auto_round import AutoRoundDiffusion+from auto_round import AutoRoundfrom ...envs import multi_card, require_gptqmodel, require_optimum, require_vlm_env-from ...helpers import get_captions_dataset_path, get_model_path, transformers_version+from ...helpers import get_model_path, transformers_versionclass TestAutoRound:@@ -37,18 +37,29 @@ class TestAutoRound:pipe.transformer.single_transformer_blocks = pipe.transformer.single_transformer_blocks[:2]## quantize the model- autoround = AutoRoundDiffusion(+ autoround = AutoRound(pipe,tokenizer=None,scheme="MXFP4",iters=0,disable_opt_rtn=True,num_inference_steps=2,- dataset=get_captions_dataset_path(),+ dataset="coco2014",)# skip model saving since it takes much timeautoround.quantize()+ def test_z_image_tune(self, tiny_z_image_model_path, tmp_path):+ autoround = AutoRound(+ tiny_z_image_model_path,+ iters=1,+ nsamples=1,+ num_inference_steps=2,+ dataset="coco2014",+ )+ # skip model saving since it takes much time+ autoround.quantize_and_save(tmp_path)+@require_optimumdef test_diffusion_tune(self, tiny_flux_model_path, tmp_path):from diffusers import AutoPipelineForText2Image@@ -71,7 +82,7 @@ class TestAutoRound:## quantize the model# https://raw.githubusercontent.com/mlcommons/inference/refs/heads/master/text_to_image/coco2014/captions/captions_source.tsv- autoround = AutoRoundDiffusion(+ autoround = AutoRound(pipe,tokenizer=None,scheme="MXFP4",@@ -79,7 +90,7 @@ class TestAutoRound:nsamples=1,num_inference_steps=2,layer_config=layer_config,- dataset=get_captions_dataset_path(),+ dataset="coco2014",)# skip model saving since it takes much timeautoround.quantize_and_save(tmp_path)@@ -116,7 +127,7 @@ class TestAutoRound:## quantize the model# https://raw.githubusercontent.com/mlcommons/inference/refs/heads/master/text_to_image/coco2014/captions/captions_source.tsv- autoround = AutoRoundDiffusion(+ autoround = AutoRound(pipe,tokenizer=None,scheme="MXFP4",@@ -124,7 +135,7 @@ class TestAutoRound:nsamples=1,num_inference_steps=2,layer_config=layer_config,- dataset=get_captions_dataset_path(),+ dataset="coco2014",device_map="0,1",)# skip model saving since it takes much time