diff --git a/src/finn/util/test.py b/src/finn/util/test.py index 132b700a263247c8ca29d34b41747749d27c3ab7..03a9d435a6d04659b2891815b33172586a7f0a96 100644 --- a/src/finn/util/test.py +++ b/src/finn/util/test.py @@ -139,7 +139,7 @@ def get_example_input(topology): "Get example numpy input tensor for given topology." if "fc" in topology: - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") onnx_tensor = onnx.load_tensor_from_string(raw_i) return nph.to_array(onnx_tensor) elif topology == "cnv": diff --git a/tests/brevitas/test_brevitas_debug.py b/tests/brevitas/test_brevitas_debug.py index 2ebaa251919a5c62f8998f6e64101129afc59db2..9115352796b0b90257d64ce9b14163ad372c9c98 100644 --- a/tests/brevitas/test_brevitas_debug.py +++ b/tests/brevitas/test_brevitas_debug.py @@ -55,7 +55,7 @@ def test_brevitas_debug(): assert len(model.graph.input) == 1 assert len(model.graph.output) == 1 # load one of the test vectors - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) # run using FINN-based execution input_dict = {"0": nph.to_array(input_tensor)} diff --git a/tests/brevitas/test_brevitas_fc.py b/tests/brevitas/test_brevitas_fc.py index 8397aaceb239b63ecfe54b86c680ae68e6d10ae1..24a453007515ba2eba4369a6b76829099f722168 100644 --- a/tests/brevitas/test_brevitas_fc.py +++ b/tests/brevitas/test_brevitas_fc.py @@ -68,7 +68,7 @@ def test_brevitas_fc_onnx_export_and_exec(size, wbits, abits): assert len(model.graph.input) == 1 assert len(model.graph.output) == 1 # load one of the test vectors - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) # run using FINN-based execution input_dict = {"0": nph.to_array(input_tensor)} diff --git a/tests/fpgadataflow/test_convert_to_hls_layers_fc.py b/tests/fpgadataflow/test_convert_to_hls_layers_fc.py index 252ea05fb29eac09d51ca79181a1cf9562dc7928..cb66fa7237416579b509aa4f508c9105d386d08a 100644 --- a/tests/fpgadataflow/test_convert_to_hls_layers_fc.py +++ b/tests/fpgadataflow/test_convert_to_hls_layers_fc.py @@ -110,7 +110,7 @@ def test_convert_to_hls_layers_tfc_w1a1(): model = model.transform(CompileCppSim()) model = model.transform(SetExecMode("cppsim")) - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) # run using FINN-based execution input_dict = {"global_in": nph.to_array(input_tensor)} @@ -175,7 +175,7 @@ def test_convert_to_hls_layers_tfc_w1a2(): model = model.transform(PrepareCppSim()) model = model.transform(CompileCppSim()) model = model.transform(SetExecMode("cppsim")) - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) # run using FINN-based execution input_dict = {"global_in": nph.to_array(input_tensor)} diff --git a/tests/transformation/streamline/test_sign_to_thres.py b/tests/transformation/streamline/test_sign_to_thres.py index aecaf0cca59051b0eebac821c1f2c2d7d894ddc6..4618dffc43f5cee848b580b77cf418c612b48f3e 100644 --- a/tests/transformation/streamline/test_sign_to_thres.py +++ b/tests/transformation/streamline/test_sign_to_thres.py @@ -52,7 +52,7 @@ def test_sign_to_thres(): new_model = model.transform(ConvertSignToThres()) assert new_model.graph.node[3].op_type == "MultiThreshold" # load one of the test vectors - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) input_dict = {"0": nph.to_array(input_tensor)} assert oxe.compare_execution(model, new_model, input_dict) diff --git a/tests/transformation/streamline/test_streamline_fc.py b/tests/transformation/streamline/test_streamline_fc.py index 008ea6f1b822e1c7a1978857b25e5a5794380e99..d88bf14913d2551cd7347c5617895998a7d56799 100644 --- a/tests/transformation/streamline/test_streamline_fc.py +++ b/tests/transformation/streamline/test_streamline_fc.py @@ -72,7 +72,7 @@ def test_streamline_fc(size, wbits, abits): model = model.transform(GiveReadableTensorNames()) model = model.transform(RemoveStaticGraphInputs()) # load one of the test vectors - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) # run using FINN-based execution input_dict = {"global_in": nph.to_array(input_tensor)} diff --git a/tests/transformation/test_batchnorm_to_affine_bnn_pynq.py b/tests/transformation/test_batchnorm_to_affine_bnn_pynq.py index 6cb6e35eb323a7170f7a98200b60bbae8be8c9f6..7e894c078b15c16f29dec60d694f8b6892e84a8a 100644 --- a/tests/transformation/test_batchnorm_to_affine_bnn_pynq.py +++ b/tests/transformation/test_batchnorm_to_affine_bnn_pynq.py @@ -77,7 +77,7 @@ def test_batchnorm_to_affine_lfc_w1a1(): model = model.transform(FoldConstants()) new_model = model.transform(BatchNormToAffine()) # load one of the test vectors - raw_i = get_data("finn.base-data", "onnx/mnist-conv/test_data_set_0/input_0.pb") + raw_i = get_data("finn.data", "onnx/mnist-conv/test_data_set_0/input_0.pb") input_tensor = onnx.load_tensor_from_string(raw_i) input_dict = {"0": nph.to_array(input_tensor)} assert oxe.compare_execution(model, new_model, input_dict)