diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-15 03:44:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-15 03:44:48 +0000 |
| commit | 48517556293bff7e21f3b953ff117b88b00d78c5 (patch) | |
| tree | 1c615614b379ff4716d7d7d81e09075a21c2e830 | |
| parent | 6973f66b8fbd29214364a45fc1cb2d727a36566f (diff) | |
| parent | ed36e410e3122610f00541008203def530bc5c1b (diff) | |
| download | ml-48517556293bff7e21f3b953ff117b88b00d78c5.tar.gz | |
Merge "Add two more operations."
| -rw-r--r-- | nn/common/Utils.cpp | 2 | ||||
| -rw-r--r-- | nn/common/include/Utils.h | 2 | ||||
| -rw-r--r-- | nn/runtime/include/NeuralNetworks.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/nn/common/Utils.cpp b/nn/common/Utils.cpp index c3a639bea..abc5de8d1 100644 --- a/nn/common/Utils.cpp +++ b/nn/common/Utils.cpp @@ -215,6 +215,8 @@ const char* kOperationNames[kNumberOfOperationTypes] = { "UNIDIRECTIONAL_SEQUENCE_LSTM", "UNIDIRECTIONAL_SEQUENCE_RNN", "ROTATED_BBOX_TRANSFORM", + "ABS", + "ROI_POOLING", }; static_assert(COUNT(kOperationNames) == kNumberOfOperationTypes, "kOperationNames is incorrect"); diff --git a/nn/common/include/Utils.h b/nn/common/include/Utils.h index 61dba11e3..ce1ce5cd9 100644 --- a/nn/common/include/Utils.h +++ b/nn/common/include/Utils.h @@ -31,7 +31,7 @@ namespace nn { const int kNumberOfDataTypes = 9; // The number of operation types (OperationCode) defined in NeuralNetworks.h. -const int kNumberOfOperationTypes = 88; +const int kNumberOfOperationTypes = 90; // The number of execution preferences defined in NeuralNetworks.h. const int kNumberOfPreferences = 3; diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h index c3329904c..93434f33c 100644 --- a/nn/runtime/include/NeuralNetworks.h +++ b/nn/runtime/include/NeuralNetworks.h @@ -2870,6 +2870,9 @@ typedef enum { * Available since API level 29. */ ANEURALNETWORKS_ROTATED_BBOX_TRANSFORM = 87, + + ANEURALNETWORKS_ABS = 88, + ANEURALNETWORKS_ROI_POOLING = 89, } OperationCode; /** |