diff options
Diffstat (limited to 'verif')
| -rw-r--r-- | verif/tosa_ref_run.py | 18 | ||||
| -rw-r--r-- | verif/tosa_serializer.py | 8 |
2 files changed, 3 insertions, 23 deletions
diff --git a/verif/tosa_ref_run.py b/verif/tosa_ref_run.py index 26c64da..098f39b 100644 --- a/verif/tosa_ref_run.py +++ b/verif/tosa_ref_run.py @@ -14,6 +14,7 @@ import os # See the License for the specific language governing permissions and # limitations under the License. +import os import json import shlex import subprocess @@ -31,24 +32,9 @@ class TosaRefRunner(TosaTestRunner): ref_cmd = [ args.ref_model_path, - "-Csubgraph_file={}".format(self.testDesc["tosa_file"]), - "-Csubgraph_dir={}".format(self.testDir), - "-Cinput_dir={}".format(self.testDir), - "-Coutput_dir={}".format(self.testDir), - "-Coutput_tensor_prefix=ref-", # Naming agreement with TosaSerializer + "-Ctest_desc={}".format(os.path.join(self.testDir, "desc.json")), ] - # Build up input tensor_name/filename list - inputTensors = [] - for i in range(len(self.testDesc["ifm_placeholder"])): - inputTensors.append( - "{}:{}".format( - self.testDesc["ifm_placeholder"][i], self.testDesc["ifm_file"][i] - ) - ) - - ref_cmd.append("-Cinput_tensor={}".format(",".join(inputTensors))) - if args.ref_debug: ref_cmd.extend(["-dALL", "-l{}".format(args.ref_debug)]) diff --git a/verif/tosa_serializer.py b/verif/tosa_serializer.py index 5ed9877..3b03252 100644 --- a/verif/tosa_serializer.py +++ b/verif/tosa_serializer.py @@ -645,30 +645,24 @@ class TosaSerializer: test_desc["tosa_file"] = tosa_filename ifm_name = [] - ifm_shape = [] ifm_file = [] ofm_name = [] ofm_file = [] - ofm_shape = [] for b in self.basicBlocks: if b.name == "main": for i in b.inputs: ifm_name.append(i) - ifm_shape.append(b.tensors[i].shape) ifm_file.append(b.tensors[i].placeholderFilename) for o in b.outputs: ofm_name.append(o) - ofm_shape.append(b.tensors[o].shape) # Make up an OFM filename here. One isn't generated until the reference tool is # run, so any name is a good name ofm_file.append("ref-{}.npy".format(o)) - test_desc["ifm_placeholder"] = ifm_name + test_desc["ifm_name"] = ifm_name test_desc["ifm_file"] = ifm_file - test_desc["ifm_shape"] = ifm_shape test_desc["ofm_name"] = ofm_name - test_desc["ofm_shape"] = ofm_shape test_desc["ofm_file"] = ofm_file test_desc["expected_failure"] = self.expectedFailure if self.expectedFailureDesc: |