projects / platform / upstream / armnn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Correct TuningLevel enumeration values
[platform/upstream/armnn.git] / CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b013828..b236340 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ project(armnn)
 set(additional_cmake_files)
 list(APPEND additional_cmake_files
     cmake/ArmnnVersion.cmake
+    cmake/DelegateVersion.cmake
+    cmake/ParserVersion.cmake
     cmake/Utils.cmake
     cmake/GlobalConfig.cmake
     cmake/AddDllCopyCommands.cmake)
@@ -17,6 +19,16 @@ foreach(cmake_file ${additional_cmake_files})
     include(${cmake_file})
 endforeach()
 
+cmake_policy(SET CMP0057 NEW)
+
+set(as_subproject Armnn)
+
+macro(find_package)
+    if(NOT ${ARGV0} IN_LIST as_subproject)
+        _find_package(${ARGV})
+    endif()
+endmacro()
+
 if (DYNAMIC_BACKEND_PATHS)
     # It's expected to have the format: DYNAMIC_BACKEND_PATHS="PATH_1:PATH_2...:PATH_N"
     add_definitions('-DDYNAMIC_BACKEND_PATHS="${DYNAMIC_BACKEND_PATHS}"')
@@ -27,6 +39,14 @@ include(GNUInstallDirs)
 add_subdirectory(samples)
 add_subdirectory(src/armnnTfLiteParser)
 add_subdirectory(src/armnnSerializer)
+add_subdirectory(src/armnnDeserializer)
+
+
+if (BUILD_ARMNN_TFLITE_DELEGATE)
+    set(ARMNN_SUB_PROJECT ON)
+    add_subdirectory(delegate)
+    add_definitions(-DARMNN_TF_LITE_DELEGATE)
+endif()
 
 if (BUILD_TESTS)
     add_subdirectory(tests)
