Skip to content

Commit fbc3b90

Browse files
authored
Change lod_level to legacy_lod_level (#1451)
1 parent 2baaa03 commit fbc3b90

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

paddle2onnx/parser/parser.cc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ bool PaddleParser::LoadParamsFromMemoryBuffer(
123123
read_size += sizeof(version);
124124
}
125125
{
126-
// read lod_level, we don't use it
126+
// read legacy_lod_level, we don't use it
127127
// this has to be zero, otherwise not support
128-
uint64_t lod_level;
129-
params_buffer.copy(reinterpret_cast<char*>(&lod_level), sizeof(lod_level),
128+
uint64_t legacy_lod_level;
129+
params_buffer.copy(reinterpret_cast<char*>(&legacy_lod_level), sizeof(legacy_lod_level),
130130
read_size);
131-
read_size += sizeof(lod_level);
132-
if (lod_level != 0) {
133-
P2OLogger() << "Only supports weight with lod_level = 0." << std::endl;
131+
read_size += sizeof(legacy_lod_level);
132+
if (legacy_lod_level != 0) {
133+
P2OLogger() << "Only supports weight with legacy_lod_level = 0." << std::endl;
134134
return false;
135135
}
136136
}
@@ -202,14 +202,14 @@ bool PaddleParser::LoadParamsFromMemoryBuffer(const void* params_buffer,
202202
params_size -= sizeof(version);
203203
}
204204
{
205-
// read lod_level, we don't use it
205+
// read legacy_lod_level, we don't use it
206206
// this has to be zero, otherwise not support
207-
uint64_t lod_level;
208-
std::memcpy(&lod_level, read_pointer, sizeof(lod_level));
209-
read_pointer += sizeof(lod_level);
210-
params_size -= sizeof(lod_level);
211-
if (lod_level != 0) {
212-
P2OLogger() << "Only supports weight with lod_level = 0." << std::endl;
207+
uint64_t legacy_lod_level;
208+
std::memcpy(&legacy_lod_level, read_pointer, sizeof(legacy_lod_level));
209+
read_pointer += sizeof(legacy_lod_level);
210+
params_size -= sizeof(legacy_lod_level);
211+
if (legacy_lod_level != 0) {
212+
P2OLogger() << "Only supports weight with legacy_lod_level = 0." << std::endl;
213213
return false;
214214
}
215215
}
@@ -280,13 +280,13 @@ bool PaddleParser::LoadParams(const std::string& path) {
280280
is.read(reinterpret_cast<char*>(&version), sizeof(version));
281281
}
282282
{
283-
// read lod_level, we don't use it
283+
// read legacy_lod_level, we don't use it
284284
// this has to be zero, otherwise not support
285-
uint64_t lod_level;
286-
read_size += sizeof(lod_level);
287-
is.read(reinterpret_cast<char*>(&lod_level), sizeof(lod_level));
288-
Assert(lod_level == 0,
289-
"Paddle2ONNX: Only support weight with lod_level = 0.");
285+
uint64_t legacy_lod_level;
286+
read_size += sizeof(legacy_lod_level);
287+
is.read(reinterpret_cast<char*>(&legacy_lod_level), sizeof(legacy_lod_level));
288+
Assert(legacy_lod_level == 0,
289+
"Paddle2ONNX: Only support weight with legacy_lod_level = 0.");
290290
}
291291
{
292292
// Another version, we don't use it

paddle2onnx/proto/p2o_paddle.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ message VarType {
196196

197197
message DenseTensorDesc {
198198
required TensorDesc tensor = 1;
199-
optional int32 lod_level = 2 [ default = 0 ];
199+
optional int32 legacy_lod_level = 2 [ default = 0 ];
200200
}
201201
optional DenseTensorDesc dense_tensor = 3;
202202

203203
message DenseTensorArrayDesc {
204204
required TensorDesc tensor = 1;
205-
optional int32 lod_level = 2 [ default = 0 ];
205+
optional int32 legacy_lod_level = 2 [ default = 0 ];
206206
}
207207
optional DenseTensorArrayDesc tensor_array = 4;
208208

0 commit comments

Comments
 (0)