Skip to content

Commit 00d2421

Browse files
yzhou-bcomyzhou-bcom
committed
Update grpc files following modifs on reloc pipeline api name
1 parent e84ea75 commit 00d2421

9 files changed

+776
-775
lines changed

‎gen/interfaces/IRelocalizationPipeline_grpcProxy.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class IRelocalizationPipeline_grpcProxy: public org::bcom::xpcf::ConfigurableBa
2929
SolAR::FrameworkReturnCode setCameraParameters(SolAR::datastructure::CameraParameters const& cameraParams) override;
3030
SolAR::FrameworkReturnCode getCameraParameters(SolAR::datastructure::CameraParameters& cameraParams) const override;
3131
SolAR::FrameworkReturnCode relocalizeProcessRequest(SRef<SolAR::datastructure::Image> const image, SolAR::datastructure::Transform3Df& pose, float_t& confidence, SolAR::datastructure::Transform3Df const& poseCoarse) override;
32-
SolAR::FrameworkReturnCode relocalizeProcessRequestViz(SRef<SolAR::datastructure::Image> const image, std::vector<SRef<SolAR::datastructure::CloudPoint>>& currPointCloud, SolAR::datastructure::Transform3Df& pose, float_t& confidence, SolAR::datastructure::Transform3Df const& poseCoarse) override;
32+
SolAR::FrameworkReturnCode relocalizeProcessRequest(SRef<SolAR::datastructure::Image> const image, std::vector<SRef<SolAR::datastructure::CloudPoint>>& currPointCloud, SolAR::datastructure::Transform3Df& pose, float_t& confidence, SolAR::datastructure::Transform3Df const& poseCoarse) override;
3333
SolAR::FrameworkReturnCode relocalizeProcessRequest(SRef<SolAR::datastructure::Image> const image, SolAR::datastructure::Transform3Df& pose, float_t& confidence, std::vector<SolAR::datastructure::DetectedObject>& detectedObjects, SolAR::datastructure::Transform3Df const& poseCoarse) override;
3434
SolAR::FrameworkReturnCode getMapRequest(SRef<SolAR::datastructure::Map>& map) const override;
3535

‎gen/interfaces/IRelocalizationPipeline_grpcServer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class IRelocalizationPipeline_grpcServer: public org::bcom::xpcf::ConfigurableB
3232
::grpc::Status setCameraParameters(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::setCameraParametersRequest* request, ::grpcIRelocalizationPipeline::setCameraParametersResponse* response) override;
3333
::grpc::Status getCameraParameters(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::getCameraParametersRequest* request, ::grpcIRelocalizationPipeline::getCameraParametersResponse* response) override;
3434
::grpc::Status relocalizeProcessRequest_grpc0(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc0Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc0Response* response) override;
35-
::grpc::Status relocalizeProcessRequestViz(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequestVizRequest* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequestVizResponse* response) override;
3635
::grpc::Status relocalizeProcessRequest_grpc1(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Response* response) override;
36+
::grpc::Status relocalizeProcessRequest_grpc2(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Response* response) override;
3737
::grpc::Status getMapRequest(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::getMapRequestRequest* request, ::grpcIRelocalizationPipeline::getMapRequestResponse* response) override;
3838

3939
SRef<SolAR::api::pipeline::IRelocalizationPipeline> m_xpcfComponent;

‎gen/interfaces/grpcIRelocalizationPipelineService.grpc.pb.h

+106-106
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gen/interfaces/grpcIRelocalizationPipelineService.pb.h

+368-368
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gen/proto/grpcIRelocalizationPipelineService.proto

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bytes confidence = 2;
8484
sint32 xpcfGrpcReturnValue = 3;
8585
}
8686

87-
message relocalizeProcessRequestVizRequest
87+
message relocalizeProcessRequest_grpc1Request
8888
{
8989
int32 grpcServerCompressionFormat = 1;
9090
bytes image = 2;
@@ -94,15 +94,15 @@ bytes pose = 5;
9494
bytes confidence = 6;
9595
}
9696

97-
message relocalizeProcessRequestVizResponse
97+
message relocalizeProcessRequest_grpc1Response
9898
{
9999
bytes currPointCloud = 1;
100100
bytes pose = 2;
101101
bytes confidence = 3;
102102
sint32 xpcfGrpcReturnValue = 4;
103103
}
104104