@@ -39,6 +59,7 @@ set(armnnUtils_sources)
 list(APPEND armnnUtils_sources
     include/armnnUtils/DataLayoutIndexed.hpp
     include/armnnUtils/Permute.hpp
+    include/armnnUtils/FloatingPointComparison.hpp
     include/armnnUtils/FloatingPointConverter.hpp
     include/armnnUtils/TensorUtils.hpp
     include/armnnUtils/Transpose.hpp
@@ -57,8 +78,6 @@ list(APPEND armnnUtils_sources
     src/armnnUtils/LeakChecking.hpp
     src/armnnUtils/ModelAccuracyChecker.cpp
     src/armnnUtils/ModelAccuracyChecker.hpp
-    src/armnnUtils/CsvReader.cpp
-    src/armnnUtils/CsvReader.hpp
     src/armnnUtils/FloatingPointConverter.cpp
     src/armnnUtils/VerificationHelpers.hpp
     src/armnnUtils/VerificationHelpers.cpp
@@ -85,6 +104,7 @@ if(BUILD_CAFFE_PARSER)
     set(armnn_caffe_parser_sources)
     list(APPEND armnn_caffe_parser_sources
         include/armnnCaffeParser/ICaffeParser.hpp
+        include/armnnCaffeParser/Version.hpp
         src/armnnCaffeParser/RecordByRecordCaffeParser.hpp
         src/armnnCaffeParser/RecordByRecordCaffeParser.cpp
         src/armnnCaffeParser/CaffeParser.hpp
@@ -101,11 +121,9 @@ if(BUILD_CAFFE_PARSER)
 
     target_include_directories(armnnCaffeParser PRIVATE src/armnnUtils)
 
-    target_link_libraries(armnnCaffeParser ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
-
     target_link_libraries(armnnCaffeParser armnn)
     target_link_libraries(armnnCaffeParser ${PROTOBUF_LIBRARIES})
-    set_target_properties(armnnCaffeParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+    set_target_properties(armnnCaffeParser PROPERTIES VERSION ${CAFFE_PARSER_LIB_VERSION} SOVERSION ${CAFFE_PARSER_LIB_SOVERSION})
 
 endif()
 
@@ -113,6 +131,7 @@ if(BUILD_ONNX_PARSER)
     set(armnn_onnx_parser_sources)
     list(APPEND armnn_onnx_parser_sources
         include/armnnOnnxParser/IOnnxParser.hpp
+        include/armnnOnnxParser/Version.hpp
         src/armnnOnnxParser/OnnxParser.hpp
         src/armnnOnnxParser/OnnxParser.cpp
         ${ONNX_GENERATED_SOURCES}/onnx/onnx.pb.cc
@@ -130,20 +149,21 @@ if(BUILD_ONNX_PARSER)
 
     # Protobuf
     target_link_libraries(armnnOnnxParser ${PROTOBUF_LIBRARIES})
-    set_target_properties(armnnOnnxParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+    set_target_properties(armnnOnnxParser PROPERTIES VERSION ${ONNX_PARSER_LIB_VERSION} SOVERSION ${ONNX_PARSER_LIB_SOVERSION})
 endif()
 
 if(BUILD_TF_PARSER)
     set(armnn_tf_parser_sources)
     list(APPEND armnn_tf_parser_sources
         include/armnnTfParser/ITfParser.hpp
+        include/armnnTfParser/Version.hpp
         src/armnnTfParser/TfParser.hpp
         src/armnnTfParser/TfParser.cpp
         ${TF_PROTOBUFS}
         )
     # The generated tensorflow protobuf .cc files are not warning clean and we can't fix them.
     if(COMPILER_IS_GNU_LIKE)
-        set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion")
+        set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion  -Wno-error=deprecated-declarations")
     endif()
 
     add_library_ex(armnnTfParser SHARED ${armnn_tf_parser_sources})
@@ -154,7 +174,7 @@ if(BUILD_TF_PARSER)
 
     # Protobuf (use the specific version tensorflow wants)
     target_link_libraries(armnnTfParser ${PROTOBUF_LIBRARIES})
-    set_target_properties(armnnTfParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+    set_target_properties(armnnTfParser PROPERTIES VERSION ${TF_PARSER_LIB_VERSION} SOVERSION ${TF_PARSER_LIB_SOVERSION})
 endif()
 
 if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
@@ -177,29 +197,25 @@ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
     target_include_directories(armnnQuantizer PRIVATE include/armnnDeserializer)
     target_include_directories(armnnQuantizer PRIVATE src/armnnUtils)
     target_include_directories(armnnQuantizer PRIVATE src/armnn)
+    target_include_directories(armnnQuantizer PRIVATE third-party)
 
     include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
     set_target_properties(armnnQuantizer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 
-    target_link_libraries(armnnQuantizer
-            armnn
-            ${Boost_SYSTEM_LIBRARY}
-            ${Boost_PROGRAM_OPTIONS_LIBRARY}
-            ${Boost_THREAD_LIBRARY}
-            ${Boost_FILESYSTEM_LIBRARY})
+    target_link_libraries(armnnQuantizer armnn)
 
-    add_executable_ex(ArmnnQuantizer
+    add_executable_ex(ArmnnQuantizerMain
         src/armnnQuantizer/ArmNNQuantizerMain.cpp)
 
-    target_include_directories(ArmnnQuantizer PRIVATE include/armnnDeserializer)
-    target_include_directories(ArmnnQuantizer PRIVATE src/armnn)
+    # cmake does not allow same executable and library name
+    # workaround that by rename that using set_target_properties
+    set_target_properties(ArmnnQuantizerMain
+        PROPERTIES OUTPUT_NAME ArmnnQuantizer)
 
-    target_link_libraries(ArmnnQuantizer
-            ${Boost_SYSTEM_LIBRARY}
-            ${Boost_PROGRAM_OPTIONS_LIBRARY}
-            ${Boost_THREAD_LIBRARY} )
+    target_include_directories(ArmnnQuantizerMain PRIVATE include/armnnDeserializer)
+    target_include_directories(ArmnnQuantizerMain PRIVATE src/armnn)
 
-    target_link_libraries(ArmnnQuantizer
+    target_link_libraries(ArmnnQuantizerMain
             armnnQuantizer
             armnnSerializer
             armnn
@@ -207,7 +223,7 @@ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
             ${FLATBUFFERS_LIBRARY})
 
     if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
-        target_link_libraries(ArmnnQuantizer pthread)
+        target_link_libraries(ArmnnQuantizerMain pthread)
     endif()
 
     set_target_properties(armnnQuantizer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
@@ -231,6 +247,7 @@ list(APPEND armnn_sources
     include/armnn/INetwork.hpp
     include/armnn/IProfiler.hpp
     include/armnn/IRuntime.hpp
+    include/armnn/IStrategy.hpp
     include/armnn/LayerSupport.hpp
     include/armnn/LayerVisitorBase.hpp
     include/armnn/Logging.hpp
@@ -252,6 +269,7 @@ list(APPEND armnn_sources
     include/armnn/utility/NumericCast.hpp
     include/armnn/utility/PolymorphicDowncast.hpp
     include/armnn/utility/StringUtils.hpp
+    include/armnn/utility/TransformIterator.hpp
     src/armnn/layers/LayerCloneBase.hpp
     src/armnn/layers/LayerWithParameters.hpp
     src/armnn/layers/ActivationLayer.hpp
@@ -310,10 +328,14 @@ list(APPEND armnn_sources
     src/armnn/layers/InstanceNormalizationLayer.cpp
     src/armnn/layers/L2NormalizationLayer.hpp
     src/armnn/layers/L2NormalizationLayer.cpp
+    src/armnn/layers/LogicalBinaryLayer.hpp
+    src/armnn/layers/LogicalBinaryLayer.cpp
     src/armnn/layers/LogSoftmaxLayer.hpp
     src/armnn/layers/LogSoftmaxLayer.cpp
     src/armnn/layers/LstmLayer.cpp
     src/armnn/layers/LstmLayer.hpp
+    src/armnn/layers/MapLayer.cpp
+    src/armnn/layers/MapLayer.hpp
     src/armnn/layers/MaximumLayer.cpp
     src/armnn/layers/MaximumLayer.hpp
     src/armnn/layers/MeanLayer.hpp
@@ -352,6 +374,8 @@ list(APPEND armnn_sources
     src/armnn/layers/PreluLayer.cpp
     src/armnn/layers/RankLayer.hpp
     src/armnn/layers/RankLayer.cpp
+    src/armnn/layers/ReduceLayer.hpp
+    src/armnn/layers/ReduceLayer.cpp
     src/armnn/layers/ReshapeLayer.hpp
     src/armnn/layers/ReshapeLayer.cpp
     src/armnn/layers/ResizeLayer.hpp
@@ -380,6 +404,8 @@ list(APPEND armnn_sources
     src/armnn/layers/TransposeConvolution2dLayer.hpp
     src/armnn/layers/TransposeLayer.hpp
     src/armnn/layers/TransposeLayer.cpp
+    src/armnn/layers/UnmapLayer.cpp
+    src/armnn/layers/UnmapLayer.hpp
     src/armnn/BackendRegistry.cpp
     src/armnn/BackendSettings.hpp
     src/armnn/BackendHelper.cpp
@@ -387,8 +413,8 @@ list(APPEND armnn_sources
     src/armnn/Descriptors.cpp
     src/armnn/DeviceSpec.hpp
     src/armnn/DllExport.hpp
-    src/armnn/DynamicQuantizationVisitor.cpp
-    src/armnn/DynamicQuantizationVisitor.hpp
+    src/armnn/DynamicQuantizationStrategy.cpp
+    src/armnn/DynamicQuantizationStrategy.hpp
     src/armnn/Exceptions.cpp
     src/armnn/ExecutionFrame.cpp
     src/armnn/ExecutionFrame.hpp
@@ -431,8 +457,8 @@ list(APPEND armnn_sources
     src/armnn/ProfilingEvent.cpp
     src/armnn/ProfilingEvent.hpp
     src/armnn/Profiling.hpp
-    src/armnn/QuantizerVisitor.cpp
-    src/armnn/QuantizerVisitor.hpp
+    src/armnn/QuantizerStrategy.hpp
+    src/armnn/QuantizerStrategy.cpp
     src/armnn/Runtime.cpp
     src/armnn/Runtime.hpp
     src/armnn/RangeTracker.cpp
@@ -440,8 +466,8 @@ list(APPEND armnn_sources
     src/armnn/ResolveType.hpp
     src/armnn/SerializeLayerParameters.cpp
     src/armnn/SerializeLayerParameters.hpp
-    src/armnn/StaticRangeVisitor.cpp
-    src/armnn/StaticRangeVisitor.hpp
+    src/armnn/StaticRangeStrategy.cpp
+    src/armnn/StaticRangeStrategy.hpp
     src/armnn/SubgraphView.cpp
     src/armnn/SubgraphView.hpp
     src/armnn/SubgraphViewSelector.cpp
@@ -451,6 +477,7 @@ list(APPEND armnn_sources
     src/armnn/Utils.cpp
     src/armnn/WallClockTimer.cpp
     src/armnn/WallClockTimer.hpp
+    src/armnn/optimizations/AddBroadcastReshapeLayer.hpp
     src/armnn/optimizations/AddDebug.hpp
     src/armnn/optimizations/All.hpp
     src/armnn/optimizations/ConvertConstants.hpp
@@ -540,12 +567,14 @@ list(APPEND armnn_sources
     src/profiling/backends/BackendProfiling.cpp
     src/profiling/backends/BackendProfiling.hpp
     third-party/cxxopts/cxxopts.hpp
-    third-party/fmt/core.h
-    third-party/fmt/format.h
-    third-party/fmt/format-inl.h
-    third-party/fmt/src/format.cc
     third-party/ghc/filesystem.hpp
     third-party/half/half.hpp
+    third-party/mapbox/optional.hpp
+    third-party/mapbox/recursive_wrapper.hpp
+    third-party/mapbox/variant.hpp
+    third-party/mapbox/variant_cast.hpp
+    third-party/mapbox/variant_io.hpp
+    third-party/mapbox/variant_visitor.hpp
     )
 
 # Files used for Streamline-based profiling backend
@@ -555,6 +584,8 @@ if(PROFILING_BACKEND_STREAMLINE)
         ${GATOR_ROOT}/annotate/streamline_annotate.c)
 endif()
 
+set_source_files_properties(${armnn_sources} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion -Wno-error=deprecated-copy")
+
 # the backends under src/backends extend the list of
 # object libs armnn to include in the build
 include(src/backends/backends.cmake)
@@ -579,13 +610,21 @@ target_include_directories(armnn
         profiling/common/include
 )
 
-target_link_libraries(armnn armnnUtils pipeCommon)
+target_link_libraries(armnn armnnUtils)
+# only link pipeCommon if it has been built
+if(BUILD_TIMELINE_DECODER)
+    target_link_libraries(armnn pipeCommon)
+endif()
 
 target_link_libraries(armnn ${CMAKE_DL_LIBS})
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows)
     target_link_libraries(armnn Ws2_32.lib)
 endif()
 
+# Link fmt third-party library
+add_subdirectory(third-party/fmt)
+target_link_libraries(armnn fmt)
+
 if(BUILD_CAFFE_PARSER)
     install(TARGETS armnnCaffeParser
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -604,12 +643,6 @@ endif()
 
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-target_link_libraries(armnn
-        ${Boost_THREAD_LIBRARY}
-        ${Boost_SYSTEM_LIBRARY}
-        ${Boost_FILESYSTEM_LIBRARY}
-    )
-
 if(ARMCOMPUTENEON OR ARMCOMPUTECL)
     target_link_libraries(armnn ${ARMCOMPUTE_LIBRARIES})
 endif()
@@ -626,7 +659,6 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/ConstTensorLayerVisitor.hpp
         src/armnn/test/ConstTensorLayerVisitor.cpp
         src/armnn/test/CreateWorkload.hpp
-        src/armnn/test/CsvReaderTest.cpp
         src/armnn/test/EndToEndTest.cpp
         src/armnn/test/ExecutionFrameTest.cpp
         src/armnn/test/FloatingPointConverterTest.cpp
@@ -641,11 +673,14 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/NetworkTests.cpp
         src/armnn/test/ObservableTest.cpp
         src/armnn/test/OptimizerTests.cpp
+        src/armnn/test/optimizations/AddBroadcastReshapeLayerTests.cpp
         src/armnn/test/optimizations/ConvertConstantsBFloatTests.cpp
         src/armnn/test/optimizations/ConvertConstantsFloatToHalfTests.cpp
         src/armnn/test/optimizations/ConvertConstantsHalfToFloatTests.cpp
         src/armnn/test/optimizations/Fp32NetworkToBf16ConverterTests.cpp
         src/armnn/test/optimizations/Fp32NetworkToFp16ConverterTests.cpp
+        src/armnn/test/optimizations/FuseActivationTests.cpp
+        src/armnn/test/optimizations/FuseBatchNormTests.cpp
         src/armnn/test/optimizations/InsertDebugLayerTests.cpp
         src/armnn/test/optimizations/MovePermuteUpTests.cpp
         src/armnn/test/optimizations/MoveTransposeUpTests.cpp
@@ -678,10 +713,12 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/UnitTests.cpp
         src/armnn/test/UnitTests.hpp
         src/armnn/test/UtilsTests.cpp
-        src/armnnUtils/test/QuantizeHelperTest.cpp
-        src/armnnUtils/test/PrototxtConversionsTest.cpp
+        src/armnnUtils/test/FloatingPointComparisonTest.cpp
         src/armnnUtils/test/ParserHelperTest.cpp
+        src/armnnUtils/test/PrototxtConversionsTest.cpp
+        src/armnnUtils/test/QuantizeHelperTest.cpp
         src/armnnUtils/test/TensorUtilsTest.cpp
+        src/armnnUtils/test/TransformIteratorTest.cpp
         src/profiling/test/BufferTests.cpp
         src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
         src/profiling/test/PrintPacketHeaderHandler.cpp
@@ -773,11 +810,13 @@ if(BUILD_UNIT_TESTS)
              src/armnnTfLiteParser/test/Constant.cpp
              src/armnnTfLiteParser/test/Conv2D.cpp
              src/armnnTfLiteParser/test/DepthwiseConvolution2D.cpp
+             src/armnnTfLiteParser/test/DepthToSpace.cpp
              src/armnnTfLiteParser/test/Dequantize.cpp
              src/armnnTfLiteParser/test/DetectionPostProcess.cpp
              src/armnnTfLiteParser/test/Div.cpp
              src/armnnTfLiteParser/test/Exp.cpp
              src/armnnTfLiteParser/test/FullyConnected.cpp
+             src/armnnTfLiteParser/test/Gather.cpp
              src/armnnTfLiteParser/test/L2Normalization.cpp
              src/armnnTfLiteParser/test/LeakyRelu.cpp
              src/armnnTfLiteParser/test/LoadScopeDynamicTensor.cpp
@@ -789,6 +828,7 @@ if(BUILD_UNIT_TESTS)
              src/armnnTfLiteParser/test/Neg.cpp
              src/armnnTfLiteParser/test/Pack.cpp
              src/armnnTfLiteParser/test/Pad.cpp
+             src/armnnTfLiteParser/test/Reduce.cpp
              src/armnnTfLiteParser/test/Reshape.cpp
              src/armnnTfLiteParser/test/ResizeBilinear.cpp
              src/armnnTfLiteParser/test/ResizeNearestNeighbor.cpp
@@ -800,6 +840,7 @@ if(BUILD_UNIT_TESTS)
              src/armnnTfLiteParser/test/Squeeze.cpp
              src/armnnTfLiteParser/test/StridedSlice.cpp
              src/armnnTfLiteParser/test/Sub.cpp
+             src/armnnTfLiteParser/test/Sum.cpp
              src/armnnTfLiteParser/test/TransposeConv.cpp
              src/armnnTfLiteParser/test/Transpose.cpp
              src/armnnTfLiteParser/test/Unpack.cpp
@@ -818,10 +859,10 @@ if(BUILD_UNIT_TESTS)
         # static C-array of bytes. This is needed at runtime for TfLite parser tests.
         add_custom_command(
             OUTPUT  SchemaText.cpp
-            COMMAND cp ${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs g_TfLiteSchemaText
+            COMMAND cp ${TF_LITE_SCHEMA_PATH}/schema.fbs g_TfLiteSchemaText
             COMMAND xxd -i g_TfLiteSchemaText SchemaText.cpp
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-            DEPENDS ${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs
+            DEPENDS ${TF_LITE_SCHEMA_PATH}/schema.fbs
         )
         list(APPEND unittest_sources ${CMAKE_CURRENT_BINARY_DIR}/SchemaText.cpp)
     endif()
@@ -871,7 +912,11 @@ if(BUILD_UNIT_TESTS)
         enable_language(ASM)
         list(APPEND unittest_sources
             src/armnnSerializer/test/ActivationSerializationTests.cpp
+            src/armnnSerializer/test/ComparisonSerializationTests.cpp
+            src/armnnSerializer/test/LstmSerializationTests.cpp
             src/armnnSerializer/test/SerializerTests.cpp
+            src/armnnSerializer/test/SerializerTestUtils.cpp
+            src/armnnSerializer/test/SerializerTestUtils.hpp
             src/armnnDeserializer/test/DeserializeAbs.cpp
             src/armnnDeserializer/test/DeserializeActivation.cpp
             src/armnnDeserializer/test/DeserializeAdd.cpp
@@ -896,6 +941,7 @@ if(BUILD_UNIT_TESTS)
             src/armnnDeserializer/test/DeserializePermute.cpp
             src/armnnDeserializer/test/DeserializePooling2d.cpp
             src/armnnDeserializer/test/DeserializeRank.cpp
+            src/armnnDeserializer/test/DeserializeReduceSum.cpp
             src/armnnDeserializer/test/DeserializeReshape.cpp
             src/armnnDeserializer/test/DeserializeResizeBilinear.cpp
             src/armnnDeserializer/test/DeserializeRsqrt.cpp
@@ -949,7 +995,7 @@ if(BUILD_UNIT_TESTS)
     endif()
 
     target_link_libraries(UnitTests ${CMAKE_THREAD_LIBS_INIT})
-    target_link_libraries(UnitTests ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+    target_link_libraries(UnitTests ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
     target_link_libraries(UnitTests armnn)
     target_link_libraries(UnitTests armnnUtils)
@@ -1028,10 +1074,6 @@ if (BUILD_ARMNN_SERIALIZER AND (BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD
 
     target_link_libraries(ArmnnConverter armnn)
     target_link_libraries(ArmnnConverter ${CMAKE_THREAD_LIBS_INIT})
-    target_link_libraries(ArmnnConverter
-        ${Boost_SYSTEM_LIBRARY}
-        ${Boost_PROGRAM_OPTIONS_LIBRARY}
-        ${Boost_FILESYSTEM_LIBRARY})
     addDllCopyCommands(ArmnnConverter)
 endif()
 
@@ -1096,10 +1138,7 @@ if(BUILD_GATORD_MOCK)
                           armnn
                           armnnBasePipeServer
                           timelineDecoder
-                          gatordMockService
-                          ${Boost_PROGRAM_OPTIONS_LIBRARY}
-                          ${Boost_FILESYSTEM_LIBRARY}
-                          ${Boost_SYSTEM_LIBRARY})
+                          gatordMockService)
 
     if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
         target_link_libraries(GatordMock ${CMAKE_THREAD_LIBS_INIT})
@@ -1134,7 +1173,7 @@ install(
     EXPORT      armnn-targets
     FILE        ArmnnTargets.cmake
     NAMESPACE   Armnn::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
 ####################################################
@@ -1147,7 +1186,7 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}" )
 configure_package_config_file(
     ${CMAKE_CURRENT_LIST_DIR}/cmake/ArmnnConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
-    INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
 ####################################################
@@ -1155,7 +1194,7 @@ configure_package_config_file(
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
-    DESTINATION ${INSTALL_CONFIGDIR}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
 ####################################################
@@ -1166,8 +1205,11 @@ export(
     NAMESPACE   Armnn::
 )
 
+add_library(Armnn::Armnn ALIAS armnn)
+add_library(Armnn::armnnUtils ALIAS armnnUtils)
+
 ####################################################
 ## Build Python bindings
 if (BUILD_PYTHON_WHL OR BUILD_PYTHON_SRC)
     add_subdirectory(python/pyarmnn)
-endif()
\ No newline at end of file
+endif()
Domain: Machine Learning / ML Framework;