55cef2193279a646292fdeb355399627dd8990c8 - platform/frameworks/ml

commit	55cef2193279a646292fdeb355399627dd8990c8	[log] [tgz]
author	Miao Wang <miaowang@google.com>	Fri Sep 08 16:51:10 2017 -0700
committer	Miao Wang <miaowang@google.com>	Sat Sep 09 11:43:05 2017 -0700
tree	14630088bc6b46e621cbccadb7ab99a327c4e056
parent	fce2d202e5dd6f4b2193d84d8726ff4ba86e2fc8 [diff]

Explicitly add "_2D" to applicable ops, and add fused activation
function enum.

  - Add the fused activation enum to explicitly set the expectation that
    only the included ones are supported for fused ops.
  - Add "_2D" to CONV, DEPTHWISE_CONV, AVG_POOL, MAX_POOL, and L2_POOL,
    since they are only supposed to do 2D computation.
  - Updated the tests and the stack to plumbing the changes through.

Bug: 63905942
Test: mm
Test: NeuralNetworksTests pass for both CPU path and sample hidl driver.
Change-Id: I60aeabab1d193d26d938c0d1d3ffdd519740d222

nn/common/CpuExecutor.cpp[diff]
nn/common/Utils.cpp[diff]
nn/common/include/HalInterfaces.h[diff]
nn/common/include/OperationsUtils.h[diff]
nn/common/include/Utils.h[diff]
nn/common/operations/Concatenation.cpp[diff]
nn/common/operations/Conv2D.cpp[diff]
nn/common/operations/DepthwiseConv2D.cpp[diff]
nn/common/operations/FullyConnected.cpp[diff]
nn/common/operations/Pooling.cpp[diff]
nn/common/operations/SimpleMath.cpp[diff]
nn/driver/sample/SampleDriver.cpp[diff]
nn/runtime/NeuralNetworks.cpp[diff]
nn/runtime/include/NeuralNetworks.h[diff]
nn/runtime/test/TestTrivialModel.cpp[diff]
nn/runtime/test/TestValidation.cpp[diff]
nn/runtime/test/generated/models/avg_pool_float.model.cpp[diff]
nn/runtime/test/generated/models/avg_pool_quant8.model.cpp[diff]
nn/runtime/test/generated/models/conv_1_h3_w2_SAME.model.cpp[diff]
nn/runtime/test/generated/models/conv_1_h3_w2_VALID.model.cpp[diff]
nn/runtime/test/generated/models/conv_3_h3_w2_SAME.model.cpp[diff]
nn/runtime/test/generated/models/conv_3_h3_w2_VALID.model.cpp[diff]
nn/runtime/test/generated/models/depthwise_conv.model.cpp[diff]
nn/runtime/test/generated/models/l2_pool_float.model.cpp[diff]
nn/runtime/test/generated/models/max_pool_float.model.cpp[diff]
nn/runtime/test/generated/models/mobilenet_224_gender_basic_fixed.model.cpp[diff]
nn/tools/test_generator/test_generator.py[diff]

27 files changed

tree: 14630088bc6b46e621cbccadb7ab99a327c4e056

nn/
Android.bp