Compute Library v23.05.1

Author: Jenkins

.bazelrc

@@ -38,3 +38,4 @@ build --flag_alias=openmp=//:openmp
 build --flag_alias=cppthreads=//:cppthreads
 build --flag_alias=enable_bf16_validation=//:enable_bf16_validation
 build --flag_alias=enable_sve_validation=//:enable_sve_validation
+build --flag_alias=arch=//:arch

BUILD.bazel

@@ -78,6 +78,15 @@ bool_flag(
     visibility = ["//visibility:public"],
 )
 
+string_flag(
+    name = "arch",
+    build_setting_default = "armv8-a",
+    values = [
+        "armv8-a",
+        "armv8.2-a+fp16"
+    ]
+)
+
 #---------------------------------------------------------------------
 # Flag variables
 config_setting(
@@ -129,6 +138,20 @@ config_setting(
     },
 )
 
+config_setting(
+    name = "arch_armv8-a",
+    flag_values = {
+        "arch": "armv8-a"
+    }
+)
+
+config_setting(
+    name = "arch_armv8.2-a+fp16",
+    flag_values = {
+        "arch": "armv8.2-a+fp16"
+    }
+)
+
 
 #---------------------------------------------------------------------
 # Common defines used for all targets
@@ -138,17 +161,15 @@ cc_library(
                   "ENABLE_NEON",
                   "ARM_COMPUTE_CPU_ENABLED",
                   "ARM_COMPUTE_ENABLE_NEON",
-                  "ARM_COMPUTE_ENABLE_FP16",
                   "ARM_COMPUTE_ENABLE_I8MM",
-                  "ENABLE_FP16_KERNELS",
                   "ENABLE_FP32_KERNELS",
                   "ENABLE_QASYMM8_KERNELS",
                   "ENABLE_QASYMM8_SIGNED_KERNELS",
                   "ENABLE_QSYMM16_KERNELS",
                   "ENABLE_INTEGER_KERNELS",
                   "ENABLE_NHWC_KERNELS",
                   "ENABLE_NCHW_KERNELS",
-                  "DARM_COMPUTE_GRAPH_ENABLED",
+                  "ARM_COMPUTE_GRAPH_ENABLED",
                   "ARM_COMPUTE_ENABLE_SVEF32MM",
                   "ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS",
                   "_GLIBCXX_USE_NANOSLEEP"
@@ -170,6 +191,11 @@ cc_library(
               select({
                   "//:openmp_flag": ["ARM_COMPUTE_OPENMP_SCHEDULER"],
                   "//conditions:default": [],
+              }) +
+              select({
+                  "//:arch_armv8-a": [],
+                  "//:arch_armv8.2-a+fp16": ["ENABLE_FP16_KERNELS", "ARM_COMPUTE_ENABLE_FP16"],
+                  "//conditions:default": [],
               }),
     visibility = ["//visibility:public"],
 )
@@ -178,9 +204,9 @@ cc_library(
 # Rule for creating file "arm_compute_version.embed"
 genrule(
     name = "create_version_file",
-    srcs = [".git/HEAD"],
+    srcs = ["SConscript"],
     outs = ["arm_compute_version.embed"],
-    cmd = "$(location //scripts:print_version_file) bazel-build-options `cat $(location :.git/HEAD)` > $@",
+    cmd = "$(location //scripts:print_version_file) 'n/a' 'n/a' 'true' > $@",
     tools = ["//scripts:print_version_file"],
     visibility = ["//visibility:public"],
 )
@@ -191,9 +217,11 @@ genrule(
 cc_library(
     name = "arm_compute_graph",
     srcs = ["//src:arm_compute_graph_srcs"],
-    copts = [
-                "-march=armv8.2-a+fp16",
-            ] + select({
+    copts = [] + select({
+                  "//:arch_armv8-a": ["-march=armv8-a"],
+                  "//:arch_armv8.2-a+fp16": ["-march=armv8.2-a+fp16"],
+                  "//conditions:default": ["-march=armv8-a"],
+              }) + select({
                 "//:debug_flag": [
                     "-O0",
                     "-g",
@@ -211,7 +239,7 @@ cc_library(
             }),
     visibility = ["//visibility:public"],
     deps = [
-        "arm_compute_core",
+        "arm_compute",
         "//:common_defines",
         "//arm_compute:graph_headers",
     ],
@@ -323,18 +351,20 @@ cc_library(
 # Core and Runtime library
 
 cc_library(
-    name = "arm_compute_core",
-    srcs = ["//src:arm_compute_core_srcs"],
+    name = "arm_compute",
+    srcs = ["//src:arm_compute_srcs"],
     hdrs = glob([
         "core/NEON/kernels/**/*.h",
         "core/NEON/kernels/**/*.hpp",
         "**/*.inl",
     ]) + [
         "//:create_version_file",
     ],
-    copts = [
-                "-march=armv8.2-a+fp16",
-            ] + select({
+    copts = [] + select({
+                  "//:arch_armv8-a": ["-march=armv8-a"],
+                  "//:arch_armv8.2-a+fp16": ["-march=armv8.2-a+fp16"],
+                  "//conditions:default": ["-march=armv8-a"],
+              }) + select({
                 "//:debug_flag": [
                     "-O0",
                     "-g",

CMakeLists.txt

@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 list(APPEND CMAKE_MESSAGE_CONTEXT ArmCompute)
 project(
   ArmCompute
-  VERSION 28.0.8
+  VERSION 31.0.1
   DESCRIPTION
     "The Arm Compute Library is a collection of low-level machine learning functions optimized for Arm® Cortex®-A CPU and Arm® Mali™ GPU architectures"
   LANGUAGES C CXX ASM)
@@ -185,13 +185,13 @@ target_include_directories(
 # ---------------------------------------------------------------------
 # Core Library
 
-add_library(arm_compute_core "")
-target_compile_options(arm_compute_core PRIVATE "-march=armv8.2-a+fp16")
-target_compile_definitions(arm_compute_core PRIVATE ARM_COMPUTE_ENABLE_BF16)
-target_compile_definitions(arm_compute_core PRIVATE ENABLE_SVE)
-target_compile_definitions(arm_compute_core PRIVATE ARM_COMPUTE_ENABLE_SVE)
+add_library(arm_compute "")
+target_compile_options(arm_compute PRIVATE "-march=${ARM_COMPUTE_ARCH}")
+target_compile_definitions(arm_compute PRIVATE ARM_COMPUTE_ENABLE_BF16)
+target_compile_definitions(arm_compute PRIVATE ENABLE_SVE)
+target_compile_definitions(arm_compute PRIVATE ARM_COMPUTE_ENABLE_SVE)
 target_include_directories(
-  arm_compute_core
+  arm_compute
   PUBLIC $<INSTALL_INTERFACE:include>
          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
          ${CMAKE_CURRENT_SOURCE_DIR}
@@ -201,17 +201,17 @@ target_include_directories(
           src/core/NEON/kernels/convolution/common
           src/core/NEON/kernels/arm_conv/depthwise
           src/core/NEON/kernels/convolution/winograd)
-target_compile_options(arm_compute_core PUBLIC ${COMMON_CXX_FLAGS})
+target_compile_options(arm_compute PUBLIC ${COMMON_CXX_FLAGS})
 
-add_library(ArmCompute::Core ALIAS arm_compute_core)
+add_library(ArmCompute::Core ALIAS arm_compute)
 target_link_libraries(
-  arm_compute_core PUBLIC arm_compute_sve arm_compute_sve2)
+  arm_compute PUBLIC arm_compute_sve arm_compute_sve2)
 
 # ---------------------------------------------------------------------
 # Graph Library
 
 add_library(arm_compute_graph "")
-target_compile_options(arm_compute_graph PRIVATE "-march=armv8.2-a+fp16")
+target_compile_options(arm_compute_graph PRIVATE "-march=${ARM_COMPUTE_ARCH}")
 target_compile_definitions(arm_compute_graph PRIVATE ENABLE_SVE)
 target_compile_definitions(arm_compute_graph PRIVATE ARM_COMPUTE_ENABLE_SVE)
 # add_subdirectory(src/graph)
@@ -242,7 +242,7 @@ if(ARM_COMPUTE_BUILD_TESTING)
   # target_compile_options(arm_compute_validation_framework PRIVATE
   # "-march=armv8.2-a")
   target_compile_options(arm_compute_validation_framework
-                        PRIVATE "-march=armv8.2-a+fp16")
+                        PRIVATE "-march=${ARM_COMPUTE_ARCH}")
 
   add_subdirectory(tests)
   target_include_directories(
@@ -254,13 +254,13 @@ if(ARM_COMPUTE_BUILD_TESTING)
                         PUBLIC ${COMMON_CXX_FLAGS})
                         target_link_libraries(
                           arm_compute_validation_framework
-      PUBLIC arm_compute_core arm_compute_graph)
+      PUBLIC arm_compute arm_compute_graph)
 
   # ---------------------------------------------------------------------
   # Validation Binary
 
   add_executable(arm_compute_validation "")
-  target_compile_options(arm_compute_validation PRIVATE "-march=armv8.2-a+fp16")
+  target_compile_options(arm_compute_validation PRIVATE "-march=${ARM_COMPUTE_ARCH}")
   if(ARM_COMPUTE_ENABLE_BF16_VALIDATION)
     target_compile_definitions(arm_compute_validation PRIVATE ARM_COMPUTE_ENABLE_BF16)
   endif()
@@ -275,23 +275,23 @@ if(ARM_COMPUTE_BUILD_TESTING)
                                       "${CMAKE_BINARY_DIR}/validation")
   target_link_libraries(
     arm_compute_validation
-    PUBLIC arm_compute_core arm_compute_graph arm_compute_validation_framework
+    PUBLIC arm_compute arm_compute_graph arm_compute_validation_framework
            arm_compute_sve)
   target_link_directories(arm_compute_validation PUBLIC tests)
 
   # ---------------------------------------------------------------------
   # Benchmark Binary
 
   add_executable(arm_compute_benchmark)
-  target_compile_options(arm_compute_benchmark PRIVATE "-march=armv8.2-a+fp16")
+  target_compile_options(arm_compute_benchmark PRIVATE "-march=${ARM_COMPUTE_ARCH}")
 
   add_subdirectory(tests/benchmark)
   target_compile_options(arm_compute_benchmark PUBLIC ${COMMON_CXX_FLAGS})
   set_target_properties(
     arm_compute_benchmark PROPERTIES RUNTIME_OUTPUT_DIRECTORY
                                      "${CMAKE_BINARY_DIR}/validation")
   target_link_libraries(
-    arm_compute_benchmark PUBLIC arm_compute_core arm_compute_graph
+    arm_compute_benchmark PUBLIC arm_compute arm_compute_graph
                                  arm_compute_validation_framework)
 
 endif() # ARM_COMPUTE_BUILD_TESTING
@@ -307,22 +307,22 @@ if(ARM_COMPUTE_BUILD_EXAMPLES)
     add_executable(
       ${test_name} "examples/${test_name}.cpp" utils/Utils.cpp
                    utils/GraphUtils.cpp utils/CommonGraphOptions.cpp)
-    target_compile_options(${test_name} PRIVATE "-march=armv8.2-a+fp16")
+    target_compile_options(${test_name} PRIVATE "-march=${ARM_COMPUTE_ARCH}")
     set_target_properties(
       ${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
                               "${CMAKE_BINARY_DIR}/examples")
-    target_link_libraries(${test_name} PUBLIC arm_compute_core
+    target_link_libraries(${test_name} PUBLIC arm_compute
                                               arm_compute_graph arm_compute_sve)
   endforeach()
 
   # NEON Examples
   foreach(test_name ${EXAMPLE_NEON_NAMES})
     add_executable(${test_name} "examples/${test_name}.cpp" utils/Utils.cpp)
-    target_compile_options(${test_name} PRIVATE "-march=armv8.2-a+fp16")
+    target_compile_options(${test_name} PRIVATE "-march=${ARM_COMPUTE_ARCH}")
     set_target_properties(
       ${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
                               "${CMAKE_BINARY_DIR}/examples")
-    target_link_libraries(${test_name} PUBLIC arm_compute_core)
+    target_link_libraries(${test_name} PUBLIC arm_compute)
   endforeach()
 
 endif() # ARM_COMPUTE_BUILD_EXAMPLES