dthh commited on
Commit
917fb3c
·
verified ·
1 Parent(s): 6bd9e0d

Upload Models.py with huggingface_hub

Browse files
Files changed (1) hide show
  1. Models.py +20 -11
Models.py CHANGED
@@ -54,7 +54,7 @@ class ModelInterface:
54
  """
55
  Check if model files exist and download from hugging face if not.
56
  """
57
- if self.models is None:
58
  raise TypeError("No models are defined.")
59
 
60
  log_model_not_defined = "No model for '{level_string}' is defined. Prediction is skipped."
@@ -63,7 +63,7 @@ class ModelInterface:
63
  level = "surface_type"
64
  model_file = self.models.get(level)
65
  if model_file is None:
66
- logging.warning(log_model_not_defined.format(level_string=model_to_info_string[level]))
67
  else:
68
  self.download_model(model_file)
69
  _, surface_class_to_idx, _ = self.load_model(model=model_file)
@@ -72,12 +72,12 @@ class ModelInterface:
72
  level = "surface_quality"
73
  sub_models = self.models.get(level)
74
  if model_file is None:
75
- logging.warning(log_model_not_defined.format(level_string=model_to_info_string[level]))
76
  else:
77
  for surface_type in surface_class_to_idx:
78
  model_file = sub_models.get(surface_type)
79
  if model_file is None:
80
- logging.warning(log_model_not_defined.format(level_string=surface_type))
81
  else:
82
  self.download_model(model_file)
83
  self.load_model(model=model_file)
@@ -86,7 +86,7 @@ class ModelInterface:
86
  level = "road_type"
87
  model_file = self.models.get(level)
88
  if model_file is None:
89
- logging.warning(log_model_not_defined.format(level_string=model_to_info_string[level]))
90
  else:
91
  self.download_model(model_file)
92
  self.load_model(model=model_file)
@@ -102,13 +102,14 @@ class ModelInterface:
102
  Returns:
103
  dict: transformation.
104
  """
105
- if (level in self.models) and (transform is None):
106
- logging.warning(f"No transformation for {model_to_info_string[level]} prediction defined.")
107
- transform = {}
 
108
 
109
- if "normalize" not in transform:
110
- logging.info(f"No normalization parameters for {model_to_info_string[level]} prediction provided. Using default values.")
111
- transform["normalize"] = self._default_normalization
112
 
113
  return transform
114
 
@@ -331,6 +332,14 @@ class ModelInterface:
331
  if img_ids is None:
332
  img_ids = range(len(img_data_raw))
333
 
 
 
 
 
 
 
 
 
334
  # road type
335
  level = "road_type"
336
  model_file = self.models.get(level)
 
54
  """
55
  Check if model files exist and download from hugging face if not.
56
  """
57
+ if not self.models:
58
  raise TypeError("No models are defined.")
59
 
60
  log_model_not_defined = "No model for '{level_string}' is defined. Prediction is skipped."
 
63
  level = "surface_type"
64
  model_file = self.models.get(level)
65
  if model_file is None:
66
+ logging.info(log_model_not_defined.format(level_string=model_to_info_string[level]))
67
  else:
68
  self.download_model(model_file)
69
  _, surface_class_to_idx, _ = self.load_model(model=model_file)
 
72
  level = "surface_quality"
73
  sub_models = self.models.get(level)
74
  if model_file is None:
75
+ logging.info(log_model_not_defined.format(level_string=model_to_info_string[level]))
76
  else:
77
  for surface_type in surface_class_to_idx:
78
  model_file = sub_models.get(surface_type)
79
  if model_file is None:
80
+ logging.info(log_model_not_defined.format(level_string=surface_type))
81
  else:
82
  self.download_model(model_file)
83
  self.load_model(model=model_file)
 
86
  level = "road_type"
87
  model_file = self.models.get(level)
88
  if model_file is None:
89
+ logging.info(log_model_not_defined.format(level_string=model_to_info_string[level]))
90
  else:
91
  self.download_model(model_file)
92
  self.load_model(model=model_file)
 
102
  Returns:
103
  dict: transformation.
104
  """
105
+ if level in self.models:
106
+ if transform is None:
107
+ logging.warning(f"No transformation for {model_to_info_string[level]} prediction defined.")
108
+ transform = {}
109
 
110
+ if "normalize" not in transform:
111
+ logging.info(f"No normalization parameters for {model_to_info_string[level]} prediction provided. Using default values.")
112
+ transform["normalize"] = self._default_normalization
113
 
114
  return transform
115
 
 
332
  if img_ids is None:
333
  img_ids = range(len(img_data_raw))
334
 
335
+ # default values
336
+ road_classes = [None] * len(img_data_raw)
337
+ road_values = [None] * len(img_data_raw)
338
+ surface_classes = [None] * len(img_data_raw)
339
+ surface_values = [None] * len(img_data_raw)
340
+ quality_classes = [None] * len(img_data_raw)
341
+ quality_values = [None] * len(img_data_raw)
342
+
343
  # road type
344
  level = "road_type"
345
  model_file = self.models.get(level)