Skip to content

Commit ce602ca

Browse files
bstrzelebstrzele
authored
Updated CAPI calls (#2012)
1 parent 04ffe4a commit ce602ca

File tree

12 files changed

+170
-170
lines changed

12 files changed

+170
-170
lines changed

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ http_archive(
8989
git_repository(
9090
name = "mediapipe",
9191
remote = "https://github.com/openvinotoolkit/mediapipe",
92-
commit = "c839182d40daae7270a29feba5bedd6330ccc2f8", # Cleanup and switch to tflite object detection (#16)
92+
commit = "ac9ff003cd735f96a2e5501e32b2c941f6d4543d", # Updated CAPI calls (#21)
9393
)
9494

9595
# DEV mediapipe 1 source - adjust local repository path for build

‎src/capi_frontend/capi.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ OVMS_Status* OVMS_ServerReady(OVMS_Server* serverPtr, bool* isReady) {
110110
*isReady = server.isReady();
111111
return nullptr;
112112
}
113-
OVMS_Status* OVMS_StatusGetCode(OVMS_Status* status,
113+
OVMS_Status* OVMS_StatusCode(OVMS_Status* status,
114114
uint32_t* code) {
115115
if (status == nullptr)
116116
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "status"));
@@ -121,7 +121,7 @@ OVMS_Status* OVMS_StatusGetCode(OVMS_Status* status,
121121
return nullptr;
122122
}
123123

124-
OVMS_Status* OVMS_StatusGetDetails(OVMS_Status* status,
124+
OVMS_Status* OVMS_StatusDetails(OVMS_Status* status,
125125
const char** details) {
126126
if (status == nullptr)
127127
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "status"));
@@ -181,7 +181,7 @@ void OVMS_ServerDelete(OVMS_Server* server) {
181181
// delete passed in ptr once multi server configuration is done
182182
}
183183

184-
OVMS_Status* OVMS_GetMetadataFieldByPointer(OVMS_Metadata* metadata, const char* pointer, const char** value, size_t* size) {
184+
OVMS_Status* OVMS_MetadataFieldByPointer(OVMS_Metadata* metadata, const char* pointer, const char** value, size_t* size) {
185185
if (metadata == nullptr) {
186186
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "metadata"));
187187
}
@@ -226,7 +226,7 @@ OVMS_Status* OVMS_SerializeMetadataToString(OVMS_Metadata* metadata, const char*
226226
return nullptr;
227227
}
228228

229-
OVMS_Status* OVMS_GetServerMetadata(OVMS_Server* server, OVMS_Metadata** metadata) {
229+
OVMS_Status* OVMS_ServerMetadata(OVMS_Server* server, OVMS_Metadata** metadata) {
230230
if (server == nullptr) {
231231
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "server"));
232232
}
@@ -612,7 +612,7 @@ OVMS_Status* OVMS_InferenceRequestInputRemoveData(OVMS_InferenceRequest* req, co
612612
return nullptr;
613613
}
614614

615-
OVMS_Status* OVMS_InferenceResponseGetOutput(OVMS_InferenceResponse* res, uint32_t id, const char** name, OVMS_DataType* datatype, const int64_t** shape, size_t* dimCount, const void** data, size_t* bytesize, OVMS_BufferType* bufferType, uint32_t* deviceId) {
615+
OVMS_Status* OVMS_InferenceResponseOutput(OVMS_InferenceResponse* res, uint32_t id, const char** name, OVMS_DataType* datatype, const int64_t** shape, size_t* dimCount, const void** data, size_t* bytesize, OVMS_BufferType* bufferType, uint32_t* deviceId) {
616616
if (res == nullptr) {
617617
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "inference response"));
618618
}
@@ -688,7 +688,7 @@ OVMS_Status* OVMS_InferenceResponseGetOutput(OVMS_InferenceResponse* res, uint32
688688
return nullptr;
689689
}
690690

691-
OVMS_Status* OVMS_InferenceResponseGetOutputCount(OVMS_InferenceResponse* res, uint32_t* count) {
691+
OVMS_Status* OVMS_InferenceResponseOutputCount(OVMS_InferenceResponse* res, uint32_t* count) {
692692
if (res == nullptr) {
693693
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "inference response"));
694694
}
@@ -700,7 +700,7 @@ OVMS_Status* OVMS_InferenceResponseGetOutputCount(OVMS_InferenceResponse* res, u
700700
return nullptr;
701701
}
702702

703-
OVMS_Status* OVMS_InferenceResponseGetParameterCount(OVMS_InferenceResponse* res, uint32_t* count) {
703+
OVMS_Status* OVMS_InferenceResponseParameterCount(OVMS_InferenceResponse* res, uint32_t* count) {
704704
if (res == nullptr) {
705705
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "inference response"));
706706
}
@@ -712,7 +712,7 @@ OVMS_Status* OVMS_InferenceResponseGetParameterCount(OVMS_InferenceResponse* res
712712
return nullptr;
713713
}
714714

715-
OVMS_Status* OVMS_InferenceResponseGetParameter(OVMS_InferenceResponse* res, uint32_t id, OVMS_DataType* datatype, const void** data) {
715+
OVMS_Status* OVMS_InferenceResponseParameter(OVMS_InferenceResponse* res, uint32_t id, OVMS_DataType* datatype, const void** data) {
716716
if (res == nullptr) {
717717
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "inference response"));
718718
}
@@ -959,7 +959,7 @@ OVMS_Status* OVMS_GetServableMetadata(OVMS_Server* serverPtr, const char* servab
959959
return nullptr;
960960
}
961961

962-
OVMS_Status* OVMS_ServableMetadataGetInputCount(OVMS_ServableMetadata* servableMetadata, uint32_t* count) {
962+
OVMS_Status* OVMS_ServableMetadataInputCount(OVMS_ServableMetadata* servableMetadata, uint32_t* count) {
963963
if (servableMetadata == nullptr) {
964964
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "servable metadata"));
965965
}
@@ -971,7 +971,7 @@ OVMS_Status* OVMS_ServableMetadataGetInputCount(OVMS_ServableMetadata* servableM
971971
return nullptr;
972972
}
973973

974-
OVMS_Status* OVMS_ServableMetadataGetOutputCount(OVMS_ServableMetadata* servableMetadata, uint32_t* count) {
974+
OVMS_Status* OVMS_ServableMetadataOutputCount(OVMS_ServableMetadata* servableMetadata, uint32_t* count) {
975975
if (servableMetadata == nullptr) {
976976
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "servable metadata"));
977977
}
@@ -982,7 +982,7 @@ OVMS_Status* OVMS_ServableMetadataGetOutputCount(OVMS_ServableMetadata* servable
982982
*count = metadata->getOutputsInfo().size();
983983
return nullptr;
984984
}
985-
OVMS_Status* OVMS_ServableMetadataGetInput(OVMS_ServableMetadata* servableMetadata, uint32_t id, const char** name, OVMS_DataType* datatype, size_t* dimCount, int64_t** shapeMin, int64_t** shapeMax) {
985+
OVMS_Status* OVMS_ServableMetadataInput(OVMS_ServableMetadata* servableMetadata, uint32_t id, const char** name, OVMS_DataType* datatype, size_t* dimCount, int64_t** shapeMin, int64_t** shapeMax) {
986986
if (servableMetadata == nullptr) {
987987
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "servable metadata"));
988988
}
@@ -1040,7 +1040,7 @@ OVMS_Status* OVMS_ServableMetadataGetInput(OVMS_ServableMetadata* servableMetada
10401040
return nullptr;
10411041
}
10421042

1043-
OVMS_Status* OVMS_ServableMetadataGetOutput(OVMS_ServableMetadata* servableMetadata, uint32_t id, const char** name, OVMS_DataType* datatype, size_t* dimCount, int64_t** shapeMin, int64_t** shapeMax) {
1043+
OVMS_Status* OVMS_ServableMetadataOutput(OVMS_ServableMetadata* servableMetadata, uint32_t id, const char** name, OVMS_DataType* datatype, size_t* dimCount, int64_t** shapeMin, int64_t** shapeMax) {
10441044
if (servableMetadata == nullptr) {
10451045
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "servable metadata"));
10461046
}
@@ -1098,7 +1098,7 @@ OVMS_Status* OVMS_ServableMetadataGetOutput(OVMS_ServableMetadata* servableMetad
10981098
return nullptr;
10991099
}
11001100

1101-
OVMS_Status* OVMS_ServableMetadataGetInfo(OVMS_ServableMetadata* servableMetadata, const void** info) {
1101+
OVMS_Status* OVMS_ServableMetadataInfo(OVMS_ServableMetadata* servableMetadata, const void** info) {
11021102
if (servableMetadata == nullptr) {
11031103
return reinterpret_cast<OVMS_Status*>(new Status(StatusCode::NONEXISTENT_PTR, "servable metadata"));
11041104
}

‎src/main_benchmark.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ int main(int argc, char** argv) {
262262
if (res) {
263263
uint32_t code = 0;
264264
const char* details = nullptr;
265-
OVMS_StatusGetCode(res, &code);
266-
OVMS_StatusGetDetails(res, &details);
265+
OVMS_StatusCode(res, &code);
266+
OVMS_StatusDetails(res, &details);
267267
std::cout << "Error starting the server. Code:" << code
268268
<< "; details:" << details << std::endl;
269269
OVMS_ServerDelete(srv);
@@ -327,8 +327,8 @@ int main(int argc, char** argv) {
327327
if (res != nullptr) {
328328
uint32_t code = 0;
329329
const char* details = 0;
330-
OVMS_StatusGetCode(res, &code);
331-
OVMS_StatusGetDetails(res, &details);
330+
OVMS_StatusCode(res, &code);
331+
OVMS_StatusDetails(res, &details);
332332
std::cerr << "Error occured during inference. Code:" << code
333333
<< ", details:" << details << std::endl;
334334
OVMS_StatusDelete(res);

‎src/main_capi.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ int main() {
4444
uint32_t code = 0;
4545
const char* details = 0;
4646

47-
OVMS_StatusGetCode(res, &code);
48-
OVMS_StatusGetDetails(res, &details);
47+
OVMS_StatusCode(res, &code);
48+
OVMS_StatusDetails(res, &details);
4949

5050
fprintf(stderr, "error during start: code %d, details: %s\n", code, details);
5151

@@ -82,8 +82,8 @@ int main() {
8282
uint32_t code = 0;
8383
const char* details = 0;
8484

85-
OVMS_StatusGetCode(res, &code);
86-
OVMS_StatusGetDetails(res, &details);
85+
OVMS_StatusCode(res, &code);
86+
OVMS_StatusDetails(res, &details);
8787

8888
fprintf(stderr, "error during inference: code %d, details: %s\n", code, details);
8989

@@ -98,14 +98,14 @@ int main() {
9898
}
9999

100100
const char* oName = NULL; // not needed
101-
OVMS_DataType oType; // not needed
102-
const int64_t* oShape; // not needed
103-
size_t oDims; // not needed
101+
OVMS_DataType oType; // not needed
102+
const int64_t* oShape; // not needed
103+
size_t oDims; // not needed
104104
const void* oData = NULL;
105105
size_t oNumBytes = 0;
106106
OVMS_BufferType oBuffType; // not needed
107-
uint32_t oDeviceId; // not needed
108-
OVMS_InferenceResponseGetOutput(response, 0, &oName, &oType, &oShape, &oDims, &oData, &oNumBytes, &oBuffType, &oDeviceId);
107+
uint32_t oDeviceId; // not needed
108+
OVMS_InferenceResponseOutput(response, 0, &oName, &oType, &oShape, &oDims, &oData, &oNumBytes, &oBuffType, &oDeviceId);
109109

110110
float expectedOutput[DATA_SIZE];
111111
for (int i = 0; i < NUM_ELEMENTS; i++) {

‎src/main_capi.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ int main(int argc, char** argv) {
8686
OVMS_ServerNew(&srv);
8787

8888
OVMS_Metadata* metadata = 0;
89-
OVMS_GetServerMetadata(srv, &metadata);
89+
OVMS_ServerMetadata(srv, &metadata);
9090
const char* version = 0;
9191
size_t size;
92-
OVMS_GetMetadataFieldByPointer(metadata, "/version", &version, &size);
92+
OVMS_MetadataFieldByPointer(metadata, "/version", &version, &size);
9393
std::cout << "OVMS Version: " << version << std::endl;
9494
OVMS_StringFree(version);
9595

@@ -105,8 +105,8 @@ int main(int argc, char** argv) {
105105
uint32_t code = 0;
106106
const char* details = nullptr;
107107

108-
OVMS_StatusGetCode(res, &code);
109-
OVMS_StatusGetDetails(res, &details);
108+
OVMS_StatusCode(res, &code);
109+
OVMS_StatusDetails(res, &details);
110110
std::cerr << "error during start: code:" << code << "; details:" << details << std::endl;
111111

112112
OVMS_StatusDelete(res);
@@ -132,8 +132,8 @@ int main(int argc, char** argv) {
132132
if (res != nullptr) {
133133
uint32_t code = 0;
134134
const char* details = 0;
135-
OVMS_StatusGetCode(res, &code);
136-
OVMS_StatusGetDetails(res, &details);
135+
OVMS_StatusCode(res, &code);
136+
OVMS_StatusDetails(res, &details);
137137
std::cout << "Error occured during inference. Code:" << code
138138
<< ", details:" << details << std::endl;
139139
OVMS_StatusDelete(res);
@@ -145,7 +145,7 @@ int main(int argc, char** argv) {
145145
}
146146
// read output
147147
uint32_t outputCount = 0;
148-
OVMS_InferenceResponseGetOutputCount(response, &outputCount);
148+
OVMS_InferenceResponseOutputCount(response, &outputCount);
149149
const void* voutputData;
150150
size_t bytesize = 0;
151151
uint32_t outputId = outputCount - 1;
@@ -155,7 +155,7 @@ int main(int argc, char** argv) {
155155
OVMS_BufferType bufferType = (OVMS_BufferType)42;
156156
uint32_t deviceId = 42;
157157
const char* outputName{nullptr};
158-
OVMS_InferenceResponseGetOutput(response, outputId, &outputName, &datatype, &shape, &dimCount, &voutputData, &bytesize, &bufferType, &deviceId);
158+
OVMS_InferenceResponseOutput(response, outputId, &outputName, &datatype, &shape, &dimCount, &voutputData, &bytesize, &bufferType, &deviceId);
159159

160160
std::stringstream ss;
161161
ss << "Got response from OVMS via C-API. "

‎src/mediapipe_calculators/modelapiovmsinferencecalculator.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ namespace {
4343
if (err != nullptr) { \
4444
uint32_t code = 0; \
4545
const char* msg = nullptr; \
46-
OVMS_StatusGetCode(err, &code); \
47-
OVMS_StatusGetDetails(err, &msg); \
46+
OVMS_StatusCode(err, &code); \
47+
OVMS_StatusDetails(err, &msg); \
4848
LOG(INFO) << "Error encountred in OVMSCalculator:" << msg << " code: " << code; \
4949
OVMS_StatusDelete(err); \
5050
RET_CHECK(err == nullptr); \
@@ -127,7 +127,7 @@ class ModelAPISideFeedCalculator : public CalculatorBase {
127127
// TODO decide which will be easier to migrating later
128128
// using OV tensor by default will be more performant
129129
// but harder to migrate
130-
/*
130+
/*
131131
cc->Outputs().Tag(tag).Set<tensorflow::Tensor>();
132132
*/
133133
LOG(INFO) << "setting output tag:" << tag << " to OVTensor";

‎src/mediapipe_calculators/ovms_calculator.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ namespace {
4040
if (err != nullptr) { \
4141
uint32_t code = 0; \
4242
const char* msg = nullptr; \
43-
OVMS_StatusGetCode(err, &code); \
44-
OVMS_StatusGetDetails(err, &msg); \
43+
OVMS_StatusCode(err, &code); \
44+
OVMS_StatusDetails(err, &msg); \
4545
LOG(INFO) << "Error encountred in OVMSCalculator:" << msg << " code: " << code; \
4646
OVMS_StatusDelete(err); \
4747
RET_CHECK(err == nullptr); \
@@ -254,10 +254,10 @@ class OVMSOVCalculator : public CalculatorBase {
254254
CREATE_GUARD(responseGuard, OVMS_InferenceResponse, response);
255255
// verify GetOutputCount
256256
uint32_t outputCount = 42;
257-
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseGetOutputCount(response, &outputCount));
257+
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseOutputCount(response, &outputCount));
258258
RET_CHECK(outputCount == cc->Outputs().GetTags().size());
259259
uint32_t parameterCount = 42;
260-
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseGetParameterCount(response, &parameterCount));
260+
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseParameterCount(response, &parameterCount));
261261
// TODO handle output filtering. Graph definition could suggest
262262
// that we are not interested in all outputs from OVMS Inference
263263
const void* voutputData;
@@ -269,7 +269,7 @@ class OVMSOVCalculator : public CalculatorBase {
269269
uint32_t deviceId = 42;
270270
const char* outputName{nullptr};
271271
for (size_t i = 0; i < outputCount; ++i) {
272-
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseGetOutput(response, i, &outputName, &datatype, &shape, &dimCount, &voutputData, &bytesize, &bufferType, &deviceId));
272+
ASSERT_CAPI_STATUS_NULL(OVMS_InferenceResponseOutput(response, i, &outputName, &datatype, &shape, &dimCount, &voutputData, &bytesize, &bufferType, &deviceId));
273273
ov::Tensor* outOvTensor = makeOvTensor(datatype, shape, dimCount, voutputData, bytesize);
274274
cc->Outputs().Tag(outputNameToTag.at(outputName)).Add(outOvTensor, cc->InputTimestamp());
275275
}

0 commit comments

Comments
 (0)