aboutsummaryrefslogtreecommitdiff
path: root/shim/sl/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'shim/sl/CMakeLists.txt')
-rw-r--r--shim/sl/CMakeLists.txt134
1 files changed, 75 insertions, 59 deletions
diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt
index 6c2d393fb9..3ce4b30c5f 100644
--- a/shim/sl/CMakeLists.txt
+++ b/shim/sl/CMakeLists.txt
@@ -9,7 +9,9 @@ include(GNUInstallDirs)
SET(libnnapi_support_include_directories)
list(APPEND libnnapi_support_include_directories
- aosp/packages/modules/NeuralNetworks/common/include/nnapi
+ aosp/packages/modules/NeuralNetworks/common/types/include/nnapi/
+ aosp/packages/modules/NeuralNetworks/common/types/include/
+ aosp/packages/modules/NeuralNetworks/common/operations/
aosp/packages/modules/NeuralNetworks/common/include
aosp/packages/modules/NeuralNetworks/runtime/include
aosp/packages/modules/NeuralNetworks/shim_and_sl/public
@@ -18,6 +20,10 @@ list(APPEND libnnapi_support_include_directories
aosp/frameworks/native/libs/nativewindow/include
aosp/system/core/libcutils/include
aosp/system/core/include
+ aosp/external/tensorflow
+ aosp/external/gemmlowp/
+ aosp/external/ruy/
+ aosp/external/eigen/
aosp/external/boringssl/include)
include_directories(${libnnapi_support_include_directories})
@@ -27,10 +33,11 @@ link_directories( ${ARMNN_SOURCE_DIR}/shim/sl/build )
set(base_sources)
list(APPEND base_sources
aosp/system/libbase/abi_compatibility.cpp
+ aosp/system/libbase/posix_strerror_r.cpp
aosp/system/libbase/chrono_utils.cpp
aosp/system/libbase/cmsg.cpp
aosp/system/libbase/file.cpp
-# aosp/system/libbase/hex.cpp # needed in AOSP Master FL7
+ aosp/system/libbase/hex.cpp
aosp/system/libbase/logging.cpp
aosp/system/libbase/mapped_file.cpp
aosp/system/libbase/parsebool.cpp
@@ -45,14 +52,20 @@ add_library(base STATIC ${base_sources})
target_include_directories (base PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (base PUBLIC ${libnnapi_support_include_directories})
+file(GLOB TYPES_CL_SOURCE_FILES
+ aosp/packages/modules/NeuralNetworks/common/operations/*Validation.cpp
+)
+
set(neuralnetworks_types_cl_sources)
list(APPEND neuralnetworks_types_cl_sources
- aosp/packages/modules/NeuralNetworks/common/DynamicCLDeps.cpp
- aosp/packages/modules/NeuralNetworks/common/SharedMemory.cpp
- aosp/packages/modules/NeuralNetworks/common/SharedMemoryAndroid.cpp
- aosp/packages/modules/NeuralNetworks/common/TypeUtils.cpp
- aosp/packages/modules/NeuralNetworks/common/Types.cpp
- aosp/packages/modules/NeuralNetworks/common/Validation.cpp)
+ aosp/packages/modules/NeuralNetworks/common/types/src/DynamicCLDeps.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/SharedMemory.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/SharedMemoryAndroid.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/TypeUtils.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/OperationsValidationUtils.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/Types.cpp
+ ${TYPES_CL_SOURCE_FILES}
+ aosp/packages/modules/NeuralNetworks/common/types/src/Validation.cpp)
add_library(neuralnetworks_types_cl STATIC ${neuralnetworks_types_cl_sources})
target_include_directories (neuralnetworks_types_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -65,57 +78,59 @@ list(APPEND neuralnetworks_common_cl_sources
aosp/packages/modules/NeuralNetworks/common/GraphDump.cpp
aosp/packages/modules/NeuralNetworks/common/IndexedShapeWrapper.cpp
aosp/packages/modules/NeuralNetworks/common/LegacyUtils.cpp
+ aosp/packages/modules/NeuralNetworks/common/ModelUtils.cpp
aosp/packages/modules/NeuralNetworks/common/MetaModel.cpp
- aosp/packages/modules/NeuralNetworks/common/OperationsUtils.cpp
+ aosp/packages/modules/NeuralNetworks/common/OperationsExecutionUtils.cpp
+ aosp/packages/modules/NeuralNetworks/common/types/src/OperationsUtils.cpp
aosp/packages/modules/NeuralNetworks/common/TokenHasher.cpp
aosp/packages/modules/NeuralNetworks/common/OperationResolver.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Activation.cpp
-# aosp/packages/modules/NeuralNetworks/common/operations/BatchMatmul.cpp # needed in AOSP Master FL7
- aosp/packages/modules/NeuralNetworks/common/operations/BidirectionalSequenceRNN.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Broadcast.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/ChannelShuffle.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Comparisons.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Concatenation.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Conv2D.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/DepthwiseConv2D.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Dequantize.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Elementwise.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Elu.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Fill.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/FullyConnected.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Gather.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/GenerateProposals.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/HeatmapMaxKeypoint.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/InstanceNormalization.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/L2Normalization.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/LocalResponseNormalization.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/LogSoftmax.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/LogicalAndOr.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/LogicalNot.cpp
-# aosp/packages/modules/NeuralNetworks/common/operations/MirrorPad.cpp #needed in AOSP Master FL7
- aosp/packages/modules/NeuralNetworks/common/operations/Neg.cpp
-# aosp/packages/modules/NeuralNetworks/common/operations/Pack.cpp #needed in AOSP Master FL7
- aosp/packages/modules/NeuralNetworks/common/operations/PRelu.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Pooling.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/QLSTM.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Quantize.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Rank.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Reduce.cpp
-# aosp/packages/modules/NeuralNetworks/common/operations/Reshape.cpp #needed in AOSP Master FL7
-# aosp/packages/modules/NeuralNetworks/common/operations/Reverse.cpp #needed in AOSP Master FL7
- aosp/packages/modules/NeuralNetworks/common/operations/ResizeImageOps.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/RoiAlign.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/RoiPooling.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Select.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Slice.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Softmax.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Squeeze.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/StridedSlice.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/TopK_V2.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/Transpose.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/TransposeConv2D.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceLSTM.cpp
- aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceRNN.cpp)
+ aosp/packages/modules/NeuralNetworks/common/operations/ActivationExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/BatchMatmulExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/BidirectionalSequenceRNNExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/BroadcastExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ChannelShuffleExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ComparisonsExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ConcatenationExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/Conv2DExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/DepthwiseConv2DExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/DequantizeExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ElementwiseExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/EluExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/FillExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/FullyConnectedExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/GatherExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/GenerateProposalsExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/HeatmapMaxKeypointExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/InstanceNormalizationExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/L2NormalizationExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/LocalResponseNormalizationExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/LogSoftmaxExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/LogicalAndOrExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/LogicalNotExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/MirrorPadExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/NegExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/PackExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/PReluExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/PoolingExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/QLSTMExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/QuantizeExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/RankExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ReduceExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ReshapeExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ReverseExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/ResizeImageOpsExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/RoiAlignExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/RoiPoolingExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/SelectExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/SliceExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/SoftmaxExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/SqueezeExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/StridedSliceExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/TopK_V2Execution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/TransposeExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/TransposeConv2DExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceLSTMExecution.cpp
+ aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceRNNExecution.cpp)
add_library(neuralnetworks_common_cl STATIC ${neuralnetworks_common_cl_sources})
target_include_directories (neuralnetworks_common_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -128,14 +143,15 @@ list(APPEND neuralnetworks_cl_sources
aosp/packages/modules/NeuralNetworks/runtime/ExecutionBuilder.cpp
aosp/packages/modules/NeuralNetworks/runtime/ExecutionCallback.cpp
aosp/packages/modules/NeuralNetworks/runtime/ExecutionPlan.cpp
+ aosp/packages/modules/NeuralNetworks/runtime/ServerFlag.cpp
aosp/packages/modules/NeuralNetworks/runtime/Manager.cpp
aosp/packages/modules/NeuralNetworks/runtime/Memory.cpp
-# aosp/packages/modules/NeuralNetworks/runtime/ModelArchHasher.cpp #needed in AOSP Master FL7
+ aosp/packages/modules/NeuralNetworks/runtime/ModelArchHasher.cpp
aosp/packages/modules/NeuralNetworks/runtime/ModelArgumentInfo.cpp
aosp/packages/modules/NeuralNetworks/runtime/ModelBuilder.cpp
aosp/packages/modules/NeuralNetworks/runtime/NeuralNetworks.cpp
-# aosp/packages/modules/NeuralNetworks/runtime/SupportLibraryDiagnostic.cpp #needed in AOSP Master FL7
-# aosp/packages/modules/NeuralNetworks/runtime/Telemetry.cpp #needed in AOSP Master FL7
+ aosp/packages/modules/NeuralNetworks/runtime/SupportLibraryDiagnostic.cpp
+ aosp/packages/modules/NeuralNetworks/runtime/Telemetry.cpp
aosp/packages/modules/NeuralNetworks/runtime/TypeManager.cpp)
add_library(neuralnetworks_cl OBJECT ${neuralnetworks_cl_sources})