105-
message relocalizeProcessRequest_grpc1Request
105+
message relocalizeProcessRequest_grpc2Request
106106
{
107107
int32 grpcServerCompressionFormat = 1;
108108
bytes image = 2;
@@ -112,7 +112,7 @@ bytes confidence = 5;
112112
bytes detectedObjects = 6;
113113
}
114114

115-
message relocalizeProcessRequest_grpc1Response
115+
message relocalizeProcessRequest_grpc2Response
116116
{
117117
bytes pose = 1;
118118
bytes confidence = 2;
@@ -140,8 +140,8 @@ rpc init_grpc1(init_grpc1Request) returns(init_grpc1Response) {}
140140
rpc setCameraParameters(setCameraParametersRequest) returns(setCameraParametersResponse) {}
141141
rpc getCameraParameters(getCameraParametersRequest) returns(getCameraParametersResponse) {}
142142
rpc relocalizeProcessRequest_grpc0(relocalizeProcessRequest_grpc0Request) returns(relocalizeProcessRequest_grpc0Response) {}
143-
rpc relocalizeProcessRequestViz(relocalizeProcessRequestVizRequest) returns(relocalizeProcessRequestVizResponse) {}
144143
rpc relocalizeProcessRequest_grpc1(relocalizeProcessRequest_grpc1Request) returns(relocalizeProcessRequest_grpc1Response) {}
144+
rpc relocalizeProcessRequest_grpc2(relocalizeProcessRequest_grpc2Request) returns(relocalizeProcessRequest_grpc2Response) {}
145145
rpc getMapRequest(getMapRequestRequest) returns(getMapRequestResponse) {}
146146
}
147147

‎gen/src/IRelocalizationPipeline_grpcProxy.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,13 @@ SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcess
260260
}
261261

262262

