Merge branch 'main' of github.com:THU-DA-6D-Pose-Group/GDR-Net into main

core/gdrn_modeling/data_loader.py

@@ -442,12 +442,12 @@ def read_data(self, dataset_dict):
 
             for _key in roi_keys:
                 if _key in ["roi_img", "roi_coord_2d"]:
-                    dataset_dict[_key] = torch.as_tensor(roi_infos[_key]).contiguous()
+                    dataset_dict[_key] = torch.as_tensor(np.array(roi_infos[_key])).contiguous()
                 elif _key in ["model_info", "scene_im_id", "file_name"]:
                     # can not convert to tensor
                     dataset_dict[_key] = roi_infos[_key]
                 else:
-                    dataset_dict[_key] = torch.tensor(roi_infos[_key])
+                    dataset_dict[_key] = torch.as_tensor(np.array(roi_infos[_key]))
 
             return dataset_dict
         #######################################################################################
@@ -458,7 +458,7 @@ def read_data(self, dataset_dict):
 
         # extent
         roi_extent = self._get_extents(dataset_name)[roi_cls]
-        dataset_dict["roi_extent"] = torch.tensor(roi_extent, dtype=torch.float32)
+        dataset_dict["roi_extent"] = torch.as_tensor(np.array(roi_extent), dtype=torch.float32)
 
         # load xyz =======================================================
         xyz_info = mmcv.load(inst_infos["xyz_path"])

core/gdrn_modeling/datasets/lm_blender.py

@@ -480,15 +480,15 @@ def test_vis():
         python -m core.datasets.lm_blender dataset_name
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
     test_vis()

core/gdrn_modeling/datasets/lm_dataset_d2.py

@@ -713,15 +713,15 @@ def test_vis():
     python this_file.py dataset_name
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
 

core/gdrn_modeling/datasets/lm_pbr.py

@@ -513,15 +513,15 @@ def test_vis():
         python -m core.datasets.lm_pbr dataset_name
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
 

core/gdrn_modeling/datasets/lm_syn_imgn.py

@@ -446,15 +446,15 @@ def test_vis():
         python -m core.datasets.lm_syn_imgn dataset_name
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
     test_vis()

core/gdrn_modeling/datasets/ycbv_bop_test.py

@@ -414,14 +414,14 @@ def test_vis():
         python -m core.datasets.ycbv_bop_test dataset_name
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from core.utils.data_utils import read_image_cv2
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
 

core/gdrn_modeling/datasets/ycbv_d2.py

@@ -618,15 +618,15 @@ def test_vis():
         "dataset_name" can be any pre-registered ones
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())
 

core/gdrn_modeling/datasets/ycbv_pbr.py

@@ -448,15 +448,15 @@ def test_vis():
         python -m core/datasets/ycbv_pbr.py ycbv_pbr_train
     """
     from lib.vis_utils.image import grid_show
-    from lib.utils.setup_logger import setup_my_logger
+    from lib.utils.setup_logger import setup_logger
 
     import detectron2.data.datasets  # noqa # add pre-defined metadata
     from lib.vis_utils.image import vis_image_mask_bbox_cv2
     from core.utils.utils import get_emb_show
     from core.utils.data_utils import read_image_cv2
 
     print("sys.argv:", sys.argv)
-    logger = setup_my_logger(name="core")
+    setup_logger()
     register_with_name_cfg(sys.argv[1])
     print("dataset catalog: ", DatasetCatalog.list())