Skip to content

Commit

Permalink
remove more configs in test files
Browse files Browse the repository at this point in the history
  • Loading branch information
mehrdadh committed Aug 15, 2022
1 parent 6230beb commit 1f8594a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 45 deletions.
2 changes: 1 addition & 1 deletion apps/howto_deploy/prepare_test_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def prepare_test_libs(base_path):
fadd_dylib.export_library(dylib_path)

# Compile library in system library mode
fadd_syslib = tvm.build(s, [A, B], "llvm --system-lib", name="addonesys")
fadd_syslib = tvm.build(s, [A, B], "llvm", name="addonesys")
syslib_path = os.path.join(base_path, "test_addone_sys.o")
fadd_syslib.save(syslib_path)

Expand Down
2 changes: 1 addition & 1 deletion apps/sgx/src/build_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def main():
)

with tvm.transform.PassContext(opt_level=3):
graph, lib, params = relay.build(net, "llvm --system-lib", params=params)
graph, lib, params = relay.build(net, "llvm", params=params)

build_dir = osp.abspath(sys.argv[1])
if not osp.isdir(build_dir):
Expand Down
2 changes: 1 addition & 1 deletion apps/wasm-standalone/wasm-graph/tools/build_graph_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def build_graph_lib(opt_level):
shape_dict = {input_name: img_data.shape}

mod, params = relay.frontend.from_onnx(onnx_model, shape_dict)
target = "llvm -mtriple=wasm32-unknown-unknown -mattr=+simd128 --system-lib"
target = "llvm -mtriple=wasm32-unknown-unknown -mattr=+simd128"

with tvm.transform.PassContext(opt_level=opt_level):
factory = relay.build(mod, target=target, params=params)
Expand Down
6 changes: 2 additions & 4 deletions tests/python/driver/tvmc/test_target.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ def test_parse_multiple_target():

def test_parse_hybrid_target():
"""Hybrid Target and external codegen"""
targets = parse_target(
"cmsis-nn -accelerator_config=ethos-u55-256, llvm -device=arm_cpu --system-lib"
)
targets = parse_target("cmsis-nn -accelerator_config=ethos-u55-256, llvm -device=arm_cpu")

assert len(targets) == 2
assert "cmsis-nn" == targets[0]["name"]
Expand Down Expand Up @@ -154,7 +152,7 @@ def test_parse_quotes_and_separators_on_options():


def test_parse_multiple_target_with_opts_ethos_n78():
targets = parse_target("ethos-n -myopt=value, llvm -device=arm_cpu --system-lib")
targets = parse_target("ethos-n -myopt=value, llvm -device=arm_cpu")

assert len(targets) == 2
assert "ethos-n" == targets[0]["name"]
Expand Down
2 changes: 1 addition & 1 deletion tests/python/driver/tvmc/test_target_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_skip_target_from_codegen():
def test_target_recombobulation_single():
tvm_target, _ = target_from_cli("llvm", {"llvm": {"mcpu": "cortex-m3"}})

assert str(tvm_target) == "llvm -keys=arm_cpu,cpu -link-params=0 -mcpu=cortex-m3"
assert str(tvm_target) == "llvm -keys=arm_cpu,cpu -mcpu=cortex-m3"


def test_target_recombobulation_many():
Expand Down
2 changes: 1 addition & 1 deletion tests/python/relay/aot/test_cpp_aot.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def test_create_executor():
x = tvm.relay.var("x", tvm.relay.TensorType([1], dtype="float32"))
expr = tvm.relay.add(x, tvm.relay.Constant(tvm.nd.array(np.array([1], dtype="float32"))))
actual = relay.create_executor(
"aot", mod=tvm.IRModule.from_expr(tvm.relay.Function([x], expr)), target="c -executor=aot"
"aot", mod=tvm.IRModule.from_expr(tvm.relay.Function([x], expr)), target="c"
).evaluate()(np.array([2], dtype="float32"))

np.isfinite(np.array([3], dtype="float32"))
Expand Down
36 changes: 0 additions & 36 deletions tests/python/relay/aot/test_crt_aot.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,42 +710,6 @@ def test_name_sanitiser_name_clash():
)


# This tests for deprecated AOT executor arguments
# TODO(Mousius) Remove deprecated arguments later
def test_deprecated_target_arguments():
"""Tests we can still use relay.build with -executor, -runtime and -link-params"""

interface_api = "c"
use_unpacked_api = True
test_runner = AOT_DEFAULT_RUNNER

input_x = relay.var("x", shape=(1, 10))
input_y = relay.var("y", shape=(1, 10))
func_add = relay.add(input_x, input_y)
func = relay.Function([input_x, input_y], func_add)

x_in = np.ones((1, 10)).astype("float32")
y_in = np.random.uniform(size=(1, 10)).astype("float32")

params = {"x": x_in}
inputs = {"y": y_in}
output_list = generate_ref_data(func, inputs, params)

compile_and_run(
AOTTestModel(
module=IRModule.from_expr(func),
inputs=inputs,
outputs=output_list,
params=params,
),
test_runner,
interface_api,
use_unpacked_api,
use_runtime_executor=False,
target="c -executor=aot --link-params -runtime=c -interface-api=c --unpacked-api",
)


def test_aot_codegen_backend_alloc_workspace_calls():
"""This test checks whether AoT lowering creates TVMBackendAllocWorkspace calls"""

Expand Down

0 comments on commit 1f8594a

Please sign in to comment.