fixes

Author: ismukhin

src/benchmark/frameworks/processes.py

@@ -1,7 +1,6 @@
 import abc
 import json
 import os
-import platform
 from datetime import datetime
 from pathlib import Path
 

src/benchmark/frameworks/tvm/tvm_process.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-import platform
 from ..processes import ProcessHandler
 
 
@@ -108,7 +107,7 @@ def _fill_command_line(self):
         else:
             raise Exception('Incorrect model parameters. Set model name or file names.')
         common_params += '-f mxnet '
-        python = ProcessHandler.get_cmd_python_version()
+        python = ProcessHandler.get_cmd_python_version(self._test)
         time_limit = self._test.indep_parameters.test_time_limit
         common_params += super()._fill_command_line()
         common_params += f' --time {time_limit}'
@@ -144,7 +143,7 @@ def _fill_command_line(self):
             common_params += (f'-m {model_pt} ')
         else:
             raise Exception('Incorrect model parameters. Set model name or file names.')
-        python = ProcessHandler.get_cmd_python_version()
+        python = ProcessHandler.get_cmd_python_version(self._test)
         time_limit = self._test.indep_parameters.test_time_limit
         common_params += super()._fill_command_line()
         common_params += f' --time {time_limit}'

src/benchmark/tests/test_processes.py

@@ -59,12 +59,6 @@ class DotDict(dict):
 WRAPPER_REGISTRY = FrameworkWrapperRegistry()
 
 
