Refactor path arguments to tosa-tools

tosa_verif_conformance_generator
- Move to using ref-model-path instead of ref-model-dir
- Add schema-path and flatc-path
- Add model_files module to locate default places for files
convert2conformance
- Remove default paths
verifier
- Switch to using exact path of verifier library
tosa_verif_run_tests
- Use conformance model_files to locate defaults

Change-Id: Ieca3b164670e2a7dcb047743667cc4e8317daa97
Signed-off-by: Josef Malmström <josef.malmstrom@arm.com>
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/verif/tests/test_tosa_verifier.py b/verif/tests/test_tosa_verifier.py
index 9524158..996939c 100644
--- a/verif/tests/test_tosa_verifier.py
+++ b/verif/tests/test_tosa_verifier.py
@@ -26,12 +26,12 @@ def test_verifier_lib_built():
 def test_checker_verifier_load_fail():
     with pytest.raises(VerifierError) as excinfo:
         VerifierLibrary(Path("/place-that-does-not-exist"))
-    assert str(excinfo.value).startswith(f"Could not find {VERIFIER_LIB}")
+    assert str(excinfo.value).startswith("Could not find verify library")
 
 
 @pytest.mark.postcommit
 def test_checker_verifier_load():
-    vlib = VerifierLibrary(VERIFIER_LIB_PATH.parent)
+    vlib = VerifierLibrary(VERIFIER_LIB_PATH)
     assert vlib
 
 
@@ -48,7 +48,7 @@ JSON_COMPLIANCE_DOT_PRODUCT = {
 
 @pytest.mark.postcommit
 def test_checker_verifier_dot_product_check():
-    vlib = VerifierLibrary(VERIFIER_LIB_PATH.parent)
+    vlib = VerifierLibrary(VERIFIER_LIB_PATH)
     assert vlib
 
     imp_arr = np.zeros((10, 10, 10), dtype=np.float32)
@@ -63,7 +63,7 @@ def test_checker_verifier_dot_product_check():
 
 @pytest.mark.postcommit
 def test_checker_verifier_dot_product_check_fail():
-    vlib = VerifierLibrary(VERIFIER_LIB_PATH.parent)
+    vlib = VerifierLibrary(VERIFIER_LIB_PATH)
     assert vlib
 
     imp_arr = np.zeros((10, 10, 10), dtype=np.float32)