diff --git a/llvm/cmake/modules/TensorFlowCompile.cmake b/llvm/cmake/modules/TensorFlowCompile.cmake --- a/llvm/cmake/modules/TensorFlowCompile.cmake +++ b/llvm/cmake/modules/TensorFlowCompile.cmake @@ -92,10 +92,10 @@ else() if ("${model}" STREQUAL "download") # Crash if the user wants to download a model but a URL is set to "TO_BE_UPDATED" - if ("${default_url}" STREQUAL "TO_BE_UPDATED") - message(FATAL_ERROR "Default URL was set to 'download' but there is no" - " model url currently specified in cmake - likely, the model interface" - " recently changed, and so there is not a released model available.") + if ("${default_url}" STREQUAL "") + message(FATAL_ERROR "Model path was set to 'download' but there is no" + " model url currently specified in cmake. You can generate a model" + " using, for example, the tools at http://github.com/google/ml-compiler-opt.") endif() set(model ${default_url}) diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt --- a/llvm/lib/Analysis/CMakeLists.txt +++ b/llvm/lib/Analysis/CMakeLists.txt @@ -2,10 +2,7 @@ include(TensorFlowCompile) set(LLVM_INLINER_MODEL_PATH_DEFAULT "models/inliner-Oz") - # This url points to the most recent most which is known to be compatible with - # LLVM. When better models are published, this url should be updated to aid - # discoverability. - set(LLVM_INLINER_MODEL_CURRENT_URL "https://github.com/google/ml-compiler-opt/releases/download/inlining-Oz-v1.1/inlining-Oz-99f0063-v1.1.tar.gz") + set(LLVM_INLINER_MODEL_CURRENT_URL "") if (DEFINED LLVM_HAVE_TF_AOT) tf_find_and_compile( 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 @@ -2,10 +2,7 @@ include(TensorFlowCompile) set(LLVM_RAEVICT_MODEL_PATH_DEFAULT "models/regalloc-eviction") - # This url points to the most recent most which is known to be compatible with - # LLVM. When better models are published, this url should be updated to aid - # discoverability. - set(LLVM_RAEVICT_MODEL_CURRENT_URL "https://github.com/google/ml-compiler-opt/releases/download/regalloc-evict-v1.0/regalloc-evict-e67430c-v1.0.tar.gz") + set(LLVM_RAEVICT_MODEL_CURRENT_URL "") if (DEFINED LLVM_HAVE_TF_AOT) tf_find_and_compile(