fix tests - 7

Change-Id: I14286e665dcdba1e9bc10bb5a27dd6ced50372b0

python/tvm/driver/tvmc/compiler.py

@@ -251,15 +251,8 @@ def compile_model(
         source = str(mod) if source_type == "relay" else lib.get_source(source_type)
         dumps[source_type] = source
 
-<<<<<<< HEAD
     # Create a new tvmc model package object from the graph definition.
     package_path = tvmc_model.export_package(graph_module, package_path, cross, export_format)
-=======
-    # TODO we need to update this return to use the updated graph module APIs
-    #      as these getter functions will be deprecated in the next release (@leandron)
-    return graph_module.get_graph_json(), graph_module.get_lib(), graph_module.get_params(), dumps
-
->>>>>>> 99ce0408b... fix tests - 2
 
     # Write dumps to file.
     if dumps:

tests/python/relay/test_backend_graph_executor.py

@@ -173,7 +173,7 @@ def test_reshape_nop():
     func = relay.Function([x], relay.Tuple([z0, z1, z2]))
     x_data = np.random.rand(10, 4).astype("float32")
     graph = relay.build(tvm.IRModule.from_expr(func), "llvm")
-    graph_json_str = graph.get_json()
+    graph_json_str = graph.get_graph_json()
 
     graph_json = json.loads(graph_json_str)