Upgrade apps/hannk to TFLite 2.6 (halide#6197)

* Upgrade apps/hannk to TFLite 2.6

* Remove scalpel left in patient

Author: steven-johnson

apps/hannk/CMakeLists.txt

@@ -20,9 +20,13 @@ find_package(Halide REQUIRED)
 
 # Set up the version of TFLite we expect
 set(TFLITE_VERSION_MAJOR "2" CACHE STRING "Major version of TFLite to assume")
-set(TFLITE_VERSION_MINOR "5" CACHE STRING "Minor version of TFLite to assume")
+set(TFLITE_VERSION_MINOR "6" CACHE STRING "Minor version of TFLite to assume")
 set(TFLITE_VERSION_PATCH "0" CACHE STRING "Patch version of TFLite to assume")
 
+add_compile_definitions(TFLITE_VERSION_MAJOR=${TFLITE_VERSION_MAJOR})
+add_compile_definitions(TFLITE_VERSION_MINOR=${TFLITE_VERSION_MINOR})
+add_compile_definitions(TFLITE_VERSION_PATCH=${TFLITE_VERSION_PATCH})
+
 set(TFLITE_VERSION "${TFLITE_VERSION_MAJOR}.${TFLITE_VERSION_MINOR}.${TFLITE_VERSION_PATCH}")
 
 add_subdirectory(delegate)

apps/hannk/Makefile

@@ -56,7 +56,7 @@ clean:
 # ---------------------- TFLite glue
 
 TFLITE_VERSION_MAJOR ?= 2
-TFLITE_VERSION_MINOR ?= 5
+TFLITE_VERSION_MINOR ?= 6
 TFLITE_VERSION_PATCH ?= 0
 
 TFLITE_VERSION = $(TFLITE_VERSION_MAJOR).$(TFLITE_VERSION_MINOR).$(TFLITE_VERSION_PATCH)

apps/hannk/configure_cmake.sh

@@ -9,7 +9,7 @@ mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
 if [ -z ${HALIDE_INSTALL_PATH} ]; then
-HALIDE_INSTALL_PATH=${HOME}/halide-13-install/
+HALIDE_INSTALL_PATH=${HOME}/halide-14-install/
 fi
 echo Using HalideInstall=${HALIDE_INSTALL_PATH}
 

apps/hannk/delegate/hannk_delegate_provider.cpp

@@ -39,6 +39,13 @@ class HannkDelegateProvider : public DelegateProvider {
         }
     }
 
+#if (TFLITE_VERSION_MAJOR >= 3) || (TFLITE_VERSION_MAJOR >= 2 && TFLITE_VERSION_MINOR >= 6)
+    std::pair<TfLiteDelegatePtr, int> CreateRankedTfLiteDelegate(const ToolParams &params) const final {
+        auto ptr = CreateTfLiteDelegate(params);
+        return std::make_pair(std::move(ptr), params.GetPosition<bool>("use_hannk"));
+    }
+#endif
+
     std::string GetName() const final {
         return "HANNK";
     }