diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -975,7 +975,6 @@ if (LLVM_HAVE_TFLITE) find_package(protobuf REQUIRED) find_package(tensorflow-lite REQUIRED) - set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available") set(LLVM_PROTOBUF_OUT_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/protobuf_gen) include_directories(${LLVM_PROTOBUF_OUT_DIR}) endif() diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake --- a/llvm/include/llvm/Config/llvm-config.h.cmake +++ b/llvm/include/llvm/Config/llvm-config.h.cmake @@ -98,9 +98,6 @@ /* Define if zstd compression is available */ #cmakedefine01 LLVM_ENABLE_ZSTD -/* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ -#cmakedefine LLVM_HAVE_TF_API - /* Define if LLVM is using tflite instead of libtensorflow */ #cmakedefine LLVM_HAVE_TFLITE diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt --- a/llvm/lib/CodeGen/CMakeLists.txt +++ b/llvm/lib/CodeGen/CMakeLists.txt @@ -1,4 +1,4 @@ -if (DEFINED LLVM_HAVE_TF_AOT OR DEFINED LLVM_HAVE_TF_API) +if (DEFINED LLVM_HAVE_TF_AOT OR LLVM_HAVE_TFLITE) include(TensorFlowCompile) set(LLVM_RAEVICT_MODEL_PATH_DEFAULT "models/regalloc-eviction") @@ -17,7 +17,7 @@ ) endif() - if (DEFINED LLVM_HAVE_TF_API) + if (LLVM_HAVE_TFLITE) list(APPEND MLLinkDeps ${tensorflow_c_api} ${tensorflow_fx}) endif() endif() diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -326,7 +326,6 @@ "LLVM_FORCE_ENABLE_STATS=", "LLVM_FORCE_USE_OLD_TOOLCHAIN=", "LLVM_HAS_ATOMICS=1", - "LLVM_HAVE_TF_API=", "LLVM_HAVE_TFLITE=", "LLVM_HOST_TRIPLE=$llvm_current_triple", "LLVM_NATIVE_ARCH=$native_target", diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn @@ -88,7 +88,6 @@ "OCAMLFLAGS=", "LLVM_BUILD_EXAMPLES=0", "LLVM_HAVE_TF_AOT=0", - "LLVM_HAVE_TF_API=0", "LLVM_INLINER_MODEL_AUTOGENERATED=0", "LLVM_RAEVICT_MODEL_AUTOGENERATED=0", "PTXAS_EXECUTABLE=", diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h @@ -99,9 +99,6 @@ /* Define if we have cpp-httplib and want to use it */ /* #undef LLVM_ENABLE_HTTPLIB */ -/* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ -/* #undef LLVM_HAVE_TF_API */ - /* Define if LLVM was built with a dependency to the tensorflow compiler */ /* #undef LLVM_HAVE_TF_AOT */ diff --git a/utils/bazel/llvm_configs/llvm-config.h.cmake b/utils/bazel/llvm_configs/llvm-config.h.cmake --- a/utils/bazel/llvm_configs/llvm-config.h.cmake +++ b/utils/bazel/llvm_configs/llvm-config.h.cmake @@ -98,10 +98,7 @@ /* Define if zstd compression is available */ #cmakedefine01 LLVM_ENABLE_ZSTD -/* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ -#cmakedefine LLVM_HAVE_TF_API - -/* Define if LLVM is using tflite instead of libtensorflow */ +/* Define if LLVM is using tflite */ #cmakedefine LLVM_HAVE_TFLITE /* Define to 1 if you have the header file. */