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

Commit 7623d457 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Invalidate NN interface objects on cache mismatch" am: 4cdcadf7 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1508322

Change-Id: I77446ec7fb4d8b6c2f7c3581b58b015032b75ae4
parents 4c8b0568 4cdcadf7

neuralnetworks/utils/common/include/nnapi/hal/InvalidBuffer.h

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_BUFFER_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_BUFFER_H



#include <nnapi/IBuffer.h>

#include <nnapi/Result.h>

#include <nnapi/Types.h>



#include <memory>

#include <utility>

#include <vector>



namespace android::hardware::neuralnetworks::utils {



class InvalidBuffer final : public nn::IBuffer {

  public:

    nn::Request::MemoryDomainToken getToken() const override;



    nn::GeneralResult<void> copyTo(const nn::Memory& dst) const override;



    nn::GeneralResult<void> copyFrom(const nn::Memory& src,

                                     const nn::Dimensions& dimensions) const override;

};



}  // namespace android::hardware::neuralnetworks::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_BUFFER_H

neuralnetworks/utils/common/include/nnapi/hal/InvalidDevice.h

0 → 100644
+80 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_DEVICE_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_DEVICE_H



#include <nnapi/IBuffer.h>

#include <nnapi/IDevice.h>

#include <nnapi/IPreparedModel.h>

#include <nnapi/Result.h>

#include <nnapi/Types.h>



#include <memory>

#include <string>

#include <vector>



namespace android::hardware::neuralnetworks::utils {



class InvalidDevice final : public nn::IDevice {

  public:

    InvalidDevice(std::string name, std::string versionString, nn::Version featureLevel,

                  nn::DeviceType type, std::vector<nn::Extension> extensions,

                  nn::Capabilities capabilities,

                  std::pair<uint32_t, uint32_t> numberOfCacheFilesNeeded);



    const std::string& getName() const override;

    const std::string& getVersionString() const override;

    nn::Version getFeatureLevel() const override;

    nn::DeviceType getType() const override;

    const std::vector<nn::Extension>& getSupportedExtensions() const override;

    const nn::Capabilities& getCapabilities() const override;

    std::pair<uint32_t, uint32_t> getNumberOfCacheFilesNeeded() const override;



    nn::GeneralResult<void> wait() const override;



    nn::GeneralResult<std::vector<bool>> getSupportedOperations(

            const nn::Model& model) const override;



    nn::GeneralResult<nn::SharedPreparedModel> prepareModel(

            const nn::Model& model, nn::ExecutionPreference preference, nn::Priority priority,

            nn::OptionalTimePoint deadline, const std::vector<nn::SharedHandle>& modelCache,

            const std::vector<nn::SharedHandle>& dataCache,

            const nn::CacheToken& token) const override;



    nn::GeneralResult<nn::SharedPreparedModel> prepareModelFromCache(

            nn::OptionalTimePoint deadline, const std::vector<nn::SharedHandle>& modelCache,

            const std::vector<nn::SharedHandle>& dataCache,

            const nn::CacheToken& token) const override;



    nn::GeneralResult<nn::SharedBuffer> allocate(

            const nn::BufferDesc& desc, const std::vector<nn::SharedPreparedModel>& preparedModels,

            const std::vector<nn::BufferRole>& inputRoles,

            const std::vector<nn::BufferRole>& outputRoles) const override;



  private:

    const std::string kName;

    const std::string kVersionString;

    const nn::Version kFeatureLevel;

    const nn::DeviceType kType;

    const std::vector<nn::Extension> kExtensions;

    const nn::Capabilities kCapabilities;

    const std::pair<uint32_t, uint32_t> kNumberOfCacheFilesNeeded;

};



}  // namespace android::hardware::neuralnetworks::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_DEVICE_H

neuralnetworks/utils/common/include/nnapi/hal/InvalidPreparedModel.h

0 → 100644
+48 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_PREPARED_MODEL_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_PREPARED_MODEL_H



#include <nnapi/IPreparedModel.h>

#include <nnapi/Result.h>

#include <nnapi/Types.h>



#include <memory>

#include <utility>

#include <vector>



