From 95367a89199c855628325bbc51ae3d721ffce8bd Mon Sep 17 00:00:00 2001 From: lucylq Date: Thu, 16 Oct 2025 09:18:44 -0700 Subject: [PATCH 1/2] Update usages of DataLoader::SegmentInfo::Type::External Update usages of `SegmentInfo::Type::External` to reflect the same segments that PTE uses, instead of using `External` for any part of the PTD . Specifically: 1. Program: PTD header and flatbuffer portion 2. Constant: when loading items using the `get_data` API 3. Mutable: when loading items using the `load_data_into` API Differential Revision: [D83671426](https://our.internmc.facebook.com/intern/diff/D83671426/) [ghstack-poisoned] --- extension/flat_tensor/flat_tensor_data_map.cpp | 6 +++--- extension/flat_tensor/test/flat_tensor_data_map_test.cpp | 2 +- extension/training/module/test/state_dict_util_test.cpp | 2 +- runtime/executor/pte_data_map.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extension/flat_tensor/flat_tensor_data_map.cpp b/extension/flat_tensor/flat_tensor_data_map.cpp index 515bfe93c28..5d279dbc52f 100644 --- a/extension/flat_tensor/flat_tensor_data_map.cpp +++ b/extension/flat_tensor/flat_tensor_data_map.cpp @@ -135,7 +135,7 @@ ET_NODISCARD Result FlatTensorDataMap::get_data( return loader_->load( /*offset=*/header_.segment_base_offset + segment_offset, segment_size, - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Constant)); } ET_NODISCARD Error FlatTensorDataMap::load_data_into( @@ -201,7 +201,7 @@ ET_NODISCARD Result FlatTensorDataMap::get_key( Result header = loader->load( /*offset=*/0, FlatTensorHeader::kNumHeadBytes, - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Program)); if (!header.ok()) { ET_LOG(Error, "Failed to load header."); return header.error(); @@ -228,7 +228,7 @@ ET_NODISCARD Result FlatTensorDataMap::get_key( Result flat_tensor_data = loader->load( /*offset=*/0, fh->flatbuffer_offset + fh->flatbuffer_size, - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Program)); if (!flat_tensor_data.ok()) { ET_LOG(Error, "Failed to load flat_tensor data."); return flat_tensor_data.error(); diff --git a/extension/flat_tensor/test/flat_tensor_data_map_test.cpp b/extension/flat_tensor/test/flat_tensor_data_map_test.cpp index 0872a988333..4f3a2122b18 100644 --- a/extension/flat_tensor/test/flat_tensor_data_map_test.cpp +++ b/extension/flat_tensor/test/flat_tensor_data_map_test.cpp @@ -173,7 +173,7 @@ TEST_F(FlatTensorDataMapTest, LoadAndCheckSize) { Result truncated_file = data_map_loader_->load( 0, trunc_size, - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Constant)); ASSERT_EQ(truncated_file.error(), Error::Ok); BufferDataLoader truncated_loader = diff --git a/extension/training/module/test/state_dict_util_test.cpp b/extension/training/module/test/state_dict_util_test.cpp index af8bdff53e1..f5163393fef 100644 --- a/extension/training/module/test/state_dict_util_test.cpp +++ b/extension/training/module/test/state_dict_util_test.cpp @@ -44,7 +44,7 @@ class LoadStateDictTest : public ::testing::Test { /*offset=*/0, FlatTensorHeader::kNumHeadBytes, /*segment_info=*/ - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Program)); ASSERT_EQ(header.error(), Error::Ok); diff --git a/runtime/executor/pte_data_map.cpp b/runtime/executor/pte_data_map.cpp index 5fbf4be16c8..881bfd5165a 100644 --- a/runtime/executor/pte_data_map.cpp +++ b/runtime/executor/pte_data_map.cpp @@ -57,7 +57,7 @@ Result PteDataMap::get_data( return loader_->load( /*offset=*/segment_base_offset_ + segment_offset, segment_size, - DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::External)); + DataLoader::SegmentInfo(DataLoader::SegmentInfo::Type::Constant)); } } return Error::NotFound; From 067542678e19190e5e2d0d0d76d9ba22e31531e7 Mon Sep 17 00:00:00 2001 From: lucylq Date: Thu, 16 Oct 2025 09:32:49 -0700 Subject: [PATCH 2/2] Update on "Update usages of DataLoader::SegmentInfo::Type::External" Update usages of `SegmentInfo::Type::External` to reflect the same segments that PTE uses, instead of using `External` for any part of the PTD . Specifically: 1. Program: PTD header and flatbuffer portion 2. Constant: when loading items using the `get_data` API 3. Mutable: when loading items using the `load_data_into` API Differential Revision: [D83671426](https://our.internmc.facebook.com/intern/diff/D83671426/) [ghstack-poisoned]