From 484c4093a87a3e6767e55ed553f95db8fc137442 Mon Sep 17 00:00:00 2001 From: angelayi Date: Tue, 9 Sep 2025 09:37:04 -0700 Subject: [PATCH] test fixing benchmarks (#162503) Pull Request resolved: https://github.com/pytorch/pytorch/pull/162503 Approved by: https://github.com/huydhn ghstack dependencies: #160741 --- .ci/pytorch/macos-test.sh | 4 ++-- benchmarks/dynamo/common.py | 10 ++++++++-- .../inductor/aoti_package/model_package_loader.cpp | 11 +++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.ci/pytorch/macos-test.sh b/.ci/pytorch/macos-test.sh index 79d47da4317..1ed5b038fd9 100755 --- a/.ci/pytorch/macos-test.sh +++ b/.ci/pytorch/macos-test.sh @@ -393,10 +393,10 @@ elif [[ $TEST_CONFIG == *"perf_hf"* ]]; then test_hf_perf elif [[ $TEST_CONFIG == *"perf_timm"* ]]; then test_timm_perf -elif [[ $TEST_CONFIG == *"perf_smoketest"* ]]; then - test_torchbench_smoketest "${SHARD_NUMBER}" elif [[ $TEST_CONFIG == *"aot_inductor_perf_smoketest"* ]]; then test_aoti_torchbench_smoketest "${SHARD_NUMBER}" +elif [[ $TEST_CONFIG == *"perf_smoketest"* ]]; then + test_torchbench_smoketest "${SHARD_NUMBER}" elif [[ $TEST_CONFIG == *"mps"* ]]; then test_python_mps elif [[ $NUM_TEST_SHARDS -gt 1 ]]; then diff --git a/benchmarks/dynamo/common.py b/benchmarks/dynamo/common.py index 2901009f7c4..83d55682247 100644 --- a/benchmarks/dynamo/common.py +++ b/benchmarks/dynamo/common.py @@ -1424,7 +1424,7 @@ class AOTInductorModelCache: torch.hpu.max_memory_allocated() - pre_clone_memory_used ) / 1e9 - inductor_configs = {} + inductor_configs = {"aot_inductor.package_constants_in_so": False} if mode == "max-autotune": inductor_configs["max_autotune"] = True ep = torch.export.export( @@ -1439,8 +1439,14 @@ class AOTInductorModelCache: ep, inductor_configs=inductor_configs ) # type: ignore[arg-type] + compiled = torch._inductor.aoti_load_package(package_path) + compiled.load_constants( + {**ep.state_dict, **ep.constants}, + check_full_update=False, + user_managed=True, + ) cls.cache[key] = ( - torch._inductor.aoti_load_package(package_path), + compiled, clone_memory_used, ) diff --git a/torch/csrc/inductor/aoti_package/model_package_loader.cpp b/torch/csrc/inductor/aoti_package/model_package_loader.cpp index aa8ef905d57..1fae20572b9 100644 --- a/torch/csrc/inductor/aoti_package/model_package_loader.cpp +++ b/torch/csrc/inductor/aoti_package/model_package_loader.cpp @@ -721,8 +721,15 @@ void AOTIModelPackageLoader::load_constants( for (const auto& it : constants_map) { if (fqn_to_constant_name.find(it.first) != fqn_to_constant_name.end()) { updated_constants_map.emplace(fqn_to_constant_name[it.first], it.second); - } else { - throw std::runtime_error("Constant not found: " + it.first); + } else if (check_full_update) { + std::string constant_fqns = ""; + for (const auto& it2 : fqn_to_constant_name) { + constant_fqns += it2.first + ", "; + } + throw std::runtime_error( + "The constant with FQN " + it.first + + " was not found in the model. The available constants are: " + + constant_fqns); } }