⬆️ [email protected]

.bazelversion

@@ -1 +1 @@
-3.7.2
+4.2.1

.github/workflows/unittests.yml

@@ -25,8 +25,12 @@ jobs:
         run: pip install numpy --no-cache-dir
       - name: Run C++ Unit Tests
         run: bazelisk test larq_compute_engine/tests:cc_tests --copt=-O2 --distinct_host_configuration=false --test_output=all
-      - name: Build TF Lite Static Library with Make
-        run: larq_compute_engine/tflite/build_make/build_lce.sh --native
+      - name: Build TF Lite Static Library with CMake
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+          make -j2
 
   ARM:
     runs-on: ubuntu-latest
@@ -83,7 +87,7 @@ jobs:
         if: github.ref != 'refs/heads/main'
         shell: bash
       - name: Install pip dependencies
-        run: pip install tensorflow-cpu~=2.6.2 larq~=0.11 larq_zoo~=2.0 pytest tensorflow_datasets~=4.2 flatbuffers tqdm --no-cache-dir
+        run: pip install tensorflow-cpu~=2.8.0 larq~=0.11 larq_zoo~=2.0 pytest tensorflow_datasets~=4.4 flatbuffers==1.12 tqdm --no-cache-dir
       - name: Run Interpreter test
         run: bazelisk test larq_compute_engine/tflite/tests:interpreter_test --test_output=all
       - name: Run FileCheck tests
@@ -97,15 +101,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tf-version: [1.14.0, 1.15.5, 2.0.4, 2.1.3, 2.2.2, 2.3.2, 2.4.1, 2.5.0, 2.6.2, 2.7.0]
+        tf-version: [1.14.0, 1.15.5, 2.0.4, 2.1.4, 2.2.3, 2.3.3, 2.4.4, 2.5.3, 2.6.3, 2.7.1, 2.8.0]
     if: "!contains(github.event.head_commit.message, 'ci-skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: 3.7
       - name: Install dependencies
-        run: pip install tensorflow==${{matrix.tf-version}} larq~=0.11 larq_zoo~=2.0 tensorflow_datasets==1.3.2 packaging flatbuffers --no-cache-dir
+        run: pip install tensorflow==${{matrix.tf-version}} larq~=0.11 larq_zoo~=2.0 tensorflow_datasets==1.3.2 packaging flatbuffers==1.12 --no-cache-dir
       - name: Run Converter test
         run: PYTHONPATH=./ python larq_compute_engine/mlir/python/converter_test.py
 

.gitignore

@@ -16,7 +16,8 @@ node_modules
 __pycache__
 *.swp
 .vscode/