263-
SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcessRequestViz(SRef<SolAR::datastructure::Image> const image, std::vector<SRef<SolAR::datastructure::CloudPoint>>& currPointCloud, SolAR::datastructure::Transform3Df& pose, float_t& confidence, SolAR::datastructure::Transform3Df const& poseCoarse)
263+
SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest(SRef<SolAR::datastructure::Image> const image, std::vector<SRef<SolAR::datastructure::CloudPoint>>& currPointCloud, SolAR::datastructure::Transform3Df& pose, float_t& confidence, SolAR::datastructure::Transform3Df const& poseCoarse)
264264
{
265265
::grpc::ClientContext context;
266-
::grpcIRelocalizationPipeline::relocalizeProcessRequestVizRequest reqIn;
267-
::grpcIRelocalizationPipeline::relocalizeProcessRequestVizResponse respOut;
266+
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Request reqIn;
267+
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Response respOut;
268268
#ifndef DISABLE_GRPC_COMPRESSION
269-
xpcf::grpcCompressionInfos proxyCompressionInfo = xpcf::deduceClientCompressionInfo(m_serviceCompressionInfos, "relocalizeProcessRequestViz", m_methodCompressionInfosMap);
269+
xpcf::grpcCompressionInfos proxyCompressionInfo = xpcf::deduceClientCompressionInfo(m_serviceCompressionInfos, "relocalizeProcessRequest", m_methodCompressionInfosMap);
270270
xpcf::grpcCompressType serverCompressionType = xpcf::prepareClientCompressionContext(context, proxyCompressionInfo);
271271
reqIn.set_grpcservercompressionformat (static_cast<int32_t>(serverCompressionType));
272272
#endif
@@ -277,17 +277,17 @@ SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcess
277277
reqIn.set_confidence(xpcf::serialize<float_t>(confidence));
278278
#ifdef ENABLE_PROXY_TIMERS
279279
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
280-
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequestViz request sent at " << to_simple_string(start) << std::endl;
280+
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest request sent at " << to_simple_string(start) << std::endl;
281281
#endif
282-
::grpc::Status grpcRemoteStatus = m_grpcStub->relocalizeProcessRequestViz(&context, reqIn, &respOut);
282+
::grpc::Status grpcRemoteStatus = m_grpcStub->relocalizeProcessRequest_grpc1(&context, reqIn, &respOut);
283283
#ifdef ENABLE_PROXY_TIMERS
284284
boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();
285-
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequestViz response received at " << to_simple_string(end) << std::endl;
285+
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest response received at " << to_simple_string(end) << std::endl;
286286
std::cout << " => elapsed time = " << ((end - start).total_microseconds() / 1000.00) << " ms" << std::endl;
287287
#endif
288288
if (!grpcRemoteStatus.ok()) {
289-
std::cout << "relocalizeProcessRequestViz rpc failed." << std::endl;
290-
throw xpcf::RemotingException("grpcIRelocalizationPipelineService","relocalizeProcessRequestViz",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
289+
std::cout << "relocalizeProcessRequest_grpc1 rpc failed." << std::endl;
290+
throw xpcf::RemotingException("grpcIRelocalizationPipelineService","relocalizeProcessRequest_grpc1",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
291291
}
292292

293293
currPointCloud = xpcf::deserialize<std::vector<SRef<SolAR::datastructure::CloudPoint>>>(respOut.currpointcloud());
@@ -300,8 +300,8 @@ SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcess
300300
SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest(SRef<SolAR::datastructure::Image> const image, SolAR::datastructure::Transform3Df& pose, float_t& confidence, std::vector<SolAR::datastructure::DetectedObject>& detectedObjects, SolAR::datastructure::Transform3Df const& poseCoarse)
301301
{
302302
::grpc::ClientContext context;
303-
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Request reqIn;
304-
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Response respOut;
303+
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Request reqIn;
304+
::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Response respOut;
305305
#ifndef DISABLE_GRPC_COMPRESSION
306306
xpcf::grpcCompressionInfos proxyCompressionInfo = xpcf::deduceClientCompressionInfo(m_serviceCompressionInfos, "relocalizeProcessRequest", m_methodCompressionInfosMap);
307307
xpcf::grpcCompressType serverCompressionType = xpcf::prepareClientCompressionContext(context, proxyCompressionInfo);
@@ -316,15 +316,15 @@ SolAR::FrameworkReturnCode IRelocalizationPipeline_grpcProxy::relocalizeProcess
316316
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
317317
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest request sent at " << to_simple_string(start) << std::endl;
318318
#endif
319-
::grpc::Status grpcRemoteStatus = m_grpcStub->relocalizeProcessRequest_grpc1(&context, reqIn, &respOut);
319+
::grpc::Status grpcRemoteStatus = m_grpcStub->relocalizeProcessRequest_grpc2(&context, reqIn, &respOut);
320320
#ifdef ENABLE_PROXY_TIMERS
321321
boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();
322322
std::cout << "====> IRelocalizationPipeline_grpcProxy::relocalizeProcessRequest response received at " << to_simple_string(end) << std::endl;
323323
std::cout << " => elapsed time = " << ((end - start).total_microseconds() / 1000.00) << " ms" << std::endl;
324324
#endif
325325
if (!grpcRemoteStatus.ok()) {
326-
std::cout << "relocalizeProcessRequest_grpc1 rpc failed." << std::endl;
327-
throw xpcf::RemotingException("grpcIRelocalizationPipelineService","relocalizeProcessRequest_grpc1",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
326+
std::cout << "relocalizeProcessRequest_grpc2 rpc failed." << std::endl;
327+
throw xpcf::RemotingException("grpcIRelocalizationPipelineService","relocalizeProcessRequest_grpc2",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
328328
}
329329

330330
pose = xpcf::deserialize<SolAR::datastructure::Transform3Df>(respOut.pose());

‎gen/src/IRelocalizationPipeline_grpcServer.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -204,37 +204,37 @@ ::grpc::Status IRelocalizationPipeline_grpcServer::grpcIRelocalizationPipelineSe
204204
}
205205

206206

207-
::grpc::Status IRelocalizationPipeline_grpcServer::grpcIRelocalizationPipelineServiceImpl::relocalizeProcessRequestViz(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequestVizRequest* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequestVizResponse* response)
207+
::grpc::Status IRelocalizationPipeline_grpcServer::grpcIRelocalizationPipelineServiceImpl::relocalizeProcessRequest_grpc1(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Response* response)
208208
{
209209
#ifndef DISABLE_GRPC_COMPRESSION
210210
xpcf::grpcCompressType askedCompressionType = static_cast<xpcf::grpcCompressType>(request->grpcservercompressionformat());
211-
xpcf::grpcServerCompressionInfos serverCompressInfo = xpcf::deduceServerCompressionType(askedCompressionType, m_serviceCompressionInfos, "relocalizeProcessRequestViz", m_methodCompressionInfosMap);
211+
xpcf::grpcServerCompressionInfos serverCompressInfo = xpcf::deduceServerCompressionType(askedCompressionType, m_serviceCompressionInfos, "relocalizeProcessRequest", m_methodCompressionInfosMap);
212212
xpcf::prepareServerCompressionContext(context, serverCompressInfo);
213213
#endif
214214
#ifdef ENABLE_SERVER_TIMERS
215215
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
216-
std::cout << "====> IRelocalizationPipeline_grpcServer::relocalizeProcessRequestViz request received at " << to_simple_string(start) << std::endl;
216+
std::cout << "====> IRelocalizationPipeline_grpcServer::relocalizeProcessRequest request received at " << to_simple_string(start) << std::endl;
217217
#endif
218218
SRef<SolAR::datastructure::Image> image = xpcf::deserialize<SRef<SolAR::datastructure::Image>>(request->image());
219219
std::vector<SRef<SolAR::datastructure::CloudPoint>> currPointCloud = xpcf::deserialize<std::vector<SRef<SolAR::datastructure::CloudPoint>>>(request->currpointcloud());
220220
SolAR::datastructure::Transform3Df pose = xpcf::deserialize<SolAR::datastructure::Transform3Df>(request->pose());
221221
float_t confidence = xpcf::deserialize<float_t>(request->confidence());
222222
SolAR::datastructure::Transform3Df poseCoarse = xpcf::deserialize<SolAR::datastructure::Transform3Df>(request->posecoarse());
223-
SolAR::FrameworkReturnCode returnValue = m_xpcfComponent->relocalizeProcessRequestViz(image, currPointCloud, pose, confidence, poseCoarse);
223+
SolAR::FrameworkReturnCode returnValue = m_xpcfComponent->relocalizeProcessRequest(image, currPointCloud, pose, confidence, poseCoarse);
224224
response->set_currpointcloud(xpcf::serialize<std::vector<SRef<SolAR::datastructure::CloudPoint>>>(currPointCloud));
225225
response->set_pose(xpcf::serialize<SolAR::datastructure::Transform3Df>(pose));
226226
response->set_confidence(xpcf::serialize<float_t>(confidence));
227227
response->set_xpcfgrpcreturnvalue(static_cast<int32_t>(returnValue));
228228
#ifdef ENABLE_SERVER_TIMERS
229229
boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();
230-
std::cout << "====> IRelocalizationPipeline_grpcServer::relocalizeProcessRequestViz response sent at " << to_simple_string(end) << std::endl;
230+
std::cout << "====> IRelocalizationPipeline_grpcServer::relocalizeProcessRequest response sent at " << to_simple_string(end) << std::endl;
231231
std::cout << " => elapsed time = " << ((end - start).total_microseconds() / 1000.00) << " ms" << std::endl;
232232
#endif
233233
return ::grpc::Status::OK;
234234
}
235235

236236

237-
::grpc::Status IRelocalizationPipeline_grpcServer::grpcIRelocalizationPipelineServiceImpl::relocalizeProcessRequest_grpc1(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc1Response* response)
237+
::grpc::Status IRelocalizationPipeline_grpcServer::grpcIRelocalizationPipelineServiceImpl::relocalizeProcessRequest_grpc2(::grpc::ServerContext* context, const ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Request* request, ::grpcIRelocalizationPipeline::relocalizeProcessRequest_grpc2Response* response)
238238
{
239239
#ifndef DISABLE_GRPC_COMPRESSION
240240
xpcf::grpcCompressType askedCompressionType = static_cast<xpcf::grpcCompressType>(request->grpcservercompressionformat());

0 commit comments

Comments
 (0)