From b362a482e93cb3defcc7328822177ea67d1a7cde Mon Sep 17 00:00:00 2001 From: Mautisim Munir Date: Wed, 16 Nov 2022 00:13:46 +0500 Subject: [PATCH] fix ios builds --- mediapipe/objc/solutions/posetracking_gpu/BUILD | 2 ++ .../solutions/posetracking_gpu/PoseTracking.mm | 15 --------------- .../registry/calculator_registry.cpp | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/mediapipe/objc/solutions/posetracking_gpu/BUILD b/mediapipe/objc/solutions/posetracking_gpu/BUILD index 251c59767..feb7dad0e 100644 --- a/mediapipe/objc/solutions/posetracking_gpu/BUILD +++ b/mediapipe/objc/solutions/posetracking_gpu/BUILD @@ -161,6 +161,8 @@ objc_library( hdrs = MPP_HEADERS + MP_GEN_IOS_HEADERS, copts = [ "-Wno-shorten-64-to-32", + "--std=c++17", + # "-all_load", ], data = [ diff --git a/mediapipe/objc/solutions/posetracking_gpu/PoseTracking.mm b/mediapipe/objc/solutions/posetracking_gpu/PoseTracking.mm index 43ef37afb..164167c6f 100644 --- a/mediapipe/objc/solutions/posetracking_gpu/PoseTracking.mm +++ b/mediapipe/objc/solutions/posetracking_gpu/PoseTracking.mm @@ -5,21 +5,7 @@ #include "mediapipe/framework/packet.h" #include "registry/calculator_registry.h" -//#include "mediapipe/calculators/core/flow_limiter_calculator.h" -//#include "mediapipe/calculators/core/constant_side_packet_calculator.h" -//#include "mediapipe/modules/pose_landmark/pose_landmark_gpu_linked.h" -//#include "mediapipe/graphs/pose_tracking/subgraphs/pose_renderer_gpu_linked.h" -//#include "mediapipe/modules/pose_detection/pose_detection_gpu_linked.h" -void registerCalculators(){ -// typeid(::mediapipe::FlowLimiterCalculator); -// typeid(::mediapipe::ConstantSidePacketCalculator); -// typeid(::mediapipe::PoseLandmarkGpu); -// typeid(::mediapipe::PoseRendererGpu); -// typeid(::mediapipe::PoseDetectionGpu); - - -} static const char* kVideoQueueLabel = "com.google.mediapipe.example.videoQueue"; static const char* kLandmarksOutputStream = "pose_landmarks"; @@ -145,7 +131,6 @@ static const char* kLandmarksOutputStream = "pose_landmarks"; - (instancetype) initWithPoseTrackingOptions: (PoseTrackingOptions*) poseTrackingOptions{ - registerCalculators(); MPPCalculator(); self.renderer = [[MPPLayerRenderer alloc] init]; self.renderer.frameScaleMode = MPPFrameScaleModeFillAndCrop; diff --git a/mediapipe/objc/solutions/posetracking_gpu/registry/calculator_registry.cpp b/mediapipe/objc/solutions/posetracking_gpu/registry/calculator_registry.cpp index 328d5e676..ccb849723 100644 --- a/mediapipe/objc/solutions/posetracking_gpu/registry/calculator_registry.cpp +++ b/mediapipe/objc/solutions/posetracking_gpu/registry/calculator_registry.cpp @@ -1,10 +1,20 @@ // // Created by Mautisim Munir on 05/11/2022. // +#include +#include "mediapipe/calculators/core/constant_side_packet_calculator.pb.h" +#include "mediapipe/framework/calculator_framework.h" +#include "mediapipe/framework/collection_item_id.h" +#include "mediapipe/framework/formats/classification.pb.h" +#include "mediapipe/framework/formats/landmark.pb.h" +#include "mediapipe/framework/port/canonical_errors.h" +#include "mediapipe/framework/port/integral_types.h" +#include "mediapipe/framework/port/ret_check.h" +#include "mediapipe/framework/port/status.h" +#include #include "calculator_registry.h" -#include "mediapipe/calculators/core/flow_limiter_calculator.h" -#include "mediapipe/calculators/core/constant_side_packet_calculator.h" +#include // We need namespaces for subgraphs because of the static variables inside the files namespace PLG { @@ -52,8 +62,6 @@ namespace TPLS{ MPPCalculator::MPPCalculator() { typeid(TPLS::mediapipe::TensorsToPoseLandmarksAndSegmentation); - typeid(::mediapipe::FlowLimiterCalculator); - typeid(::mediapipe::ConstantSidePacketCalculator); typeid(PLG::mediapipe::PoseLandmarkGpu); typeid(PRG::mediapipe::PoseRendererGpu); typeid(PDG::mediapipe::PoseDetectionGpu);