-@pytest.mark.parametrize('os', [['Linux', 'python3'], ['Windows', 'python']])
-def test_python_version(os, mocker):
-    mocker.patch('platform.system', return_value=os[0])
-    assert ProcessHandler.get_cmd_python_version() == os[1]
-
-
 @pytest.mark.parametrize('inference_framework', [['OpenVINO DLDT', OpenVINOProcess],
                                                  ['Caffe', IntelCaffeProcess],
                                                  ['TensorFlow', TensorFlowProcess],

src/deployment/jenkins/logger.py

@@ -24,4 +24,4 @@ def configure_logger(name='', level=log.INFO, use_default_formatter=False):
     logger.addHandler(file_handler)
 
     logger.propagate = False
-    return logger
+    return logger

src/deployment/jenkins/tvm_build_envs.py

@@ -1,6 +1,5 @@
 import sys
 import argparse
-import os
 import subprocess
 
 
@@ -17,14 +16,17 @@ def _run(self, cmd):
     def create_envs(self):
         if len(self.frameworks) != 0:
             for framework in self.frameworks:
-                self._run(f'{self.conda_prefix}/bin/conda create -y --name tvm_{framework}_{self.branch} --clone tvm_main_{self.branch}')
+                command1 = f'{self.conda_prefix}/bin/conda create -y '
+                command2 = f'--name tvm_{framework}_{self.branch} --clone tvm_main_{self.branch}'
+                self._run(command1 + command2)
                 if framework != 'mxnet':
                     self._run(f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3 install {framework}')
                 else:
-                    self._run(f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3 install {framework}==1.9.1')
-                    self._run(f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3 install gluoncv[full]')
-                    self._run(f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3 uninstall -y numpy')
-                    self._run(f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3 install numpy==1.23.1')
+                    pip_str = f'{self.conda_prefix}/envs/tvm_{framework}_{self.branch}/bin/pip3'
+                    self._run(pip_str + f' install {framework}==1.9.1')
+                    self._run(pip_str + f' install gluoncv[full]')
+                    self._run(pip_str + f' uninstall -y numpy')
+                    self._run(pip_str + f' install numpy==1.23.1')
 
 
 def cli_arguments_parse():
@@ -54,11 +56,12 @@ def cli_arguments_parse():
 
     return parser.parse_args()
 
+
 def main():
     args = cli_arguments_parse()
     cr = EnvCreator(args.frameworks, args.py, args.conda, args.branch)
     cr.create_envs()
 
 
-if __name__=='__main__':
-    sys.exit(main() or 0)
+if __name__ == '__main__':
+    sys.exit(main() or 0)

src/deployment/jenkins/tvm_build_pipeline.py

@@ -1,6 +1,5 @@
 import sys
 import argparse
-import os
 import subprocess
 
 
@@ -19,7 +18,10 @@ def build_tvm(self):
         self._run(f'{self.conda}/bin/conda install -n tvm_main_{self.branch} -c conda-forge -y gxx_linux-64')
         self._run(f'{self.conda}/envs/tvm_main_{self.branch}/bin/pip3 install -r requirements.txt')
         self._run(f'git clone --recursive https://github.com/apache/tvm -b {self.branch}')
-        self._run(f'cd tvm && mkdir -p build && cd build && cmake -DUSE_LLVM=ON -DUSE_BLAS=openblas ../ && make -j$(nproc --all) && cd ../python && {self.conda}/envs/tvm_main_{self.branch}/bin/python setup.py install --user')
+        command1 = 'cd tvm && mkdir -p build && cd build && cmake -DUSE_LLVM=ON -DUSE_BLAS=openblas ../ && '
+        command2 = 'make -j$(nproc --all) && cd ../python && '
+        command3 = f'{self.conda}/envs/tvm_main_{self.branch}/bin/python setup.py install --user' 
+        self._run(command1 + command2 + command3)
 
 
 def cli_arguments_parse():

src/deployment/jenkins/tvm_compile_pipeline.py

@@ -2,7 +2,6 @@
 import sys
 import subprocess
 from logger import configure_logger
-import traceback
 from pathlib import Path
 
 sys.path.append(str(Path(__file__).parents[3]))
@@ -18,7 +17,7 @@ def __init__(self, filepath):
 
     def parse(self):
         if not self.filepath.exists():
-            raise FileNotFoundError('File doesn\'t exist.')
+            raise FileNotFoundError('File not found.')
         log.info(f'Parsing file: {self.filepath.as_posix()}')
         with self.filepath.open() as file:
             self.lines = file.read().splitlines()
@@ -42,18 +41,18 @@ def __init__(self, models_dir, conda, output_dir, vm, branch):
             self.output_dir = output_dir
         else:
             self.output_dir = models_dir
-        self._command_line = f''
+        self._command_line = ''
 
     def _add_argument(self, name_of_arg, value_of_arg):
         if value_of_arg != '':
             self._command_line += f' {name_of_arg} {value_of_arg}'
 
     def _add_option(self, name_of_arg):
-        self._command_line += f' {name_of_arg}'      
+        self._command_line += f' {name_of_arg}'
 
     def create_command_line(self, model_name, target, batch, opt_level):
         self._command_line = (f'{self.conda}/envs/tvm_main_{self.branch}/bin/python3 ' + f'{self.converter}')
-        self._add_argument('--mod', f'{self.models_dir}/{model_name}/batch_{batch}/{model_name}.json')            
+        self._add_argument('--mod', f'{self.models_dir}/{model_name}/batch_{batch}/{model_name}.json') 
         self._add_argument('--params', f'{self.models_dir}/{model_name}/batch_{batch}/{model_name}.params')
         self._add_argument('-t', f'"{target}"')
         self._add_argument('--opt_level', f'{opt_level}')
@@ -69,7 +68,6 @@ def execute(self):
         self._command_line = ''
 
 
-
 def cli_arguments_parse():
     parser = argparse.ArgumentParser()
 
@@ -128,12 +126,10 @@ def main():
             for level in args.opt_levels:
                 proc.create_command_line(
                     model_name, args.target,
-                    batch, level
+                    batch, level,
                 )
                 proc.execute()
 
 
-
-
-if __name__=='__main__':
-    sys.exit(main() or 0)
+if __name__ == '__main__':
+    sys.exit(main() or 0)

src/deployment/jenkins/tvm_convert_pipeline.py

@@ -2,7 +2,6 @@
 import sys
 import subprocess
 from logger import configure_logger
-import traceback
 from pathlib import Path
 
 sys.path.append(str(Path(__file__).parents[3]))
@@ -18,7 +17,7 @@ def __init__(self, filepath):
 
     def parse(self):
         if not self.filepath.exists():
-            raise FileNotFoundError('File doesn\'t exist.')
+            raise FileNotFoundError('File not found.')
         log.info(f'Parsing file: {self.filepath.as_posix()}')
         with self.filepath.open() as file:
             self.lines = file.read().splitlines()
@@ -37,22 +36,22 @@ def __init__(self, models_dir, conda, branch):
         self.converter = str(self.converter.joinpath('tvm_converter.py'))
         self.models_dir = models_dir.absolute().as_posix()
         self.branch = branch
-        self._command_line = f''
+        self._command_line = ''
 
     def _add_argument(self, name_of_arg, value_of_arg):
         if value_of_arg != '':
             self._command_line += f' {name_of_arg} {value_of_arg}'
 
     def _add_option(self, name_of_arg):
-        self._command_line += f' {name_of_arg}'      
+        self._command_line += f' {name_of_arg}'
 
     def create_command_line(self, model_name, model, weights,
                             framework, input_shape, batch, input_name):
         self._command_line = (f'{self.conda}/envs/tvm_{framework}_{self.branch}/bin/python3 ' + f'{self.converter}')
         self._add_argument('-mn', model_name)
         if model != '':
             self._add_argument('-m', f'{self.models_dir}/{model}')
-        if weights != '':            
+        if weights != '':         
             self._add_argument('-w', f'{self.models_dir}/{weights}')
         if framework == 'torch':
             framework = 'pytorch'
@@ -70,7 +69,6 @@ def execute(self):
         self._command_line = ''
 
 
-
 def cli_arguments_parse():
     parser = argparse.ArgumentParser()
 
@@ -110,12 +108,10 @@ def main():
                 model_name, model,
                 weights, framework,
                 input_shape, batch,
-                input_name
+                input_name,
             )
             proc.execute()
 
 
-
-
-if __name__=='__main__':
-    sys.exit(main() or 0)
+if __name__ == '__main__':
+    sys.exit(main() or 0)

src/deployment/remote_helper.py

@@ -6,7 +6,7 @@ def __init__(self, log):
         self.my_log = log
 
     @staticmethod
-    def get_remote_helper(os_type, python ,log):
+    def get_remote_helper(os_type, python, log):
         if os_type == 'linux':
             from linux_remote_helper import LinuxRemoteHelper
             return LinuxRemoteHelper(python, log)

tests/smoke_test/configs/dl_models/mobilenet-v1-1.0-224-tf_OpenVINO_DLDT_async_mode.xml

@@ -48,6 +48,7 @@
             <Device>CPU</Device>
             <IterationCount>5</IterationCount>
             <TestTimeLimit>1</TestTimeLimit>
+            <PythonInterpreter>python3</PythonInterpreter>
         </FrameworkIndependent>
         <FrameworkDependent>
             <Mode>async</Mode>