Snap for 11308440 from 514c2186c8d78e59850e0ccb094c6196fd6ba52c to 24Q2-release
Change-Id: I0ba0f277370873e3ae8710f42eca9282618d0f64
diff --git a/runtime/include/NeuralNetworks.h b/runtime/include/NeuralNetworks.h
index cfa871c..4e54f85 100644
--- a/runtime/include/NeuralNetworks.h
+++ b/runtime/include/NeuralNetworks.h
@@ -87,10 +87,6 @@
* Set to NULL if unsuccessful.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- *
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemoryDesc_create(ANeuralNetworksMemoryDesc** desc) __NNAPI_INTRODUCED_IN(30);
@@ -106,9 +102,6 @@
*
* @param desc The memory descriptor to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksMemoryDesc_free(ANeuralNetworksMemoryDesc* desc) __NNAPI_INTRODUCED_IN(30);
@@ -153,9 +146,6 @@
* layouts.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemoryDesc_addInputRole(ANeuralNetworksMemoryDesc* desc,
const ANeuralNetworksCompilation* compilation,
@@ -203,9 +193,6 @@
* layouts.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemoryDesc_addOutputRole(ANeuralNetworksMemoryDesc* desc,
const ANeuralNetworksCompilation* compilation,
@@ -234,9 +221,6 @@
* corresponding axis has an unknown size.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemoryDesc_setDimensions(ANeuralNetworksMemoryDesc* desc, uint32_t rank,
const uint32_t* dimensions) __NNAPI_INTRODUCED_IN(30);
@@ -254,9 +238,6 @@
* @param desc The memory descriptor to be finished.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemoryDesc_finish(ANeuralNetworksMemoryDesc* desc) __NNAPI_INTRODUCED_IN(30);
@@ -312,9 +293,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful; ANEURALNETWORKS_OP_FAILED if the memory is
* created with unspecified dimensions or rank and it is not supported for this set of
* roles.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemory_createFromDesc(const ANeuralNetworksMemoryDesc* desc,
ANeuralNetworksMemory** memory) __NNAPI_INTRODUCED_IN(30);
@@ -354,9 +332,6 @@
* @param dst The destination memory object.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemory_copy(const ANeuralNetworksMemory* src, const ANeuralNetworksMemory* dst)
__NNAPI_INTRODUCED_IN(30);
@@ -369,9 +344,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworks_getDeviceCount(uint32_t* numDevices) __NNAPI_INTRODUCED_IN(29);
@@ -387,9 +359,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworks_getDevice(uint32_t devIndex, ANeuralNetworksDevice** device)
__NNAPI_INTRODUCED_IN(29);
@@ -410,9 +379,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksDevice_getName(const ANeuralNetworksDevice* device, const char** name)
__NNAPI_INTRODUCED_IN(29);
@@ -432,9 +398,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksDevice_getType(const ANeuralNetworksDevice* device, int32_t* type)
__NNAPI_INTRODUCED_IN(29);
@@ -465,9 +428,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksDevice_getVersion(const ANeuralNetworksDevice* device, const char** version)
__NNAPI_INTRODUCED_IN(29);
@@ -495,9 +455,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksDevice_getFeatureLevel(const ANeuralNetworksDevice* device,
int64_t* featureLevel) __NNAPI_INTRODUCED_IN(29);
@@ -515,9 +472,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksDevice_wait(const ANeuralNetworksDevice* device) __NNAPI_INTRODUCED_IN(30);
@@ -537,9 +491,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_getSupportedOperationsForDevices(
const ANeuralNetworksModel* model, const ANeuralNetworksDevice* const* devices,
@@ -571,9 +522,6 @@
* if the model is invalid.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_createForDevices(ANeuralNetworksModel* model,
const ANeuralNetworksDevice* const* devices,
@@ -605,9 +553,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_setCaching(ANeuralNetworksCompilation* compilation,
const char* cacheDir, const uint8_t* token)
@@ -651,9 +596,6 @@
* @return ANEURALNETWORKS_NO_ERROR if the execution completed normally.
* ANEURALNETWORKS_UNMAPPABLE if the execution input or output memory cannot
* be properly mapped.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_compute(ANeuralNetworksExecution* execution) __NNAPI_INTRODUCED_IN(29);
@@ -677,9 +619,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is invalid.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_getOutputOperandRank(ANeuralNetworksExecution* execution,
int32_t index, uint32_t* rank)
@@ -706,9 +645,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is invalid or if the target is a scalar.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_getOutputOperandDimensions(ANeuralNetworksExecution* execution,
int32_t index, uint32_t* dimensions)
@@ -729,9 +665,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA
* if the compilation is invalid.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksBurst_create(ANeuralNetworksCompilation* compilation,
ANeuralNetworksBurst** burst) __NNAPI_INTRODUCED_IN(29);
@@ -743,9 +676,6 @@
*
* @param burst The burst object to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksBurst_free(ANeuralNetworksBurst* burst) __NNAPI_INTRODUCED_IN(29);
@@ -792,9 +722,6 @@
* ANeuralNetworksCompilation} as the burst object.
*
* @return ANEURALNETWORKS_NO_ERROR if the execution completed normally.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_burstCompute(ANeuralNetworksExecution* execution,
ANeuralNetworksBurst* burst) __NNAPI_INTRODUCED_IN(29);
@@ -831,9 +758,6 @@
* @return ANEURALNETWORKS_NO_ERROR if the request completed normally.
*
* @see AHardwareBuffer
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
#ifdef __ANDROID__
int ANeuralNetworksMemory_createFromAHardwareBuffer(const AHardwareBuffer* ahwb,
@@ -865,9 +789,6 @@
* @param measure 'true' if duration is to be measured, 'false' if not.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setMeasureTiming(ANeuralNetworksExecution* execution, bool measure)
__NNAPI_INTRODUCED_IN(29);
@@ -893,9 +814,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 3.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_getDuration(const ANeuralNetworksExecution* execution,
int32_t durationCode, uint64_t* duration)
@@ -924,9 +842,6 @@
* Set to NULL if unsuccessful.
*
* @return ANEURALNETWORKS_NO_ERROR if the request completed normally.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksMemory_createFromFd(size_t size, int protect, int fd, size_t offset,
ANeuralNetworksMemory** memory) __NNAPI_INTRODUCED_IN(27);
@@ -942,9 +857,6 @@
*
* @param memory The memory object to be freed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksMemory_free(ANeuralNetworksMemory* memory) __NNAPI_INTRODUCED_IN(27);
@@ -973,9 +885,6 @@
* Set to NULL if unsuccessful.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_create(ANeuralNetworksModel** model) __NNAPI_INTRODUCED_IN(27);
@@ -991,9 +900,6 @@
*
* @param model The model to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksModel_free(ANeuralNetworksModel* model) __NNAPI_INTRODUCED_IN(27);
@@ -1014,9 +920,6 @@
* @param model The model to be finished.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_finish(ANeuralNetworksModel* model) __NNAPI_INTRODUCED_IN(27);
@@ -1069,9 +972,6 @@
* {@link ANeuralNetworksModel_addOperand}.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_addOperand(ANeuralNetworksModel* model,
const ANeuralNetworksOperandType* type)
@@ -1111,9 +1011,6 @@
* @param length The size in bytes of the data value.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_setOperandValue(ANeuralNetworksModel* model, int32_t index,
const void* buffer, size_t length)
@@ -1137,9 +1034,6 @@
* this function.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_setOperandSymmPerChannelQuantParams(
ANeuralNetworksModel* model, int32_t index,
@@ -1182,9 +1076,6 @@
* @param length The size in bytes of the data value.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_setOperandValueFromMemory(ANeuralNetworksModel* model, int32_t index,
const ANeuralNetworksMemory* memory,
@@ -1215,9 +1106,6 @@
* @param value The model to be referenced.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_setOperandValueFromModel(ANeuralNetworksModel* model, int32_t index,
const ANeuralNetworksModel* value)
@@ -1244,9 +1132,6 @@
* Available since NNAPI feature level 1.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_addOperation(ANeuralNetworksModel* model,
ANeuralNetworksOperationType type, uint32_t inputCount,
@@ -1276,9 +1161,6 @@
*
* Available since NNAPI feature level 1.
*
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_identifyInputsAndOutputs(ANeuralNetworksModel* model, uint32_t inputCount,
const uint32_t* inputs, uint32_t outputCount,
@@ -1309,9 +1191,6 @@
* Available since NNAPI feature level 2.
*
* See {@link ANeuralNetworksModel} for information on multithreaded usage.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksModel_relaxComputationFloat32toFloat16(ANeuralNetworksModel* model, bool allow)
__NNAPI_INTRODUCED_IN(28);
@@ -1346,9 +1225,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA
* if the model is invalid.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_create(ANeuralNetworksModel* model,
ANeuralNetworksCompilation** compilation)
@@ -1366,9 +1242,6 @@
*
* @param compilation The compilation to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksCompilation_free(ANeuralNetworksCompilation* compilation)
__NNAPI_INTRODUCED_IN(27);
@@ -1389,9 +1262,6 @@
* {@link ANEURALNETWORKS_PREFER_SUSTAINED_SPEED}.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_setPreference(ANeuralNetworksCompilation* compilation,
int32_t preference) __NNAPI_INTRODUCED_IN(27);
@@ -1418,9 +1288,6 @@
* @param compilation The compilation to be finished.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_finish(ANeuralNetworksCompilation* compilation)
__NNAPI_INTRODUCED_IN(27);
@@ -1447,9 +1314,6 @@
* ANEURALNETWORKS_PRIORITY_*.
*
* @return ANEURALNETWORKS_NO_ERROR if successful.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_setPriority(ANeuralNetworksCompilation* compilation, int priority)
__NNAPI_INTRODUCED_IN(30);
@@ -1493,9 +1357,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_setTimeout(ANeuralNetworksCompilation* compilation,
uint64_t duration) __NNAPI_INTRODUCED_IN(30);
@@ -1519,9 +1380,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA
* if the compilation is invalid.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_create(ANeuralNetworksCompilation* compilation,
ANeuralNetworksExecution** execution) __NNAPI_INTRODUCED_IN(27);
@@ -1546,9 +1404,6 @@
*
* @param execution The execution to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksExecution_free(ANeuralNetworksExecution* execution) __NNAPI_INTRODUCED_IN(27);
@@ -1607,9 +1462,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA if the
* name is not recognized or the buffer is too small for the input.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setInput(ANeuralNetworksExecution* execution, int32_t index,
const ANeuralNetworksOperandType* type, const void* buffer,
@@ -1680,9 +1532,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA if the
* name is not recognized or the buffer is too small for the input.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setInputFromMemory(ANeuralNetworksExecution* execution, int32_t index,
const ANeuralNetworksOperandType* type,
@@ -1748,9 +1597,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA if the
* name is not recognized or the buffer is too small for the output.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setOutput(ANeuralNetworksExecution* execution, int32_t index,
const ANeuralNetworksOperandType* type, void* buffer,
@@ -1826,9 +1672,6 @@
*
* @return ANEURALNETWORKS_NO_ERROR if successful, ANEURALNETWORKS_BAD_DATA if the
* name is not recognized or the buffer is too small for the output.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setOutputFromMemory(ANeuralNetworksExecution* execution, int32_t index,
const ANeuralNetworksOperandType* type,
@@ -1886,9 +1729,6 @@
* NULL if there's an error.
*
* @return ANEURALNETWORKS_NO_ERROR if the evaluation is successfully scheduled.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_startCompute(ANeuralNetworksExecution* execution,
ANeuralNetworksEvent** event) __NNAPI_INTRODUCED_IN(27);
@@ -1938,9 +1778,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setTimeout(ANeuralNetworksExecution* execution, uint64_t duration)
__NNAPI_INTRODUCED_IN(30);
@@ -1972,9 +1809,6 @@
* ANEURALNETWORKS_UNEXPECTED_NULL if execution is NULL.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setLoopTimeout(ANeuralNetworksExecution* execution, uint64_t duration)
__NNAPI_INTRODUCED_IN(30);
@@ -1985,9 +1819,6 @@
* @return The default timeout value in nanoseconds.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
uint64_t ANeuralNetworks_getDefaultLoopTimeout() __NNAPI_INTRODUCED_IN(30);
@@ -1997,9 +1828,6 @@
* @return The maximum timeout value in nanoseconds.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
uint64_t ANeuralNetworks_getMaximumLoopTimeout() __NNAPI_INTRODUCED_IN(30);
@@ -2027,9 +1855,6 @@
* @return ANEURALNETWORKS_NO_ERROR if the execution completed normally.
* ANEURALNETWORKS_UNMAPPABLE if the execution input or output memory cannot
* be properly mapped.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksEvent_wait(ANeuralNetworksEvent* event) __NNAPI_INTRODUCED_IN(27);
@@ -2042,9 +1867,6 @@
*
* @param event The event object to be destroyed. Passing NULL is acceptable and
* results in no operation.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
void ANeuralNetworksEvent_free(ANeuralNetworksEvent* event) __NNAPI_INTRODUCED_IN(27);
@@ -2060,9 +1882,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksEvent_createFromSyncFenceFd(int sync_fence_fd, ANeuralNetworksEvent** event)
__NNAPI_INTRODUCED_IN(30);
@@ -2087,9 +1906,6 @@
* @return ANEURALNETWORKS_NO_ERROR if successful.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksEvent_getSyncFenceFd(const ANeuralNetworksEvent* event, int* sync_fence_fd)
__NNAPI_INTRODUCED_IN(30);
@@ -2169,9 +1985,6 @@
* @return ANEURALNETWORKS_NO_ERROR if the evaluation is successfully scheduled.
*
* Available since NNAPI feature level 4.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_startComputeWithDependencies(
ANeuralNetworksExecution* execution, const ANeuralNetworksEvent* const* dependencies,
@@ -2212,9 +2025,6 @@
* It is NOT an Android API level.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int64_t ANeuralNetworks_getRuntimeFeatureLevel() __NNAPI_INTRODUCED_IN(31);
@@ -2251,9 +2061,6 @@
* {@link ANeuralNetworksExecution_setOutputFromMemory} has been called on the execution.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_enableInputAndOutputPadding(ANeuralNetworksExecution* execution,
bool enable) __NNAPI_INTRODUCED_IN(31);
@@ -2285,9 +2092,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is out of range.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_getPreferredMemoryAlignmentForInput(
const ANeuralNetworksCompilation* compilation, uint32_t index, uint32_t* alignment)
@@ -2326,9 +2130,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is out of range.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_getPreferredMemoryPaddingForInput(
const ANeuralNetworksCompilation* compilation, uint32_t index, uint32_t* padding)
@@ -2361,9 +2162,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is out of range.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_getPreferredMemoryAlignmentForOutput(
const ANeuralNetworksCompilation* compilation, uint32_t index, uint32_t* alignment)
@@ -2402,9 +2200,6 @@
* ANEURALNETWORKS_BAD_DATA if the index is out of range.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksCompilation_getPreferredMemoryPaddingForOutput(
const ANeuralNetworksCompilation* compilation, uint32_t index, uint32_t* padding)
@@ -2434,9 +2229,6 @@
* ANEURALNETWORKS_BAD_STATE if the execution is not in the preparation state.
*
* Available since NNAPI feature level 5.
- * @deprecated NNAPI is deprecated. See
- * <a href="https://source.android.com/docs/core/interaction/neural-networks">this webpage</a>
- * for more details.
*/
int ANeuralNetworksExecution_setReusable(ANeuralNetworksExecution* execution, bool reusable)
__NNAPI_INTRODUCED_IN(31);
