Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18efdb70 authored by Ryan Prichard's avatar Ryan Prichard Committed by Android Build Cherrypicker Worker
Browse files

TFLite: Accommodate change in std::span size type 

The WIP version of std::span in external/libcxx uses a ptrdiff_t size,
but the finalized C++20 std::span uses a size_t size instead. Comparing
the size_t size() against a signed integer causes a
-Werror,-Wsign-compare build error. Cast the size() expression so that
the code compiles with both the old and the new libc++.

Bug: 175635923
Test: m MODULES-IN-frameworks-native
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a119a69b066f7bb03d51665a35bef17cecacbe95)
Merged-In: I50cc5354b6205b62918157b69df6cf1aa7bad6cc
Change-Id: I50cc5354b6205b62918157b69df6cf1aa7bad6cc
parent 91600505

libs/input/tests/TfLiteMotionPredictor_test.cpp

+10 −10
Original line number Diff line number Diff line
@@ -130,19 +130,19 @@ TEST(TfLiteMotionPredictorTest, ModelInputOutputLength) { 
    std::unique_ptr<TfLiteMotionPredictorModel> model = TfLiteMotionPredictorModel::create();

    ASSERT_GT(model->inputLength(), 0u);



    const int inputLength = model->inputLength();

    ASSERT_EQ(inputLength, model->inputR().size());

    ASSERT_EQ(inputLength, model->inputPhi().size());

    ASSERT_EQ(inputLength, model->inputPressure().size());

    ASSERT_EQ(inputLength, model->inputOrientation().size());

    ASSERT_EQ(inputLength, model->inputTilt().size());

    const size_t inputLength = model->inputLength();

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputR().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputPhi().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputPressure().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputOrientation().size()));

    ASSERT_EQ(inputLength, static_cast<size_t>(model->inputTilt().size()));



    ASSERT_TRUE(model->invoke());



    const int outputLength = model->outputLength();

    ASSERT_EQ(outputLength, model->outputR().size());

    ASSERT_EQ(outputLength, model->outputPhi().size());

    ASSERT_EQ(outputLength, model->outputPressure().size());

    const size_t outputLength = model->outputLength();

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputR().size()));

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputPhi().size()));

    ASSERT_EQ(outputLength, static_cast<size_t>(model->outputPressure().size()));

}



TEST(TfLiteMotionPredictorTest, ModelOutput) {