2 files changed, 13 insertions, 7 deletions

diff --git a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
index a44f9027..31bfb539 100644
--- a/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
+++ b/lib/oeqa/runtime/miutils/tests/dldt_inference_engine_test.py
@@ -16,10 +16,18 @@ class DldtInferenceEngineTest(object):
         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)
+        python_cmd = 'from openvino.inference_engine import IENetwork, IECore; ie = IECore(); print(ie.available_devices)'
+        __, output = self.target.run('python3 -c "%s"' % python_cmd)
+        self.available_devices = output
 
     def tear_down(self):
         self.target.run('rm -rf %s' % self.work_dir)
 
+    def test_check_if_openvino_device_available(self, device):
+        if device not in self.available_devices:
+            return False, self.available_devices
+        return True, self.available_devices
+
     def test_can_download_input_file(self, proxy_port):
         return self.target.run('cd %s; wget %s -e https_proxy=%s' %
                                (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