solve conflict li

tools/interact_tools.py

@@ -31,12 +31,14 @@ def download_checkpoint(url, folder, filename):
     filepath = os.path.join(folder, filename)
 
     if not os.path.exists(filepath):
+        print("download sam checkpoints ......")
         response = requests.get(url, stream=True)
         with open(filepath, "wb") as f:
             for chunk in response.iter_content(chunk_size=8192):
                 if chunk:
                     f.write(chunk)
 
+        print("download successfully!")
     return filepath
 
 class SamControler():

tracker/base_tracker.py

@@ -58,10 +58,7 @@ if __name__ == '__main__':
     first_frame_path = '/ssd1/gaomingqi/datasets/davis/Annotations/480p/dance-twirl/00000.png'
 
     # load frames
-<<<<<<< HEAD
-=======
     frames = ["test_confict"]
->>>>>>> a5606340a199569856ffa1585aeeff5a40cc34ba
     for video_path in video_path_list:
         frames.append(np.array(Image.open(video_path).convert('RGB')))
     frames = np.stack(frames, 0)    # N, H, W, C