-cmake_build/
+cmake_build*
+cmake-build*
 tensorflow/contrib/cmake/_build/
 .idea/**
 /build/

.tensorflow.bazelrc

@@ -136,6 +136,7 @@ build:elinux_aarch64 --config=elinux
 build:elinux_aarch64 --cpu=aarch64
 build:elinux_armhf --config=elinux
 build:elinux_armhf --cpu=armhf
+build:elinux_armhf --copt -mfp16-format=ieee
 
 # Address sanitizer
 # CC=clang bazel build --config asan

CMakeLists.txt

@@ -0,0 +1,94 @@
+cmake_minimum_required(VERSION 3.16)
+project(larq_compute_engine C CXX)
+
+# Options and their default values
+option(COMPILE_EXAMPLE "Enable compilation of the minimal example" ON)
+option(COMPILE_BENCHMARK "Enable compilation of the benchmarking utility" ON)
+
+# TensorFlow dependency, see https://www.tensorflow.org/lite/guide/build_cmake
+set(TENSORFLOW_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/third_party/tensorflow/")
+set(TFLITE_SOURCE_DIR "${TENSORFLOW_SOURCE_DIR}/tensorflow/lite")
+add_subdirectory("${TFLITE_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/tensorflow-lite" EXCLUDE_FROM_ALL)
+
+# Generic compilation options and settings
+set(CMAKE_CXX_STANDARD 14)
+include_directories(${CMAKE_CURRENT_LIST_DIR})
+
+# The LCE core files
+set(LCE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/larq_compute_engine")
+set(LCE_CORE_SRCS
+        ${LCE_SOURCE_DIR}/tflite/kernels/bconv2d.cc
+        ${LCE_SOURCE_DIR}/tflite/kernels/bmaxpool.cc
+        ${LCE_SOURCE_DIR}/tflite/kernels/quantization.cc
+        )
+set(LCE_CORE_HDRS  # such that they can be discovered by IDEs such as CLion Visual Studio
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/kernel.h
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/kernel_4x2_portable.h
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/kernel_8x4x4_aarch64.h
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/kernel_8x4x1_aarch64.h
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/select_kernel.h
+        ${LCE_SOURCE_DIR}/core/indirect_bgemm/kernel_8x4x2_aarch64.h
+        ${LCE_SOURCE_DIR}/core/bmaxpool.h
+        ${LCE_SOURCE_DIR}/core/bitpacking/utils.h
+        ${LCE_SOURCE_DIR}/core/bitpacking/bitpack.h
+        ${LCE_SOURCE_DIR}/core/bitpacking/bitpack_aarch64.h
+        ${LCE_SOURCE_DIR}/core/types.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/optimized_indirect_bgemm.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/reference.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/optimized_bgemm.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/zero_padding_correction.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/params.h
+        ${LCE_SOURCE_DIR}/core/bconv2d/output_transform.h
+        ${LCE_SOURCE_DIR}/core/bgemm/kernels_common.h
+        ${LCE_SOURCE_DIR}/core/bgemm/ruy_trmul_params.h
+        ${LCE_SOURCE_DIR}/core/bgemm/kernels_aarch64.h
+        ${LCE_SOURCE_DIR}/core/bgemm/kernels.h
+        ${LCE_SOURCE_DIR}/core/bgemm/ruy_pack.h
+        ${LCE_SOURCE_DIR}/core/bgemm/kernels_arm32.h
+        ${LCE_SOURCE_DIR}/core/bgemm/bgemm.h
+        ${LCE_SOURCE_DIR}/tflite/kernels/lce_ops_register.h
+        ${LCE_SOURCE_DIR}/tflite/kernels/utils.h
+        )
+
+# The example application
+if(COMPILE_EXAMPLE)
+    set(LCE_EXAMPLE_SRCS ${CMAKE_CURRENT_LIST_DIR}/examples/lce_minimal.cc)
+    add_executable(example ${LCE_CORE_SRCS} ${LCE_CORE_HDRS} ${LCE_EXAMPLE_SRCS})
+    target_link_libraries(example tensorflow-lite)
+endif()
+
+# The benchmarking binary
+if(COMPILE_BENCHMARK)
+    set(LCE_BENCHMARK_SRCS
+            ${LCE_SOURCE_DIR}/tflite/benchmark/lce_benchmark_tflite_model.cc
+            ${LCE_SOURCE_DIR}/tflite/benchmark/lce_benchmark_main.cc
+            )
+    set(LCE_BENCHMARK_HRDS
+            ${LCE_SOURCE_DIR}/tflite/benchmark/lce_benchmark_tflite_model.h
+            ${TFLITE_SOURCE_DIR}/tools/benchmark/benchmark_model.h
+            )
+    set(TFLITE_BENCHMARK_SRCS  # from ${TFLITE_SOURCE_DIR}/tools/benchmark/CMakeLists.txt
+            ${TENSORFLOW_SOURCE_DIR}/tensorflow/core/util/stats_calculator.cc
+            ${TFLITE_SOURCE_DIR}/kernels/internal/utils/sparsity_format_converter.cc
+            ${TFLITE_SOURCE_DIR}/profiling/memory_info.cc
+            ${TFLITE_SOURCE_DIR}/profiling/memory_usage_monitor.cc
+            ${TFLITE_SOURCE_DIR}/profiling/profile_summarizer.cc
+            ${TFLITE_SOURCE_DIR}/profiling/profile_summary_formatter.cc
+            ${TFLITE_SOURCE_DIR}/profiling/time.cc
+            ${TFLITE_SOURCE_DIR}/tools/command_line_flags.cc
+            ${TFLITE_SOURCE_DIR}/tools/benchmark/benchmark_model.cc
+            ${TFLITE_SOURCE_DIR}/tools/benchmark/benchmark_tflite_model.cc
+            ${TFLITE_SOURCE_DIR}/tools/benchmark/benchmark_utils.cc
+            ${TFLITE_SOURCE_DIR}/tools/benchmark/profiling_listener.cc
+            ${TFLITE_SOURCE_DIR}/tools/delegates/default_execution_provider.cc
+            ${TFLITE_SOURCE_DIR}/tools/delegates/delegate_provider.cc
+            ${TFLITE_SOURCE_DIR}/tools/evaluation/utils.cc
+            ${TFLITE_SOURCE_DIR}/tools/tool_params.cc
+            )
+    add_executable(benchmark
+            ${TFLITE_BENCHMARK_SRCS}
+            ${LCE_CORE_SRCS} ${LCE_CORE_HDRS}
+            ${LCE_BENCHMARK_SRCS} ${LCE_BENCHMARK_HRDS}
+            )
+    target_link_libraries(benchmark tensorflow-lite)
+endif()

WORKSPACE

@@ -15,11 +15,12 @@ http_archive(
     patch_tool = "patch",
     patches = [
         "//third_party/tensorflow_patches:disable_forced_mkl.patch",
+        "//third_party/tensorflow_patches:fix_armhf_xnnpack.patch",
     ],
-    sha256 = "e68c1d346fc3d529653530ca346b2c62f5b31bd4fcca7ffc9c65bb39ab2f6ed3",
-    strip_prefix = "tensorflow-2.6.2",
+    sha256 = "66b953ae7fba61fd78969a2e24e350b26ec116cf2e6a7eb93d02c63939c6f9f7",
+    strip_prefix = "tensorflow-2.8.0",
     urls = [
-        "https://github.com/tensorflow/tensorflow/archive/v2.6.2.tar.gz",
+        "https://github.com/tensorflow/tensorflow/archive/v2.8.0.tar.gz",
     ],
 )