Public models: CMakeLists update for accommodating latest API update on bytecode and c module compilation.

Update on CmakeLists to accommodate latest API update on bytecode and c module compilation for public models.

Change-Id: Ife4ed2625da3031443ae5acdb4e3a54d9b1889a9

float_models/CMakeLists.txt

diff --git a/float_models/CMakeLists.txt b/float_models/CMakeLists.txt
index 5b1e99c..931609e 100644
--- a/float_models/CMakeLists.txt
+++ b/float_models/CMakeLists.txt
@@ -83,11 +83,11 @@
   SRCS
     "iree_exec/mobilenet_v1.c"
   DEPS
-    ::mobilenet_v1_bytecode_module_static
     ::mobilenet_v1_bytecode_module_static_c
+    ::mobilenet_v1_bytecode_module_static_lib
     ::mobilenet_input_c
     iree::vm::bytecode_module
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=200k"
 )
@@ -98,10 +98,10 @@
   SRCS
     "iree_exec/mobilenet_v1.c"
   DEPS
-    ::mobilenet_v1_c_module_static_c
     ::mobilenet_v1_c_module_static_emitc
+    ::mobilenet_v1_c_module_static_lib
     ::mobilenet_input_c
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=200k"
   COPTS
@@ -117,11 +117,11 @@
   SRCS
     "iree_exec/mnist.c"
   DEPS
-    ::mnist_bytecode_module_static
     ::mnist_bytecode_module_static_c
+    ::mnist_bytecode_module_static_lib
     ::mnist_input_c
     iree::vm::bytecode_module
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=100k"
     "LINKER:--defsym=__heap_size__=512k"
@@ -133,10 +133,10 @@
   SRCS
     "iree_exec/mnist.c"
   DEPS
-    ::mnist_c_module_static_c
     ::mnist_c_module_static_emitc
+    ::mnist_c_module_static_lib
     ::mnist_input_c
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=100k"
     "LINKER:--defsym=__heap_size__=512k"

quant_models/CMakeLists.txt

diff --git a/quant_models/CMakeLists.txt b/quant_models/CMakeLists.txt
index 426c58c..0281dd9 100644
--- a/quant_models/CMakeLists.txt
+++ b/quant_models/CMakeLists.txt
@@ -95,10 +95,10 @@
     "iree_exec/mobilenet_v1.c"
   DEPS
     ::mobilenet_quant_input_c
-    ::mobilenet_v1_bytecode_module_static
     ::mobilenet_v1_bytecode_module_static_c
+    ::mobilenet_v1_bytecode_module_static_lib
     iree::vm::bytecode_module
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
 )
@@ -110,9 +110,9 @@
     "iree_exec/mobilenet_v1.c"
   DEPS
     ::mobilenet_quant_input_c
-    ::mobilenet_v1_c_module_static_c
     ::mobilenet_v1_c_module_static_emitc
-    model_util::util
+    ::mobilenet_v1_c_module_static_lib
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
   COPTS
@@ -129,10 +129,10 @@
     "iree_exec/mobilenet_v2.c"
   DEPS
     ::mobilenet_quant_input_c
-    ::mobilenet_v2_bytecode_module_static
     ::mobilenet_v2_bytecode_module_static_c
+    ::mobilenet_v2_bytecode_module_static_lib
     iree::vm::bytecode_module
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
     "LINKER:--defsym=__heap_size__=2m"
@@ -145,9 +145,9 @@
     "iree_exec/mobilenet_v2.c"
   DEPS
     ::mobilenet_quant_input_c
-    ::mobilenet_v2_c_module_static_c
     ::mobilenet_v2_c_module_static_emitc
-    model_util::util
+    ::mobilenet_v2_c_module_static_lib
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
     "LINKER:--defsym=__heap_size__=2m"
@@ -164,11 +164,11 @@
   SRCS
     "iree_exec/person_detection.c"
   DEPS
-    ::person_detection_bytecode_module_static
     ::person_detection_bytecode_module_static_c
+    ::person_detection_bytecode_module_static_lib
     ::person_detection_quant_input_c
     iree::vm::bytecode_module
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=128k"
     "LINKER:--defsym=__heap_size__=200k"
@@ -180,10 +180,10 @@
   SRCS
     "iree_exec/person_detection.c"
   DEPS
-    ::person_detection_c_module_static_c
     ::person_detection_c_module_static_emitc
+    ::person_detection_c_module_static_lib
     ::person_detection_quant_input_c
-    model_util::util
+    model_util::util_static
   LINKOPTS
     "LINKER:--defsym=__stack_size__=128k"
     "LINKER:--defsym=__heap_size__=200k"