5 files changed, 5 insertions, 106 deletions

diff --git a/lib/oeqa/runtime/miutils/dldtutils.py b/lib/oeqa/runtime/miutils/dldtutils.py
deleted file mode 100644
index 45bf2e12..00000000
--- a/lib/oeqa/runtime/miutils/dldtutils.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-def get_testdata_config(testdata, config):
-    return testdata.get(config)
diff --git a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
deleted file mode 100644
index a44f9027..00000000
--- a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import os
-script_path = os.path.dirname(os.path.realpath(__file__))
-files_path = os.path.join(script_path, '../../files/')
-
-class DldtInferenceEngineTest(object):
-    ie_input_files = {'ie_python_sample': 'classification_sample.py',
-                      'input': 'chicky_512.png',
-                      'input_download': 'https://raw.githubusercontent.com/opencv/opencv/master/samples/data/chicky_512.png',
-                      'model': 'squeezenet_v1.1.xml'}
-
-    def __init__(self, target, work_dir):
-        self.target = target
-        self.work_dir = work_dir
-
-    def setup(self):
-        self.target.run('mkdir -p %s' % self.work_dir)
-        self.target.copy_to(os.path.join(files_path, 'dldt-inference-engine', self.ie_input_files['ie_python_sample']),
-                            self.work_dir)
-
-    def tear_down(self):
-        self.target.run('rm -rf %s' % self.work_dir)
-
-    def test_can_download_input_file(self, proxy_port):
-        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
-                               (self.work_dir,
-                                self.ie_input_files['input_download'],
-                                proxy_port))
-
-    def test_dldt_ie_classification_with_device(self, device, ir_files_dir):
-        return self.target.run('classification_sample_async -d %s -i %s -m %s' %
-                               (device,
-                                os.path.join(self.work_dir, self.ie_input_files['input']),
-                                os.path.join(ir_files_dir, self.ie_input_files['model'])))
-
-    def test_dldt_ie_classification_python_api_with_device(self, device, ir_files_dir, extension=''):
-        if extension:
-            return self.target.run('python3 %s -d %s -i %s -m %s -l %s' %
-                                   (os.path.join(self.work_dir, self.ie_input_files['ie_python_sample']),
-                                    device,
-                                    os.path.join(self.work_dir, self.ie_input_files['input']),
-                                    os.path.join(ir_files_dir, self.ie_input_files['model']),
-                                    extension))
-        else:
-            return self.target.run('python3 %s -d %s -i %s -m %s' %
-                                   (os.path.join(self.work_dir, self.ie_input_files['ie_python_sample']),
-                                    device,
-                                    os.path.join(self.work_dir, self.ie_input_files['input']),
-                                    os.path.join(ir_files_dir, self.ie_input_files['model'])))
diff --git a/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py b/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py
deleted file mode 100644
index 7d3db15b..00000000
--- a/lib/oeqa/runtime/miutils/tests/dldt_model_optimizer_test.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os
-
-class DldtModelOptimizerTest(object):
-    mo_input_files = {'model': 'squeezenet_v1.1.caffemodel',
-                      'prototxt': 'deploy.prototxt'}
-    mo_exe = 'mo.py'
-
-    def __init__(self, target, work_dir):
-        self.target = target
-        self.work_dir = work_dir
-
-    def setup(self):
-        self.target.run('mkdir -p %s' % self.work_dir)
-
-    def tear_down(self):
-        self.target.run('rm -rf %s' % self.work_dir)
-
-    def test_dldt_mo_can_create_ir(self, mo_exe_dir, mo_files_dir):
-        return self.target.run('python3 %s --input_model %s --input_proto %s --output_dir %s --data_type FP16' %
-                               (os.path.join(mo_exe_dir, self.mo_exe),
-                                os.path.join(mo_files_dir, self.mo_input_files['model']),
-                                os.path.join(mo_files_dir, self.mo_input_files['prototxt']),
-                                self.work_dir))
diff --git a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
index 13afd1a4..869a4cbe 100644
--- a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
+++ b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
@@ -9,13 +9,13 @@ class MkldnnTest(object):
         self.target.run('rm /tmp/%s' % self.mkldnn_target_test_filename)
         
     def test_mkldnn_can_compile_and_execute(self):
-        mkldnn_src_dir = '/usr/src/debug/mkl-dnn/'
+        mkldnn_src_dir = '/usr/src/debug/onednn/'
         mkldnn_src_test_filename = 'api.c'
         mkldnn_src_test_file = ''
         
-        (status, output) = self.target.run('cd %s; find -name %s' % (mkldnn_src_dir, mkldnn_src_test_filename))
-        if status:
-            return status, output
+        (__, output) = self.target.run('cd %s; find -name %s' % (mkldnn_src_dir, mkldnn_src_test_filename))
+        if 'No such file or directory' in output:
+            return -1, output
 
         mkldnn_src_test_file = os.path.join(mkldnn_src_dir, output)
         (status, output) = self.target.run('gcc %s -o /tmp/%s -ldnnl' % (mkldnn_src_test_file, self.mkldnn_target_test_filename))
@@ -49,9 +49,7 @@ class MkldnnTest(object):
         return self._run_mkldnn_benchdnn_test('./benchdnn --reorder --batch=inputs/reorder/test_reorder_bfloat16')
         
     def test_mkldnn_rnn_api(self):
-        # test_rnn_inference was not yet ready and was expected to fail
-        # while waiting it to be ready, use test_rnn_small for now
-        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_small')
+        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_all')
         
     def test_mkldnn_shuffle_api(self):
         return self._run_mkldnn_benchdnn_test('./benchdnn --shuffle --batch=inputs/shuffle/test_shuffle_bfloat16')
\ No newline at end of file
diff --git a/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py b/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py
deleted file mode 100644
index a3e46a0a..00000000
--- a/lib/oeqa/runtime/miutils/tests/squeezenet_model_download_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-class SqueezenetModelDownloadTest(object):
-    download_files = {'squeezenet1.1.prototxt': 'https://raw.githubusercontent.com/DeepScale/SqueezeNet/a47b6f13d30985279789d08053d37013d67d131b/SqueezeNet_v1.1/deploy.prototxt',
-                      'squeezenet1.1.caffemodel': 'https://github.com/DeepScale/SqueezeNet/raw/a47b6f13d30985279789d08053d37013d67d131b/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel'}
-
-    def __init__(self, target, work_dir):
-        self.target = target
-        self.work_dir = work_dir
-
-    def setup(self):
-        self.target.run('mkdir -p %s' % self.work_dir)
-
-    def tear_down(self):
-        self.target.run('rm -rf %s' % self.work_dir)
-
-    def test_can_download_squeezenet_model(self, proxy_port):
-        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
-                               (self.work_dir,
-                                self.download_files['squeezenet1.1.caffemodel'],
-                                proxy_port))
-
-    def test_can_download_squeezenet_prototxt(self, proxy_port):
-        return self.target.run('cd %s; wget %s -e https_proxy=%s' %
-                               (self.work_dir,
-                                self.download_files['squeezenet1.1.prototxt'],
-                                proxy_port))