Skip to content

Commit 0930c72

Browse files
MasterJH5574MasterJH5574
authored
[C++] Update TVM_FFI_STATIC_INIT_BLOCK to fn style (#3338)
Following apache/tvm#18312, this PR updates the `TVM_FFI_STATIC_INIT_BLOCK` to functional style.
1 parent 07a4c3f commit 0930c72

File tree

13 files changed

+35
-35
lines changed

13 files changed

+35
-35
lines changed

‎3rdparty/tvm‎

Submodule tvm updated 558 files

‎cpp/json_ffi/json_ffi_engine.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ class JSONFFIEngineImpl : public JSONFFIEngine, public ffi::ModuleObj {
296296
}
297297
};
298298

299-
TVM_FFI_STATIC_INIT_BLOCK({
299+
TVM_FFI_STATIC_INIT_BLOCK() {
300300
namespace refl = tvm::ffi::reflection;
301301
refl::GlobalDef().def("mlc.json_ffi.CreateJSONFFIEngine",
302302
[]() { return ffi::Module(tvm::ffi::make_object<JSONFFIEngineImpl>()); });
303-
});
303+
}
304304

305305
} // namespace json_ffi
306306
} // namespace llm

‎cpp/multi_gpu/builtin.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ ObjectRef SendFromLastGroupToWorker0(Tensor send, Optional<Tensor> recv, Shape s
8686
return recv;
8787
}
8888

89-
TVM_FFI_STATIC_INIT_BLOCK({
89+
TVM_FFI_STATIC_INIT_BLOCK() {
9090
namespace refl = tvm::ffi::reflection;
9191
refl::GlobalDef()
9292
.def("mlc.multi_gpu.DispatchFunctionByGroup", DispatchFunctionByGroup)
9393
.def("mlc.multi_gpu.SendFromLastGroupToWorker0", SendFromLastGroupToWorker0);
94-
});
94+
}
9595

9696
} // namespace multi_gpu
9797
} // namespace llm

‎cpp/multi_gpu/multi_gpu_loader.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ Array<Optional<Tensor>> LoadMultiGPUPresharded(const std::string& model_path, Mo
312312
return params;
313313
}
314314

315-
TVM_FFI_STATIC_INIT_BLOCK({
315+
TVM_FFI_STATIC_INIT_BLOCK() {
316316
namespace refl = tvm::ffi::reflection;
317317
refl::GlobalDef()
318318
.def("mlc.multi_gpu.LoadMultiGPU", LoadMultiGPU)
319319
.def("mlc.multi_gpu.LoadMultiGPUPresharded", LoadMultiGPUPresharded);
320-
});
320+
}
321321

322322
} // namespace multi_gpu
323323
} // namespace llm

‎cpp/serve/data.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ ObjectRef TextDataNode::GetEmbedding(Model model, ObjectRef* dst, int offset) co
7272
"Please tokenize the text and construct a TokenData object.";
7373
}
7474

75-
TVM_FFI_STATIC_INIT_BLOCK({
75+
TVM_FFI_STATIC_INIT_BLOCK() {
7676
namespace refl = tvm::ffi::reflection;
7777
refl::GlobalDef()
7878
.def("mlc.serve.TextData", [](String text) { return TextData(std::move(text)); })
7979
.def("mlc.serve.TextDataGetTextString", [](TextData data) { return data->text; });
80-
});
80+
}
8181

8282
/****************** TokenData ******************/
8383

@@ -99,7 +99,7 @@ ObjectRef TokenDataNode::GetEmbedding(Model model, ObjectRef* dst, int offset) c
9999
return model->TokenEmbed(token_ids, dst, offset);
100100
}
101101

102-
TVM_FFI_STATIC_INIT_BLOCK({
102+
TVM_FFI_STATIC_INIT_BLOCK() {
103103
namespace refl = tvm::ffi::reflection;
104104
refl::GlobalDef()
105105
.def_packed("mlc.serve.TokenData",
@@ -112,7 +112,7 @@ TVM_FFI_STATIC_INIT_BLOCK({
112112
*rv = TokenData(std::move(token_ids));
113113
})
114114
.def("mlc.serve.TokenDataGetTokenIds", [](TokenData data) { return data->token_ids; });
115-
});
115+
}
116116

117117
/****************** ImageData ******************/
118118

@@ -129,13 +129,13 @@ ObjectRef ImageDataNode::GetEmbedding(Model model, ObjectRef* dst, int offset) c
129129
return model->ImageEmbed(image, dst, offset);
130130
}
131131

132-
TVM_FFI_STATIC_INIT_BLOCK({
132+
TVM_FFI_STATIC_INIT_BLOCK() {
133133
namespace refl = tvm::ffi::reflection;
134134
refl::GlobalDef()
135135
.def("mlc.serve.ImageData",
136136
[](Tensor image, int embed_size) { return ImageData(std::move(image), embed_size); })
137137
.def("mlc.serve.ImageDataGetImage", [](ImageData data) { return data->image; });
138-
});
138+
}
139139

140140
/****************** SampleResult ******************/
141141

