mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-09-12 03:03:51 +08:00
modeld: retain SNPE and thneed drive model support (#530)
* modeld: Retain pre-20hz drive model support * Method not available anymore on OP * some fixes * Revert "Long planner get accel: new function args (#34288)" * Revert "Fix low-speed allow_throttle behavior in long planner (#33894)" * Revert "long planner: allow throttle reflects usage (#33792)" * Revert "Gate acceleration on model gas press predictions (#33643)" * Reapply "Gate acceleration on model gas press predictions (#33643)" This reverts commit 76b08e37cb8eb94266ad9f6fed80db227e7c3428. * Reapply "long planner: allow throttle reflects usage (#33792)" This reverts commit c75244ca4e9c48084b0205b7c871e1a4e0f4e693. * Reapply "Fix low-speed allow_throttle behavior in long planner (#33894)" This reverts commit b2b7d21b7b685a2785d1beede3d223f0bb954807. * Reapply "Long planner get accel: new function args (#34288)" This reverts commit 74dca2fccf4da59cc8ac62ba9c0ad10ba3fc264b. * don't need * retain snpe * wrong * they're symlinks * remove * put back into VCS * add back * don't include built * Refactor model runner retrieval with caching support Added caching for active model runner type via `ModelRunnerTypeCache` to enhance performance and avoid redundant checks. Introduced a `force_check` flag to bypass the cache when necessary. Updated related code to handle cache clearing during onroad transitions. * Update model runner determination logic with caching fix Enhances `get_active_model_runner` to utilize caching more effectively by ensuring type consistency and updating cache only when necessary. Also updates `is_snpe_model` to pass the `started` state to the runner determination function, improving behavior for dynamic checks. * default to none * enable in next PR * more --------- Co-authored-by: DevTekVE <devtekve@gmail.com>
This commit is contained in:
@@ -0,0 +1,230 @@
|
||||
//=============================================================================
|
||||
//
|
||||
// Copyright (c) 2017-2018,2021 Qualcomm Technologies, Inc.
|
||||
// All Rights Reserved.
|
||||
// Confidential and Proprietary - Qualcomm Technologies, Inc.
|
||||
//
|
||||
//=============================================================================
|
||||
|
||||
#ifndef _DL_SYSTEM_PLATFORM_CONFIG_HPP_
|
||||
#define _DL_SYSTEM_PLATFORM_CONFIG_HPP_
|
||||
|
||||
#include "DlSystem/ZdlExportDefine.hpp"
|
||||
#include <string>
|
||||
|
||||
namespace zdl{
|
||||
namespace DlSystem
|
||||
{
|
||||
|
||||
/** @addtogroup c_plus_plus_apis C++
|
||||
@{ */
|
||||
|
||||
|
||||
/**
|
||||
* @brief .
|
||||
*
|
||||
* A structure OpenGL configuration
|
||||
*
|
||||
* @note When certain OpenGL context and display are provided to UserGLConfig for using
|
||||
* GPU buffer as input directly, the user MUST ensure the particular OpenGL
|
||||
* context and display remain vaild throughout the execution of neural network models.
|
||||
*/
|
||||
struct ZDL_EXPORT UserGLConfig
|
||||
{
|
||||
/// Holds user EGL context.
|
||||
///
|
||||
void* userGLContext = nullptr;
|
||||
|
||||
/// Holds user EGL display.
|
||||
void* userGLDisplay = nullptr;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief .
|
||||
*
|
||||
* A structure Gpu configuration
|
||||
*/
|
||||
struct ZDL_EXPORT UserGpuConfig{
|
||||
/// Holds user OpenGL configuration.
|
||||
///
|
||||
UserGLConfig userGLConfig;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief .
|
||||
*
|
||||
* A class user platform configuration
|
||||
*/
|
||||
class ZDL_EXPORT PlatformConfig
|
||||
{
|
||||
public:
|
||||
|
||||
/**
|
||||
* @brief .
|
||||
*
|
||||
* An enum class of all supported platform types
|
||||
*/
|
||||
enum class PlatformType_t
|
||||
{
|
||||
/// Unknown platform type.
|
||||
UNKNOWN = 0,
|
||||
|
||||
/// Snapdragon CPU.
|
||||
CPU = 1,
|
||||
|
||||
/// Adreno GPU.
|
||||
GPU = 2,
|
||||
|
||||
/// Hexagon DSP.
|
||||
DSP = 3
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief .
|
||||
*
|
||||
* A union class user platform configuration information
|
||||
*/
|
||||
union PlatformConfigInfo
|
||||
{
|
||||
/// Holds user GPU Configuration.
|
||||
///
|
||||
UserGpuConfig userGpuConfig;
|
||||
|
||||
PlatformConfigInfo(){};
|
||||
};
|
||||
|
||||
PlatformConfig() : m_PlatformType(PlatformType_t::UNKNOWN),
|
||||
m_PlatformOptions("") {};
|
||||
|
||||
/**
|
||||
* @brief Retrieves the platform type
|
||||
*
|
||||
* @return Platform type
|
||||
*/
|
||||
PlatformType_t getPlatformType() const {return m_PlatformType;};
|
||||
|
||||
/**
|
||||
* @brief Indicates whther the plaform configuration is valid.
|
||||
*
|
||||
* @return True if the platform configuration is valid; false otherwise.
|
||||
*/
|
||||
bool isValid() const {return (PlatformType_t::UNKNOWN != m_PlatformType);};
|
||||
|
||||
/**
|
||||
* @brief Retrieves the Gpu configuration
|
||||
*
|
||||
* @param[out] userGpuConfig The passed in userGpuConfig populated with the Gpu configuration on return.
|
||||
*
|
||||
* @return True if Gpu configuration was retrieved; false otherwise.
|
||||
*/
|
||||
bool getUserGpuConfig(UserGpuConfig& userGpuConfig) const
|
||||
{
|
||||
if(m_PlatformType == PlatformType_t::GPU)
|
||||
{
|
||||
userGpuConfig = m_PlatformConfigInfo.userGpuConfig;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Sets the Gpu configuration
|
||||
*
|
||||
* @param[in] userGpuConfig Gpu Configuration
|
||||
*
|
||||
* @return True if Gpu configuration was successfully set; false otherwise.
|
||||
*/
|
||||
bool setUserGpuConfig(UserGpuConfig& userGpuConfig)
|
||||
{
|
||||
if((userGpuConfig.userGLConfig.userGLContext != nullptr) && (userGpuConfig.userGLConfig.userGLDisplay != nullptr))
|
||||
{
|
||||
switch (m_PlatformType)
|
||||
{
|
||||
case PlatformType_t::GPU:
|
||||
m_PlatformConfigInfo.userGpuConfig = userGpuConfig;
|
||||
return true;
|
||||
case PlatformType_t::UNKNOWN:
|
||||
m_PlatformType = PlatformType_t::GPU;
|
||||
m_PlatformConfigInfo.userGpuConfig = userGpuConfig;
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Sets the platform options
|
||||
*
|
||||
* @param[in] options Options as a string in the form of "keyword:options"
|
||||
*
|
||||
* @return True if options are pass validation; otherwise false. If false, the options are not updated.
|
||||
*/
|
||||
bool setPlatformOptions(std::string options) {
|
||||
std::string oldOptions = m_PlatformOptions;
|
||||
m_PlatformOptions = options;
|
||||
if (isOptionsValid()) {
|
||||
return true;
|
||||
} else {
|
||||
m_PlatformOptions = oldOptions;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Indicates whther the plaform configuration is valid.
|
||||
*
|
||||
* @return True if the platform configuration is valid; false otherwise.
|
||||
*/
|
||||
bool isOptionsValid() const;
|
||||
|
||||
/**
|
||||
* @brief Gets the platform options
|
||||
*
|
||||
* @return Options as a string
|
||||
*/
|
||||
std::string getPlatformOptions() const { return m_PlatformOptions; }
|
||||
|
||||
/**
|
||||
* @brief Sets the platform options
|
||||
*
|
||||
* @param[in] optionName Name of platform options"
|
||||
* @param[in] value Value of specified optionName
|
||||
*
|
||||
* @return If true, add "optionName:value" to platform options if optionName don't exist, otherwise update the
|
||||
* value of specified optionName.
|
||||
* If false, the platform options will not be changed.
|
||||
*/
|
||||
bool setPlatformOptionValue(const std::string& optionName, const std::string& value);
|
||||
|
||||
/**
|
||||
* @brief Removes the platform options
|
||||
*
|
||||
* @param[in] optionName Name of platform options"
|
||||
* @param[in] value Value of specified optionName
|
||||
*
|
||||
* @return If true, removed "optionName:value" to platform options if optionName don't exist, do nothing.
|
||||
* If false, the platform options will not be changed.
|
||||
*/
|
||||
bool removePlatformOptionValue(const std::string& optionName, const std::string& value);
|
||||
|
||||
static void SetIsUserGLBuffer(bool isUserGLBuffer);
|
||||
static bool GetIsUserGLBuffer();
|
||||
|
||||
private:
|
||||
PlatformType_t m_PlatformType;
|
||||
PlatformConfigInfo m_PlatformConfigInfo;
|
||||
std::string m_PlatformOptions;
|
||||
static bool m_IsUserGLBuffer;
|
||||
};
|
||||
|
||||
/** @} */ /* end_addtogroup c_plus_plus_apis C++ */
|
||||
|
||||
}} //namespace end
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user