namespace android::hardware::neuralnetworks::utils {



class InvalidPreparedModel final : public nn::IPreparedModel {

  public:

    nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> execute(

            const nn::Request& request, nn::MeasureTiming measure,

            const nn::OptionalTimePoint& deadline,

            const nn::OptionalTimeoutDuration& loopTimeoutDuration) const override;



    nn::GeneralResult<std::pair<nn::SyncFence, nn::ExecuteFencedInfoCallback>> executeFenced(

            const nn::Request& request, const std::vector<nn::SyncFence>& waitFor,

            nn::MeasureTiming measure, const nn::OptionalTimePoint& deadline,

            const nn::OptionalTimeoutDuration& loopTimeoutDuration,

            const nn::OptionalTimeoutDuration& timeoutDurationAfterFence) const override;



    std::any getUnderlyingResource() const override;

};



}  // namespace android::hardware::neuralnetworks::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_INVALID_PREPARED_MODEL_H

neuralnetworks/utils/common/include/nnapi/hal/ResilientDevice.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -45,8 +45,9 @@ class ResilientDevice final : public nn::IDevice, 
                             std::string versionString, std::vector<nn::Extension> extensions,

                             std::string versionString, std::vector<nn::Extension> extensions,

                             nn::Capabilities capabilities, nn::SharedDevice device);

                             nn::Capabilities capabilities, nn::SharedDevice device);





    nn::SharedDevice getDevice() const;

    nn::SharedDevice getDevice() const EXCLUDES(mMutex);

    nn::SharedDevice recover(const nn::IDevice* failingDevice, bool blocking) const;

    nn::SharedDevice recover(const nn::IDevice* failingDevice, bool blocking) const

            EXCLUDES(mMutex);





    const std::string& getName() const override;

    const std::string& getName() const override;

    const std::string& getVersionString() const override;

    const std::string& getVersionString() const override;
@@ -78,6 +79,7 @@ class ResilientDevice final : public nn::IDevice, 
            const std::vector<nn::BufferRole>& outputRoles) const override;

            const std::vector<nn::BufferRole>& outputRoles) const override;





  private:

  private:

    bool isValidInternal() const EXCLUDES(mMutex);

    nn::GeneralResult<nn::SharedPreparedModel> prepareModelInternal(

    nn::GeneralResult<nn::SharedPreparedModel> prepareModelInternal(

            bool blocking, const nn::Model& model, nn::ExecutionPreference preference,

            bool blocking, const nn::Model& model, nn::ExecutionPreference preference,

            nn::Priority priority, nn::OptionalTimePoint deadline,

            nn::Priority priority, nn::OptionalTimePoint deadline,
@@ -100,6 +102,7 @@ class ResilientDevice final : public nn::IDevice, 
    const nn::Capabilities kCapabilities;

    const nn::Capabilities kCapabilities;

    mutable std::mutex mMutex;

    mutable std::mutex mMutex;

    mutable nn::SharedDevice mDevice GUARDED_BY(mMutex);

    mutable nn::SharedDevice mDevice GUARDED_BY(mMutex);

    mutable bool mIsValid GUARDED_BY(mMutex) = true;

};

};





}  // namespace android::hardware::neuralnetworks::utils

}  // namespace android::hardware::neuralnetworks::utils

neuralnetworks/utils/common/src/InvalidBuffer.cpp

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "InvalidBuffer.h"



#include <nnapi/IBuffer.h>

#include <nnapi/Result.h>

#include <nnapi/Types.h>



#include <memory>

#include <utility>

#include <vector>



namespace android::hardware::neuralnetworks::utils {



nn::Request::MemoryDomainToken InvalidBuffer::getToken() const {

    return nn::Request::MemoryDomainToken{};

}



nn::GeneralResult<void> InvalidBuffer::copyTo(const nn::Memory& /*dst*/) const {

    return NN_ERROR() << "InvalidBuffer";

}



nn::GeneralResult<void> InvalidBuffer::copyFrom(const nn::Memory& /*src*/,

                                                const nn::Dimensions& /*dimensions*/) const {

    return NN_ERROR() << "InvalidBuffer";

}



}  // namespace android::hardware::neuralnetworks::utils