remove warning from yaml and dbsampler (open-mmlab#121)

* remove warning from yaml and dbsampler
zzyzzyzz · Jul 3, 2020 · 5904f8e · 5904f8e
1 parent 4337fc4
commit 5904f8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pcdet/config.py b/pcdet/config.py
@@ -51,9 +51,9 @@ def merge_new_config(config, new_config):
     if '_BASE_CONFIG_' in new_config:
         with open(new_config['_BASE_CONFIG_'], 'r') as f:
             try:
-                yaml_config = yaml.load(f)
-            except:
                 yaml_config = yaml.load(f, Loader=yaml.FullLoader)
+            except:
+                yaml_config = yaml.load(f)
         config.update(EasyDict(yaml_config))
 
     for key, val in new_config.items():
@@ -70,9 +70,9 @@ def merge_new_config(config, new_config):
 def cfg_from_yaml_file(cfg_file, config):
     with open(cfg_file, 'r') as f:
         try:
-            new_config = yaml.load(f)
-        except:
             new_config = yaml.load(f, Loader=yaml.FullLoader)
+        except:
+            new_config = yaml.load(f)
 
         merge_new_config(config=config, new_config=new_config)
 

diff --git a/pcdet/datasets/augmentor/database_sampler.py b/pcdet/datasets/augmentor/database_sampler.py
@@ -164,7 +164,7 @@ def __call__(self, data_dict):
 
         """
         gt_boxes = data_dict['gt_boxes']
-        gt_names = data_dict['gt_names']
+        gt_names = data_dict['gt_names'].astype(str)
         existed_boxes = gt_boxes
         total_valid_sampled_dict = []
         for class_name, sample_group in self.sample_groups.items():