@@ -223,7 +223,7 @@ RequestStreamOutput RequestStreamOutput::Usage(String request_id,
223223
return RequestStreamOutput(n);
224224
}
225225

226-
TVM_FFI_STATIC_INIT_BLOCK({
226+
TVM_FFI_STATIC_INIT_BLOCK() {
227227
namespace refl = tvm::ffi::reflection;
228228
refl::GlobalDef().def("mlc.serve.RequestStreamOutputUnpack", [](RequestStreamOutput output) {
229229
CHECK(!output->unpacked) << "One RequestStreamOutput can be unpacked for at most once.";
@@ -250,7 +250,7 @@ TVM_FFI_STATIC_INIT_BLOCK({
250250
output->unpacked = true;
251251
return ret;
252252
});
253-
});
253+
}
254254

255255
} // namespace serve
256256
} // namespace llm

‎cpp/serve/engine.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,10 +1087,10 @@ class EngineModule : public ffi::ModuleObj {
10871087
GenerationConfig default_generation_config_;
10881088
};
10891089

1090-
TVM_FFI_STATIC_INIT_BLOCK({
1090+
TVM_FFI_STATIC_INIT_BLOCK() {
10911091
namespace refl = tvm::ffi::reflection;
10921092
refl::GlobalDef().def("mlc.serve.create_engine", EngineModule::Create);
1093-
});
1093+
}
10941094

10951095
} // namespace serve
10961096
} // namespace llm

‎cpp/serve/event_trace_recorder.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ EventTraceRecorder EventTraceRecorder::Create() {
147147
return EventTraceRecorder(tvm::ffi::make_object<EventTraceRecorderImpl>());
148148
}
149149

150-
TVM_FFI_STATIC_INIT_BLOCK({
150+
TVM_FFI_STATIC_INIT_BLOCK() {
151151
namespace refl = tvm::ffi::reflection;
152152
refl::GlobalDef()
153153
.def("mlc.serve.EventTraceRecorder", []() { return EventTraceRecorder::Create(); })
154154
.def("mlc.serve.EventTraceRecorderAddEvent",
155155
[](const EventTraceRecorder& trace_recorder, const String& request_id,
156156
const std::string& event) { trace_recorder->AddEvent(request_id, event); })
157157
.def_method("mlc.serve.EventTraceRecorderDumpJSON", &EventTraceRecorderObj::DumpJSON);
158-
});
158+
}
159159

160160
} // namespace serve
161161
} // namespace llm

‎cpp/serve/model.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ class ModelImpl : public ModelObj {
11141114
std::unordered_set<int64_t> prefilled_seq_ids_;
11151115
};
11161116

1117-
TVM_FFI_STATIC_INIT_BLOCK({
1117+
TVM_FFI_STATIC_INIT_BLOCK() {
11181118
namespace refl = tvm::ffi::reflection;
11191119
refl::GlobalDef().def(
11201120
"mlc.copy_embedding_to_offset", [](Tensor embedding, Tensor dst, int offset) {
@@ -1132,7 +1132,7 @@ TVM_FFI_STATIC_INIT_BLOCK({
11321132
((embedding->dtype.bits * embedding->dtype.lanes + 7) / 8);
11331133
Tensor::CopyFromTo(&copy_src, &copy_dst);
11341134
});
1135-
});
1135+
}
11361136

11371137
} // namespace serve
11381138
} // namespace llm

‎cpp/serve/radix_tree.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ PagedRadixTree PagedRadixTree::Create() {
800800
return PagedRadixTree(tvm::ffi::make_object<PagedRadixTreeImpl>());
801801
}
802802

803-
TVM_FFI_STATIC_INIT_BLOCK({
803+
TVM_FFI_STATIC_INIT_BLOCK() {
804804
namespace refl = tvm::ffi::reflection;
805805
refl::GlobalDef()
806806
.def("mlc.serve.PagedRadixTree", []() { return PagedRadixTree::Create(); })
@@ -836,7 +836,7 @@ TVM_FFI_STATIC_INIT_BLOCK({
836836
.def("mlc.serve.PagedRadixTreeFreeCapacity", [](PagedRadixTree paged_radix_tree) {
837837
return static_cast<int64_t>(paged_radix_tree->FreeCapacity());
838838
});
839-
});
839+
}
840840

841841
} // namespace serve
842842
} // namespace llm

‎cpp/serve/request.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ Request Request::FromUntokenized(const Request& request, const Tokenizer& tokeni
6666
}
6767
}
6868

69-
TVM_FFI_STATIC_INIT_BLOCK({
69+
TVM_FFI_STATIC_INIT_BLOCK() {
7070
namespace refl = tvm::ffi::reflection;
7171
refl::GlobalDef()
7272
.def("mlc.serve.RequestGetInputs", [](Request request) { return request->inputs; })
7373
.def("mlc.serve.RequestGetGenerationConfigJSON", [](Request request) {
7474
return picojson::value(request->generation_cfg->AsJSON()).serialize();
7575
});
76-
});
76+
}
7777

7878
} // namespace serve
7979
} // namespace llm

0 commit comments

Comments
 (0)