format all files with yapf (#539)

Author: tgerdesnv

Dockerfile

@@ -81,6 +81,7 @@ RUN python3 -m pip install types-requests
 RUN python3 -m pip install types-protobuf
 RUN python3 -m pip install mkdocs
 RUN python3 -m pip install mkdocs-htmlproofer-plugin
+RUN python3 -m pip install yapf==0.32.0
 
 RUN apt-get install -y wkhtmltopdf
 

experiments/experiment_plot.py

@@ -103,9 +103,17 @@ def get_top_n_values(self, metric_name, n=10, ascending=False):
         result = result.head(n=n).reset_index(drop=True)
         return result
 
-    def plot_histogram(self, data, title, x_label, y_label="Frequency",
-                       xticks=None, bins=None, align="left", figsize=None,
-                       fontsize=None, alpha=0.7):
+    def plot_histogram(self,
+                       data,
+                       title,
+                       x_label,
+                       y_label="Frequency",
+                       xticks=None,
+                       bins=None,
+                       align="left",
+                       figsize=None,
+                       fontsize=None,
+                       alpha=0.7):
         """
         Plot histogram of the given data.
 
@@ -115,8 +123,13 @@ def plot_histogram(self, data, title, x_label, y_label="Frequency",
             A dictionary that maps a name to its corresponding
             data of type pd.DataFrame.
         """
-        self._ax = data.plot(kind="hist", xticks=xticks, bins=bins, align=align,
-                     figsize=figsize, fontsize=fontsize, alpha=alpha)
+        self._ax = data.plot(kind="hist",
+                             xticks=xticks,
+                             bins=bins,
+                             align=align,
+                             figsize=figsize,
+                             fontsize=fontsize,
+                             alpha=alpha)
 
         self._ax.set_title(title, fontsize=fontsize)
         self._ax.set_xlabel(x_label, fontsize=fontsize)

format.py

@@ -81,8 +81,8 @@ def visit(path):
 
     # Check the version of yapf. Needs a consistent version
     # of yapf to prevent unneccessary changes in the code.
-    if (yapf.__version__ != '0.30.0'):
-        print("Needs yapf 0.30.0, but got yapf {}".format(yapf.__version__))
+    if (yapf.__version__ != '0.32.0'):
+        print("Needs yapf 0.32.0, but got yapf {}".format(yapf.__version__))
 
     if (FLAGS.paths is None) or (len(FLAGS.paths) == 0):
         parser.print_help()

model_analyzer/config/generate/automatic_model_config_generator.py

@@ -30,14 +30,10 @@
 class AutomaticModelConfigGenerator(BaseModelConfigGenerator):
     """ Given a model, generates model configs in automatic search mode """
 
-    def __init__(self, 
-                 config: ConfigCommandProfile, 
-                 gpus: List[GPUDevice], 
-                 model: ModelProfileSpec, 
-                 client: TritonClient,
-                 model_variant_name_manager: ModelVariantNameManager, 
-                 default_only: bool, 
-                 early_exit_enable: bool) -> None:
+    def __init__(self, config: ConfigCommandProfile, gpus: List[GPUDevice],
+                 model: ModelProfileSpec, client: TritonClient,
+                 model_variant_name_manager: ModelVariantNameManager,
+                 default_only: bool, early_exit_enable: bool) -> None:
         """
         Parameters
         ----------

model_analyzer/config/generate/base_model_config_generator.py

@@ -31,14 +31,10 @@
 class BaseModelConfigGenerator(ConfigGeneratorInterface):
     """ Base class for generating model configs """
 
-    def __init__(self, 
-                 config: ConfigCommandProfile, 
-                 gpus: List[GPUDevice], 
-                 model: ModelProfileSpec, 
-                 client: TritonClient,
-                 model_variant_name_manager: ModelVariantNameManager, 
-                 default_only: bool, 
-                 early_exit_enable: bool) -> None:
+    def __init__(self, config: ConfigCommandProfile, gpus: List[GPUDevice],
+                 model: ModelProfileSpec, client: TritonClient,
+                 model_variant_name_manager: ModelVariantNameManager,
+                 default_only: bool, early_exit_enable: bool) -> None:
         """
         Parameters
         ----------
@@ -93,7 +89,8 @@ def get_configs(self) -> Generator[ModelConfig, None, None]:
             yield (config)
             self._step()
 
-    def set_last_results(self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
+    def set_last_results(
+            self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
         """
         Given the results from the last ModelConfig, make decisions
         about future configurations to generate
@@ -144,7 +141,8 @@ def _make_remote_model_config(self) -> ModelConfig:
         if not self._config.reload_model_disable:
             self._client.load_model(self._base_model_name)
         model_config = ModelConfig.create_from_triton_api(
-            self._client, self._base_model_name, self._config.client_max_retries)
+            self._client, self._base_model_name,
+            self._config.client_max_retries)
         model_config.set_cpu_only(self._cpu_only)
         if not self._config.reload_model_disable:
             self._client.unload_model(self._base_model_name)
@@ -158,8 +156,9 @@ def _make_direct_mode_model_config(self, param_combo: Dict) -> ModelConfig:
             model_variant_name_manager=self._model_variant_name_manager)
 
     @staticmethod
-    def make_model_config(param_combo: dict, model: ModelProfileSpec,
-                          model_variant_name_manager: ModelVariantNameManager) -> ModelConfig:
+    def make_model_config(
+            param_combo: dict, model: ModelProfileSpec,
+            model_variant_name_manager: ModelVariantNameManager) -> ModelConfig:
         """
         Loads the base model config from the model repository, and then applies the
         parameters in the param_combo on top to create and return a new model config

model_analyzer/config/generate/brute_run_config_generator.py

@@ -27,6 +27,7 @@
 from model_analyzer.device.gpu_device import GPUDevice
 from model_analyzer.result.run_config_measurement import RunConfigMeasurement
 
+
 class BruteRunConfigGenerator(ConfigGeneratorInterface):
     """
     Generates all RunConfigs to execute via brute force given a list of models
@@ -66,13 +67,16 @@ def __init__(self,
 
         self._num_models = len(models)
 
-        self._curr_model_run_configs: List[Optional[ModelRunConfig]] = [None for n in range(self._num_models)]
+        self._curr_model_run_configs: List[Optional[ModelRunConfig]] = [
+            None for n in range(self._num_models)
+        ]
         self._curr_results: List = [[] for n in range(self._num_models)]
         self._curr_generators: Dict[int, ConfigGeneratorInterface] = {}
 
         self._skip_default_config = skip_default_config
 
-    def set_last_results(self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
+    def set_last_results(
+            self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
         for index in range(self._num_models):
             self._curr_results[index].extend(measurements)
 
@@ -96,7 +100,9 @@ def _get_next_config(self) -> Generator[RunConfig, None, None]:
     def _should_generate_non_default_configs(self) -> bool:
         return self._config.triton_launch_mode != 'remote'
 
-    def _generate_subset(self, index: int, default_only: bool) -> Generator[RunConfig, None, None]:
+    def _generate_subset(
+            self, index: int,
+            default_only: bool) -> Generator[RunConfig, None, None]:
         mrcg = ModelRunConfigGenerator(self._config, self._gpus,
                                        self._models[index], self._client,
                                        self._model_variant_name_manager,
@@ -125,7 +131,8 @@ def _send_results_to_generator(self, index: int) -> None:
         self._curr_results[index] = []
 
     @classmethod
-    def determine_triton_server_env(cls, models: List[ModelProfileSpec]) -> Dict:
+    def determine_triton_server_env(cls,
+                                    models: List[ModelProfileSpec]) -> Dict:
         """
         Given a list of models, return the triton environment
         """

model_analyzer/config/generate/config_generator_interface.py

@@ -16,6 +16,7 @@
 from typing import List, Optional, Generator, Any
 from model_analyzer.result.run_config_measurement import RunConfigMeasurement
 
+
 class ConfigGeneratorInterface(abc.ABC):
     """
     An interface class for config generators
@@ -40,5 +41,6 @@ def get_configs(self) -> Generator[Any, None, None]:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def set_last_results(self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
+    def set_last_results(
+            self, measurements: List[Optional[RunConfigMeasurement]]) -> None:
         raise NotImplementedError

model_analyzer/config/generate/coordinate.py

@@ -15,6 +15,7 @@
 from copy import deepcopy
 from typing import Iterator, Any, Union, List
 
+
 class Coordinate:
     """
     Class to define a coordinate in n-dimension space

model_analyzer/config/generate/coordinate_data.py

@@ -18,14 +18,16 @@
 
 CoordinateKey = Tuple[Coordinate, ...]
 
+
 class CoordinateData:
     """
     A class that tracks the measurement data in the current neighborhood
     and the visit counts of all the coordinates in the coordinate space.
     """
 
     def __init__(self) -> None:
-        self._measurements: Dict[CoordinateKey, Optional[RunConfigMeasurement]] = {}
+        self._measurements: Dict[CoordinateKey,
+                                 Optional[RunConfigMeasurement]] = {}
         self._visit_counts: Dict[CoordinateKey, int] = {}
         self._is_measured: Dict[CoordinateKey, bool] = {}
 

model_analyzer/config/generate/generator_utils.py

@@ -15,6 +15,7 @@
 from itertools import product
 from typing import Dict, List
 
+
 class GeneratorUtils:
     ''' Class for utility functions for Generators  '''