summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-04-24 02:25:24 -0500
committerandroid-build-team Robot2018-04-24 02:25:24 -0500
commitbc904e30664ebfe6f1f21fdf7a372be2bf0a2d40 (patch)
tree6cc6c5bbb4920bd6174558e4cb48148f028dd072
parentd89f95414fc715c0e89b4a5da47aa9bd277736a1 (diff)
parenta088ab45707ce6f368f8171a3512197b1b06fbed (diff)
downloadplatform-hardware-interfaces-bc904e30664ebfe6f1f21fdf7a372be2bf0a2d40.tar.gz
platform-hardware-interfaces-bc904e30664ebfe6f1f21fdf7a372be2bf0a2d40.tar.xz
platform-hardware-interfaces-bc904e30664ebfe6f1f21fdf7a372be2bf0a2d40.zip
Snap for 4739962 from a088ab45707ce6f368f8171a3512197b1b06fbed to pi-release
Change-Id: I0d9e26cf72bcc6a4ad21a80fec2fdbdd13aac2bf
-rw-r--r--audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h3
-rw-r--r--audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h5
-rw-r--r--compatibility_matrices/compatibility_matrix.3.xml2
-rw-r--r--dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc1
-rw-r--r--neuralnetworks/1.1/vts/functional/Models.h592
5 files changed, 332 insertions, 271 deletions
diff --git a/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h b/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h
index 313c8c2d..526abbb8 100644
--- a/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h
+++ b/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h
@@ -46,7 +46,8 @@ struct EffectsFactory : public IEffectsFactory {
46 Return<void> getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) override; 46 Return<void> getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) override;
47 Return<void> createEffect(const Uuid& uid, int32_t session, int32_t ioHandle, 47 Return<void> createEffect(const Uuid& uid, int32_t session, int32_t ioHandle,
48 createEffect_cb _hidl_cb) override; 48 createEffect_cb _hidl_cb) override;
49 Return<void> debugDump(const hidl_handle& fd); 49 Return<void> debugDump(const hidl_handle& fd); //< in V2_0::IEffectsFactory only, alias of debug
50 Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& options) override;
50 51
51 private: 52 private:
52 static sp<IEffect> dispatchEffectInstanceCreation(const effect_descriptor_t& halDescriptor, 53 static sp<IEffect> dispatchEffectInstanceCreation(const effect_descriptor_t& halDescriptor,
diff --git a/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h b/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h
index b2a36a96..1882a2c4 100644
--- a/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h
+++ b/audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h
@@ -172,6 +172,11 @@ Return<void> EffectsFactory::createEffect(const Uuid& uid, int32_t session, int3
172} 172}
173 173
174Return<void> EffectsFactory::debugDump(const hidl_handle& fd) { 174Return<void> EffectsFactory::debugDump(const hidl_handle& fd) {
175 return debug(fd, {} /* options */);
176}
177
178Return<void> EffectsFactory::debug(const hidl_handle& fd,
179 const hidl_vec<hidl_string>& /* options */) {
175 if (fd.getNativeHandle() != nullptr && fd->numFds == 1) { 180 if (fd.getNativeHandle() != nullptr && fd->numFds == 1) {
176 EffectDumpEffects(fd->data[0]); 181 EffectDumpEffects(fd->data[0]);
177 } 182 }
diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml
index 6aa5fc51..9bc76ea0 100644
--- a/compatibility_matrices/compatibility_matrix.3.xml
+++ b/compatibility_matrices/compatibility_matrix.3.xml
@@ -266,7 +266,7 @@
266 </hal> 266 </hal>
267 <hal format="hidl" optional="true"> 267 <hal format="hidl" optional="true">
268 <name>android.hardware.nfc</name> 268 <name>android.hardware.nfc</name>
269 <version>1.0-1</version> 269 <version>1.1</version>
270 <interface> 270 <interface>
271 <name>INfc</name> 271 <name>INfc</name>
272 <instance>default</instance> 272 <instance>default</instance>
diff --git a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
index f626f703..dfc7d780 100644
--- a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
+++ b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
@@ -2,3 +2,4 @@ service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-servi
2 class hal 2 class hal
3 user system 3 user system
4 group system 4 group system
5 interface android.hardware.dumpstate@1.0::IDumpstateDevice default
diff --git a/neuralnetworks/1.1/vts/functional/Models.h b/neuralnetworks/1.1/vts/functional/Models.h
index c3cadb5f..7fb26968 100644
--- a/neuralnetworks/1.1/vts/functional/Models.h
+++ b/neuralnetworks/1.1/vts/functional/Models.h
@@ -33,275 +33,329 @@ namespace functional {
33 33
34using MixedTypedExample = generated_tests::MixedTypedExampleType; 34using MixedTypedExample = generated_tests::MixedTypedExampleType;
35 35
36#define FOR_EACH_TEST_MODEL(FN) \ 36#define FOR_EACH_TEST_MODEL(FN) \
37 FN(add) \ 37 FN(add) \
38 FN(add_broadcast_quant8) \ 38 FN(add_broadcast_quant8) \
39 FN(add_quant8) \ 39 FN(add_quant8) \
40 FN(add_relaxed) \ 40 FN(add_relaxed) \
41 FN(avg_pool_float_1) \ 41 FN(avg_pool_float_1) \
42 FN(avg_pool_float_1_relaxed) \ 42 FN(avg_pool_float_1_relaxed) \
43 FN(avg_pool_float_2) \ 43 FN(avg_pool_float_2) \
44 FN(avg_pool_float_2_relaxed) \ 44 FN(avg_pool_float_2_relaxed) \
45 FN(avg_pool_float_3) \ 45 FN(avg_pool_float_3) \
46 FN(avg_pool_float_3_relaxed) \ 46 FN(avg_pool_float_3_relaxed) \
47 FN(avg_pool_float_4) \ 47 FN(avg_pool_float_4) \
48 FN(avg_pool_float_4_relaxed) \ 48 FN(avg_pool_float_4_relaxed) \
49 FN(avg_pool_float_5) \ 49 FN(avg_pool_float_5) \
50 FN(avg_pool_quant8_1) \ 50 FN(avg_pool_float_5_relaxed) \
51 FN(avg_pool_quant8_2) \ 51 FN(avg_pool_quant8_1) \
52 FN(avg_pool_quant8_3) \ 52 FN(avg_pool_quant8_2) \
53 FN(avg_pool_quant8_4) \ 53 FN(avg_pool_quant8_3) \
54 FN(avg_pool_quant8_5) \ 54 FN(avg_pool_quant8_4) \
55 FN(batch_to_space) \ 55 FN(avg_pool_quant8_5) \
56 FN(batch_to_space_float_1) \ 56 FN(batch_to_space) \
57 FN(batch_to_space_quant8_1) \ 57 FN(batch_to_space_float_1) \
58 FN(concat_float_1) \ 58 FN(batch_to_space_float_1_relaxed) \
59 FN(concat_float_1_relaxed) \ 59 FN(batch_to_space_quant8_1) \
60 FN(concat_float_2) \ 60 FN(batch_to_space_relaxed) \
61 FN(concat_float_2_relaxed) \ 61 FN(concat_float_1) \
62 FN(concat_float_3) \ 62 FN(concat_float_1_relaxed) \
63 FN(concat_float_3_relaxed) \ 63 FN(concat_float_2) \
64 FN(concat_quant8_1) \ 64 FN(concat_float_2_relaxed) \
65 FN(concat_quant8_2) \ 65 FN(concat_float_3) \
66 FN(concat_quant8_3) \ 66 FN(concat_float_3_relaxed) \
67 FN(conv_1_h3_w2_SAME) \ 67 FN(concat_quant8_1) \
68 FN(conv_1_h3_w2_SAME_relaxed) \ 68 FN(concat_quant8_2) \
69 FN(conv_1_h3_w2_VALID) \ 69 FN(concat_quant8_3) \
70 FN(conv_1_h3_w2_VALID_relaxed) \ 70 FN(conv_1_h3_w2_SAME) \
71 FN(conv_3_h3_w2_SAME) \ 71 FN(conv_1_h3_w2_SAME_relaxed) \
72 FN(conv_3_h3_w2_SAME_relaxed) \ 72 FN(conv_1_h3_w2_VALID) \
73 FN(conv_3_h3_w2_VALID) \ 73 FN(conv_1_h3_w2_VALID_relaxed) \
74 FN(conv_3_h3_w2_VALID_relaxed) \ 74 FN(conv_3_h3_w2_SAME) \
75 FN(conv_float) \ 75 FN(conv_3_h3_w2_SAME_relaxed) \
76 FN(conv_float_2) \ 76 FN(conv_3_h3_w2_VALID) \
77 FN(conv_float_channels) \ 77 FN(conv_3_h3_w2_VALID_relaxed) \
78 FN(conv_float_channels_relaxed) \ 78 FN(conv_float) \
79 FN(conv_float_channels_weights_as_inputs) \ 79 FN(conv_float_2) \
80 FN(conv_float_channels_weights_as_inputs_relaxed) \ 80 FN(conv_float_2_relaxed) \
81 FN(conv_float_large) \ 81 FN(conv_float_channels) \
82 FN(conv_float_large_relaxed) \ 82 FN(conv_float_channels_relaxed) \
83 FN(conv_float_large_weights_as_inputs) \ 83 FN(conv_float_channels_weights_as_inputs) \
84 FN(conv_float_large_weights_as_inputs_relaxed) \ 84 FN(conv_float_channels_weights_as_inputs_relaxed) \
85 FN(conv_float_relaxed) \ 85 FN(conv_float_large) \
86 FN(conv_float_weights_as_inputs) \ 86 FN(conv_float_large_relaxed) \
87 FN(conv_float_weights_as_inputs_relaxed) \ 87 FN(conv_float_large_weights_as_inputs) \
88 FN(conv_quant8) \ 88 FN(conv_float_large_weights_as_inputs_relaxed) \
89 FN(conv_quant8_2) \ 89 FN(conv_float_relaxed) \
90 FN(conv_quant8_channels) \ 90 FN(conv_float_weights_as_inputs) \
91 FN(conv_quant8_channels_weights_as_inputs) \ 91 FN(conv_float_weights_as_inputs_relaxed) \
92 FN(conv_quant8_large) \ 92 FN(conv_quant8) \
93 FN(conv_quant8_large_weights_as_inputs) \ 93 FN(conv_quant8_2) \
94 FN(conv_quant8_overflow) \ 94 FN(conv_quant8_channels) \
95 FN(conv_quant8_overflow_weights_as_inputs) \ 95 FN(conv_quant8_channels_weights_as_inputs) \
96 FN(conv_quant8_weights_as_inputs) \ 96 FN(conv_quant8_large) \
97 FN(depth_to_space_float_1) \ 97 FN(conv_quant8_large_weights_as_inputs) \
98 FN(depth_to_space_float_1_relaxed) \ 98 FN(conv_quant8_overflow) \
99 FN(depth_to_space_float_2) \ 99 FN(conv_quant8_overflow_weights_as_inputs) \
100 FN(depth_to_space_float_2_relaxed) \ 100 FN(conv_quant8_weights_as_inputs) \
101 FN(depth_to_space_float_3) \ 101 FN(depth_to_space_float_1) \
102 FN(depth_to_space_float_3_relaxed) \ 102 FN(depth_to_space_float_1_relaxed) \
103 FN(depth_to_space_quant8_1) \ 103 FN(depth_to_space_float_2) \
104 FN(depth_to_space_quant8_2) \ 104 FN(depth_to_space_float_2_relaxed) \
105 FN(depthwise_conv) \ 105 FN(depth_to_space_float_3) \
106 FN(depthwise_conv2d_float) \ 106 FN(depth_to_space_float_3_relaxed) \
107 FN(depthwise_conv2d_float_2) \ 107 FN(depth_to_space_quant8_1) \
108 FN(depthwise_conv2d_float_large) \ 108 FN(depth_to_space_quant8_2) \
109 FN(depthwise_conv2d_float_large_2) \ 109 FN(depthwise_conv) \
110 FN(depthwise_conv2d_float_large_2_weights_as_inputs) \ 110 FN(depthwise_conv2d_float) \
111 FN(depthwise_conv2d_float_large_relaxed) \ 111 FN(depthwise_conv2d_float_2) \
112 FN(depthwise_conv2d_float_large_weights_as_inputs) \ 112 FN(depthwise_conv2d_float_2_relaxed) \
113 FN(depthwise_conv2d_float_large_weights_as_inputs_relaxed) \ 113 FN(depthwise_conv2d_float_large) \
114 FN(depthwise_conv2d_float_weights_as_inputs) \ 114 FN(depthwise_conv2d_float_large_2) \
115 FN(depthwise_conv2d_quant8) \ 115 FN(depthwise_conv2d_float_large_2_relaxed) \
116 FN(depthwise_conv2d_quant8_2) \ 116 FN(depthwise_conv2d_float_large_2_weights_as_inputs) \
117 FN(depthwise_conv2d_quant8_large) \ 117 FN(depthwise_conv2d_float_large_2_weights_as_inputs_relaxed) \
118 FN(depthwise_conv2d_quant8_large_weights_as_inputs) \ 118 FN(depthwise_conv2d_float_large_relaxed) \
119 FN(depthwise_conv2d_quant8_weights_as_inputs) \ 119 FN(depthwise_conv2d_float_large_weights_as_inputs) \
120 FN(depthwise_conv_relaxed) \ 120 FN(depthwise_conv2d_float_large_weights_as_inputs_relaxed) \
121 FN(dequantize) \ 121 FN(depthwise_conv2d_float_relaxed) \
122 FN(div) \ 122 FN(depthwise_conv2d_float_weights_as_inputs) \
123 FN(embedding_lookup) \ 123 FN(depthwise_conv2d_float_weights_as_inputs_relaxed) \
124 FN(embedding_lookup_relaxed) \ 124 FN(depthwise_conv2d_quant8) \
125 FN(floor) \ 125 FN(depthwise_conv2d_quant8_2) \
126 FN(floor_relaxed) \ 126 FN(depthwise_conv2d_quant8_large) \
127 FN(fully_connected_float) \ 127 FN(depthwise_conv2d_quant8_large_weights_as_inputs) \
128 FN(fully_connected_float_2) \ 128 FN(depthwise_conv2d_quant8_weights_as_inputs) \
129 FN(fully_connected_float_large) \ 129 FN(depthwise_conv_relaxed) \
130 FN(fully_connected_float_large_weights_as_inputs) \ 130 FN(dequantize) \
131 FN(fully_connected_float_relaxed) \ 131 FN(dequantize_relaxed) \
132 FN(fully_connected_float_weights_as_inputs) \ 132 FN(div) \
133 FN(fully_connected_float_weights_as_inputs_relaxed) \ 133 FN(div_broadcast_float) \
134 FN(fully_connected_quant8) \ 134 FN(div_broadcast_float_relaxed) \
135 FN(fully_connected_quant8_2) \ 135 FN(div_relaxed) \
136 FN(fully_connected_quant8_large) \ 136 FN(embedding_lookup) \
137 FN(fully_connected_quant8_large_weights_as_inputs) \ 137 FN(embedding_lookup_relaxed) \
138 FN(fully_connected_quant8_weights_as_inputs) \ 138 FN(floor) \
139 FN(hashtable_lookup_float) \ 139 FN(floor_relaxed) \
140 FN(hashtable_lookup_float_relaxed) \ 140 FN(fully_connected_float) \
141 FN(hashtable_lookup_quant8) \ 141 FN(fully_connected_float_2) \
142 FN(l2_normalization) \ 142 FN(fully_connected_float_2_relaxed) \
143 FN(l2_normalization_2) \ 143 FN(fully_connected_float_4d_simple) \
144 FN(l2_normalization_large) \ 144 FN(fully_connected_float_4d_simple_relaxed) \
145 FN(l2_normalization_large_relaxed) \ 145 FN(fully_connected_float_large) \
146 FN(l2_normalization_relaxed) \ 146 FN(fully_connected_float_large_relaxed) \
147 FN(l2_pool_float) \ 147 FN(fully_connected_float_large_weights_as_inputs) \
148 FN(l2_pool_float_2) \ 148 FN(fully_connected_float_large_weights_as_inputs_relaxed) \
149 FN(l2_pool_float_large) \ 149 FN(fully_connected_float_relaxed) \
150 FN(l2_pool_float_relaxed) \ 150 FN(fully_connected_float_weights_as_inputs) \
151 FN(local_response_norm_float_1) \ 151 FN(fully_connected_float_weights_as_inputs_relaxed) \
152 FN(local_response_norm_float_1_relaxed) \ 152 FN(fully_connected_quant8) \
153 FN(local_response_norm_float_2) \ 153 FN(fully_connected_quant8_2) \
154 FN(local_response_norm_float_2_relaxed) \ 154 FN(fully_connected_quant8_large) \
155 FN(local_response_norm_float_3) \ 155 FN(fully_connected_quant8_large_weights_as_inputs) \
156 FN(local_response_norm_float_3_relaxed) \ 156 FN(fully_connected_quant8_weights_as_inputs) \
157 FN(local_response_norm_float_4) \ 157 FN(hashtable_lookup_float) \
158 FN(local_response_norm_float_4_relaxed) \ 158 FN(hashtable_lookup_float_relaxed) \
159 FN(logistic_float_1) \ 159 FN(hashtable_lookup_quant8) \
160 FN(logistic_float_1_relaxed) \ 160 FN(l2_normalization) \
161 FN(logistic_float_2) \ 161 FN(l2_normalization_2) \
162 FN(logistic_float_2_relaxed) \ 162 FN(l2_normalization_2_relaxed) \
163 FN(logistic_quant8_1) \ 163 FN(l2_normalization_large) \
164 FN(logistic_quant8_2) \ 164 FN(l2_normalization_large_relaxed) \
165 FN(lsh_projection) \ 165 FN(l2_normalization_relaxed) \
166 FN(lsh_projection_2) \ 166 FN(l2_pool_float) \
167 FN(lsh_projection_2_relaxed) \ 167 FN(l2_pool_float_2) \
168 FN(lsh_projection_relaxed) \ 168 FN(l2_pool_float_2_relaxed) \
169 FN(lsh_projection_weights_as_inputs) \ 169 FN(l2_pool_float_large) \
170 FN(lsh_projection_weights_as_inputs_relaxed) \ 170 FN(l2_pool_float_large_relaxed) \
171 FN(lstm) \ 171 FN(l2_pool_float_relaxed) \
172 FN(lstm2) \ 172 FN(local_response_norm_float_1) \
173 FN(lstm2_relaxed) \ 173 FN(local_response_norm_float_1_relaxed) \
174 FN(lstm2_state) \ 174 FN(local_response_norm_float_2) \
175 FN(lstm2_state2) \ 175 FN(local_response_norm_float_2_relaxed) \
176 FN(lstm2_state2_relaxed) \ 176 FN(local_response_norm_float_3) \
177 FN(lstm2_state_relaxed) \ 177 FN(local_response_norm_float_3_relaxed) \
178 FN(lstm3) \ 178 FN(local_response_norm_float_4) \
179 FN(lstm3_relaxed) \ 179 FN(local_response_norm_float_4_relaxed) \
180 FN(lstm3_state) \ 180 FN(logistic_float_1) \
181 FN(lstm3_state2) \ 181 FN(logistic_float_1_relaxed) \
182 FN(lstm3_state2_relaxed) \ 182 FN(logistic_float_2) \
183 FN(lstm3_state3) \ 183 FN(logistic_float_2_relaxed) \
184 FN(lstm3_state3_relaxed) \ 184 FN(logistic_quant8_1) \
185 FN(lstm3_state_relaxed) \ 185 FN(logistic_quant8_2) \
186 FN(lstm_relaxed) \ 186 FN(lsh_projection) \
187 FN(lstm_state) \ 187 FN(lsh_projection_2) \
188 FN(lstm_state2) \ 188 FN(lsh_projection_2_relaxed) \
189 FN(lstm_state2_relaxed) \ 189 FN(lsh_projection_relaxed) \
190 FN(lstm_state_relaxed) \ 190 FN(lsh_projection_weights_as_inputs) \
191 FN(max_pool_float_1) \ 191 FN(lsh_projection_weights_as_inputs_relaxed) \
192 FN(max_pool_float_1_relaxed) \ 192 FN(lstm) \
193 FN(max_pool_float_2) \ 193 FN(lstm2) \
194 FN(max_pool_float_2_relaxed) \ 194 FN(lstm2_relaxed) \
195 FN(max_pool_float_3) \ 195 FN(lstm2_state) \
196 FN(max_pool_float_3_relaxed) \ 196 FN(lstm2_state2) \
197 FN(max_pool_float_4) \ 197 FN(lstm2_state2_relaxed) \
198 FN(max_pool_quant8_1) \ 198 FN(lstm2_state_relaxed) \
199 FN(max_pool_quant8_2) \ 199 FN(lstm3) \
200 FN(max_pool_quant8_3) \ 200 FN(lstm3_relaxed) \
201 FN(max_pool_quant8_4) \ 201 FN(lstm3_state) \
202 FN(mean) \ 202 FN(lstm3_state2) \
203 FN(mean_float_1) \ 203 FN(lstm3_state2_relaxed) \
204 FN(mean_float_2) \ 204 FN(lstm3_state3) \
205 FN(mean_quant8_1) \ 205 FN(lstm3_state3_relaxed) \
206 FN(mean_quant8_2) \ 206 FN(lstm3_state_relaxed) \
207 FN(mobilenet_224_gender_basic_fixed) \ 207 FN(lstm_relaxed) \
208 FN(mobilenet_224_gender_basic_fixed_relaxed) \ 208 FN(lstm_state) \
209 FN(mobilenet_quantized) \ 209 FN(lstm_state2) \
210 FN(mul) \ 210 FN(lstm_state2_relaxed) \
211 FN(mul_broadcast_quant8) \ 211 FN(lstm_state_relaxed) \
212 FN(mul_quant8) \ 212 FN(max_pool_float_1) \
213 FN(mul_relaxed) \ 213 FN(max_pool_float_1_relaxed) \
214 FN(mul_relu) \ 214 FN(max_pool_float_2) \
215 FN(mul_relu_relaxed) \ 215 FN(max_pool_float_2_relaxed) \
216 FN(pad) \ 216 FN(max_pool_float_3) \
217 FN(pad_float_1) \ 217 FN(max_pool_float_3_relaxed) \
218 FN(relu1_float_1) \ 218 FN(max_pool_float_4) \
219 FN(relu1_float_1_relaxed) \ 219 FN(max_pool_float_4_relaxed) \
220 FN(relu1_float_2) \ 220 FN(max_pool_quant8_1) \
221 FN(relu1_float_2_relaxed) \ 221 FN(max_pool_quant8_2) \
222 FN(relu1_quant8_1) \ 222 FN(max_pool_quant8_3) \
223 FN(relu1_quant8_2) \ 223 FN(max_pool_quant8_4) \
224 FN(relu6_float_1) \ 224 FN(mean) \
225 FN(relu6_float_1_relaxed) \ 225 FN(mean_float_1) \
226 FN(relu6_float_2) \ 226 FN(mean_float_1_relaxed) \
227 FN(relu6_float_2_relaxed) \ 227 FN(mean_float_2) \
228 FN(relu6_quant8_1) \ 228 FN(mean_float_2_relaxed) \
229 FN(relu6_quant8_2) \ 229 FN(mean_quant8_1) \
230 FN(relu_float_1) \ 230 FN(mean_quant8_2) \
231 FN(relu_float_1_relaxed) \ 231 FN(mean_relaxed) \
232 FN(relu_float_2) \ 232 FN(mobilenet_224_gender_basic_fixed) \
233 FN(relu_quant8_1) \ 233 FN(mobilenet_224_gender_basic_fixed_relaxed) \
234 FN(relu_quant8_2) \ 234 FN(mobilenet_quantized) \
235 FN(reshape) \ 235 FN(mul) \
236 FN(reshape_quant8) \ 236 FN(mul_broadcast_quant8) \
237 FN(reshape_quant8_weights_as_inputs) \ 237 FN(mul_quant8) \
238 FN(reshape_relaxed) \ 238 FN(mul_relaxed) \
239 FN(reshape_weights_as_inputs) \ 239 FN(mul_relu) \
240 FN(reshape_weights_as_inputs_relaxed) \ 240 FN(mul_relu_relaxed) \
241 FN(resize_bilinear) \ 241 FN(pad) \
242 FN(resize_bilinear_2) \ 242 FN(pad_float_1) \
243 FN(resize_bilinear_relaxed) \ 243 FN(pad_float_1_relaxed) \
244 FN(rnn) \ 244 FN(pad_relaxed) \
245 FN(rnn_relaxed) \ 245 FN(relu1_float_1) \
246 FN(rnn_state) \ 246 FN(relu1_float_1_relaxed) \
247 FN(rnn_state_relaxed) \ 247 FN(relu1_float_2) \
248 FN(softmax_float_1) \ 248 FN(relu1_float_2_relaxed) \
249 FN(softmax_float_1_relaxed) \ 249 FN(relu1_quant8_1) \
250 FN(softmax_float_2) \ 250 FN(relu1_quant8_2) \
251 FN(softmax_float_2_relaxed) \ 251 FN(relu6_float_1) \
252 FN(softmax_quant8_1) \ 252 FN(relu6_float_1_relaxed) \
253 FN(softmax_quant8_2) \ 253 FN(relu6_float_2) \
254 FN(space_to_batch) \ 254 FN(relu6_float_2_relaxed) \
255 FN(space_to_batch_float_1) \ 255 FN(relu6_quant8_1) \
256 FN(space_to_batch_float_2) \ 256 FN(relu6_quant8_2) \
257 FN(space_to_batch_float_3) \ 257 FN(relu_float_1) \
258 FN(space_to_batch_quant8_1) \ 258 FN(relu_float_1_relaxed) \
259 FN(space_to_batch_quant8_2) \ 259 FN(relu_float_2) \
260 FN(space_to_batch_quant8_3) \ 260 FN(relu_float_2_relaxed) \
261 FN(space_to_depth_float_1) \ 261 FN(relu_quant8_1) \
262 FN(space_to_depth_float_1_relaxed) \ 262 FN(relu_quant8_2) \
263 FN(space_to_depth_float_2) \ 263 FN(reshape) \
264 FN(space_to_depth_float_2_relaxed) \ 264 FN(reshape_quant8) \
265 FN(space_to_depth_float_3) \ 265 FN(reshape_quant8_weights_as_inputs) \
266 FN(space_to_depth_float_3_relaxed) \ 266 FN(reshape_relaxed) \
267 FN(space_to_depth_quant8_1) \ 267 FN(reshape_weights_as_inputs) \
268 FN(space_to_depth_quant8_2) \ 268 FN(reshape_weights_as_inputs_relaxed) \
269 FN(squeeze) \ 269 FN(resize_bilinear) \
270 FN(squeeze_float_1) \ 270 FN(resize_bilinear_2) \
271 FN(squeeze_quant8_1) \ 271 FN(resize_bilinear_2_relaxed) \
272 FN(strided_slice) \ 272 FN(resize_bilinear_relaxed) \
273 FN(strided_slice_float_1) \ 273 FN(rnn) \
274 FN(strided_slice_float_10) \ 274 FN(rnn_relaxed) \
275 FN(strided_slice_float_2) \ 275 FN(rnn_state) \
276 FN(strided_slice_float_3) \ 276 FN(rnn_state_relaxed) \
277 FN(strided_slice_float_4) \ 277 FN(softmax_float_1) \
278 FN(strided_slice_float_5) \ 278 FN(softmax_float_1_relaxed) \
279 FN(strided_slice_float_6) \ 279 FN(softmax_float_2) \
280 FN(strided_slice_float_7) \ 280 FN(softmax_float_2_relaxed) \
281 FN(strided_slice_float_8) \ 281 FN(softmax_quant8_1) \
282 FN(strided_slice_float_9) \ 282 FN(softmax_quant8_2) \
283 FN(strided_slice_qaunt8_10) \ 283 FN(space_to_batch) \
284 FN(strided_slice_quant8_1) \ 284 FN(space_to_batch_float_1) \
285 FN(strided_slice_quant8_2) \ 285 FN(space_to_batch_float_1_relaxed) \
286 FN(strided_slice_quant8_3) \ 286 FN(space_to_batch_float_2) \
287 FN(strided_slice_quant8_4) \ 287 FN(space_to_batch_float_2_relaxed) \
288 FN(strided_slice_quant8_5) \ 288 FN(space_to_batch_float_3) \
289 FN(strided_slice_quant8_6) \ 289 FN(space_to_batch_float_3_relaxed) \
290 FN(strided_slice_quant8_7) \ 290 FN(space_to_batch_quant8_1) \
291 FN(strided_slice_quant8_8) \ 291 FN(space_to_batch_quant8_2) \
292 FN(strided_slice_quant8_9) \ 292 FN(space_to_batch_quant8_3) \
293 FN(sub) \ 293 FN(space_to_batch_relaxed) \
294 FN(svdf) \ 294 FN(space_to_depth_float_1) \
295 FN(svdf2) \ 295 FN(space_to_depth_float_1_relaxed) \
296 FN(svdf2_relaxed) \ 296 FN(space_to_depth_float_2) \
297 FN(svdf_relaxed) \ 297 FN(space_to_depth_float_2_relaxed) \
298 FN(svdf_state) \ 298 FN(space_to_depth_float_3) \
299 FN(svdf_state_relaxed) \ 299 FN(space_to_depth_float_3_relaxed) \
300 FN(tanh) \ 300 FN(space_to_depth_quant8_1) \
301 FN(tanh_relaxed) \ 301 FN(space_to_depth_quant8_2) \
302 FN(transpose) \ 302 FN(squeeze) \
303 FN(transpose_float_1) \ 303 FN(squeeze_float_1) \
304 FN(transpose_quant8_1) 304 FN(squeeze_float_1_relaxed) \
305 FN(squeeze_quant8_1) \
306 FN(squeeze_relaxed) \
307 FN(strided_slice) \
308 FN(strided_slice_float_1) \
309 FN(strided_slice_float_10) \
310 FN(strided_slice_float_10_relaxed) \
311 FN(strided_slice_float_11) \
312 FN(strided_slice_float_11_relaxed) \
313 FN(strided_slice_float_1_relaxed) \
314 FN(strided_slice_float_2) \
315 FN(strided_slice_float_2_relaxed) \
316 FN(strided_slice_float_3) \
317 FN(strided_slice_float_3_relaxed) \
318 FN(strided_slice_float_4) \
319 FN(strided_slice_float_4_relaxed) \
320 FN(strided_slice_float_5) \
321 FN(strided_slice_float_5_relaxed) \
322 FN(strided_slice_float_6) \
323 FN(strided_slice_float_6_relaxed) \
324 FN(strided_slice_float_7) \
325 FN(strided_slice_float_7_relaxed) \
326 FN(strided_slice_float_8) \
327 FN(strided_slice_float_8_relaxed) \
328 FN(strided_slice_float_9) \
329 FN(strided_slice_float_9_relaxed) \
330 FN(strided_slice_qaunt8_10) \
331 FN(strided_slice_qaunt8_11) \
332 FN(strided_slice_quant8_1) \
333 FN(strided_slice_quant8_2) \
334 FN(strided_slice_quant8_3) \
335 FN(strided_slice_quant8_4) \
336 FN(strided_slice_quant8_5) \
337 FN(strided_slice_quant8_6) \
338 FN(strided_slice_quant8_7) \
339 FN(strided_slice_quant8_8) \
340 FN(strided_slice_quant8_9) \
341 FN(strided_slice_relaxed) \
342 FN(sub) \
343 FN(sub_broadcast_float) \
344 FN(sub_broadcast_float_relaxed) \
345 FN(sub_relaxed) \
346 FN(svdf) \
347 FN(svdf2) \
348 FN(svdf2_relaxed) \
349 FN(svdf_relaxed) \
350 FN(svdf_state) \
351 FN(svdf_state_relaxed) \
352 FN(tanh) \
353 FN(tanh_relaxed) \
354 FN(transpose) \
355 FN(transpose_float_1) \
356 FN(transpose_float_1_relaxed) \
357 FN(transpose_quant8_1) \
358 FN(transpose_relaxed)
305 359
306#define FORWARD_DECLARE_GENERATED_OBJECTS(function) \ 360#define FORWARD_DECLARE_GENERATED_OBJECTS(function) \
307 namespace function { \ 361 namespace function { \