Skip to content

Commit 9f435a9

Browse files
fix: rebase conflict
1 parent a8d95a8 commit 9f435a9

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,6 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
8484
addFunctions(JSI_EXPORT_FUNCTION(
8585
ModelHostObject<Model>, synchronousHostFunction<&Model::streamStop>,
8686
"streamStop"));
87-
88-
addFunctions(JSI_EXPORT_FUNCTION(
89-
ModelHostObject<Model>,
90-
promiseHostFunction<&Model::generateFromPhonemes>,
91-
"generateFromPhonemes"));
92-
93-
addFunctions(JSI_EXPORT_FUNCTION(
94-
ModelHostObject<Model>,
95-
promiseHostFunction<&Model::streamFromPhonemes>,
96-
"streamFromPhonemes"));
9787
}
9888

9989
if constexpr (meta::SameAs<Model, TokenizerModule>) {
@@ -181,6 +171,18 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
181171
addFunctions(JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
182172
promiseHostFunction<&Model::stream>,
183173
"stream"));
174+
addFunctions(JSI_EXPORT_FUNCTION(
175+
ModelHostObject<Model>, synchronousHostFunction<&Model::streamStop>,
176+
"streamStop"));
177+
addFunctions(
178+
JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
179+
promiseHostFunction<&Model::generateFromPhonemes>,
180+
"generateFromPhonemes"));
181+
182+
addFunctions(
183+
JSI_EXPORT_FUNCTION(ModelHostObject<Model>,
184+
promiseHostFunction<&Model::streamFromPhonemes>,
185+
"streamFromPhonemes"));
184186
}
185187

186188
if constexpr (meta::HasGenerateFromString<Model>) {

0 commit comments

Comments
 (0)