Reverting changes specific to jeanzay

agimus-project · Sep 14, 2023 · 15aad8e · 15aad8e
1 parent 2d7e77a
commit 15aad8e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,4 @@
-name: happypose2
+name: happypose
 channels:
    - conda-forge
    - pytorch

diff --git a/happypose/pose_estimators/megapose/src/megapose/evaluation/prediction_runner.py b/happypose/pose_estimators/megapose/src/megapose/evaluation/prediction_runner.py
@@ -106,9 +106,6 @@
 
 CNOS_SUBMISSION_PATHS = {ds_name: CNOS_SUBMISSION_DIR / fname for ds_name, fname in CNOS_SUBMISSION_FILES.items()}
 # Check if all paths exist
-print("cnos values =", CNOS_SUBMISSION_PATHS.values())
-print("len cnos =", len(CNOS_SUBMISSION_FILES))
-print("sum=", sum(p.exists() for p in CNOS_SUBMISSION_PATHS.values()))
 assert( sum(p.exists() for p in CNOS_SUBMISSION_PATHS.values()) == len(CNOS_SUBMISSION_FILES))
 ##################################
 ##################################
@@ -284,25 +281,11 @@ def get_predictions(self, pose_estimator: PoseEstimator) -> Dict[str, PoseEstima
             df_targets = pd.read_json(self.scene_ds.ds_dir / "test_targets_bop19.json")
 
         for n, data in enumerate(tqdm(self.dataloader)):
-            print('\n\n\n\n################')
-            print(f'DATA FROM DATALOADER {self.scene_ds.ds_dir.name}', f'{n}/{len(self.dataloader)}')
-            print('data["im_infos"]:', data['im_infos'])
-            print('################')
             # data is a dict
             rgb = data["rgb"]
             depth = data["depth"]
             K = data["cameras"].K
 
-            # ############ RUN ONLY BEGINNING OF DATASET
-            # # if n > 0:
-            #if n < 220:
-            # # if n != 582:
-            #     print('################')
-            #     print('Prediction runner SKIP')
-            #     print('################')
-            #     continue
-            # ############ RUN ONLY BEGINNING OF DATASET
-
             # Dirty but avoids creating error when running with real detector
             dt_det = 0
 

diff --git a/happypose/pose_estimators/megapose/src/megapose/scripts/distributed.py b/happypose/pose_estimators/megapose/src/megapose/scripts/distributed.py
@@ -120,7 +120,7 @@ def init_distributed_mode():
         backend="nccl",
         rank=rank,
         world_size=world_size,
-        timeout=datetime.timedelta(seconds=1800 * 16),
+        timeout=datetime.timedelta(seconds=1800 * 4),
     )
     torch.distributed.barrier()
 

diff --git a/happypose/toolbox/utils/distributed.py b/happypose/toolbox/utils/distributed.py
@@ -39,7 +39,7 @@ def get_tmp_dir() -> Path:
     if "JOB_DIR" in os.environ:
         tmp_dir = Path(os.environ["JOB_DIR"]) / "tmp"
     else:
-        tmp_dir = Path("/gpfsscratch/rech/zja/udg82mu/happypose_datasets/results/tmp/megapose_job")
+        tmp_dir = Path("/tmp/megapose_job")
     tmp_dir.parent.mkdir(exist_ok=True)
     tmp_dir.mkdir(exist_ok=True)
     return tmp_dir
@@ -149,6 +149,6 @@ def init_distributed_mode() -> None:
         backend="nccl",
         rank=rank,
         world_size=world_size,
-        timeout=datetime.timedelta(seconds=16 * 1800),  # 2 hours
+        timeout=datetime.timedelta(seconds=4 * 1800),  # 2 hours
     )
     torch.distributed.barrier()
diff --git a/happypose/toolbox/utils/tensor_collection.py b/happypose/toolbox/utils/tensor_collection.py
@@ -26,10 +26,6 @@
 # MegaPose
 from happypose.toolbox.utils.distributed import get_rank, get_world_size
 
-from happypose.pose_estimators.megapose.src.megapose.config import (
-    RESULTS_DIR,
-)
-
 def concatenate(datas):
     datas = [data for data in datas if len(data) > 0]
     if len(datas) == 0:
@@ -171,7 +167,6 @@ def gather_distributed(self, tmp_dir=None):
 
         if rank > 0:
             tmp_file = tmp_file_template.format(rank=rank)
-            print("tmp_file =", tmp_file)
             torch.save(self, tmp_file)
 
         if world_size > 1: