From 9ffd5779c9baf092bd792988671a3348b126a273 Mon Sep 17 00:00:00 2001
From: Joseph Omar <j.omar@soton.ac.uk>
Date: Mon, 2 Dec 2024 16:00:26 +0000
Subject: [PATCH] refactor imports to use dino namespace

---
 dino/eval_copy_detection.py     | 6 +++---
 dino/eval_image_retrieval.py    | 6 +++---
 dino/eval_knn.py                | 4 ++--
 dino/eval_linear.py             | 4 ++--
 dino/eval_video_segmentation.py | 4 ++--
 dino/main_dino.py               | 6 +++---
 dino/run_with_submitit.py       | 2 +-
 dino/video_generation.py        | 4 ++--
 dino/vision_transformer.py      | 2 +-
 dino/visualize_attention.py     | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dino/eval_copy_detection.py b/dino/eval_copy_detection.py
index 73dcd50..9bfe79e 100644
--- a/dino/eval_copy_detection.py
+++ b/dino/eval_copy_detection.py
@@ -25,9 +25,9 @@ from torchvision import transforms as pth_transforms
 from PIL import Image, ImageFile
 import numpy as np
 
-import utils
-import vision_transformer as vits
-from eval_knn import extract_features
+import dino.utils
+import dino.vision_transformer as vits
+from dino.eval_knn import extract_features
 
 
 class CopydaysDataset():
diff --git a/dino/eval_image_retrieval.py b/dino/eval_image_retrieval.py
index 999f8c9..612f418 100644
--- a/dino/eval_image_retrieval.py
+++ b/dino/eval_image_retrieval.py
@@ -25,9 +25,9 @@ from torchvision import transforms as pth_transforms
 from PIL import Image, ImageFile
 import numpy as np
 
-import utils
-import vision_transformer as vits
-from eval_knn import extract_features
+import dino.utils
+import dino.vision_transformer as vits
+from dino.eval_knn import extract_features
 
 
 class OxfordParisDataset(torch.utils.data.Dataset):
diff --git a/dino/eval_knn.py b/dino/eval_knn.py
index fe99a26..53a776b 100644
--- a/dino/eval_knn.py
+++ b/dino/eval_knn.py
@@ -23,8 +23,8 @@ from torchvision import datasets
 from torchvision import transforms as pth_transforms
 from torchvision import models as torchvision_models
 
-import utils
-import vision_transformer as vits
+import dino.utils
+import dino.vision_transformer as vits
 
 
 def extract_feature_pipeline(args):
diff --git a/dino/eval_linear.py b/dino/eval_linear.py
index cdef16b..ada7529 100644
--- a/dino/eval_linear.py
+++ b/dino/eval_linear.py
@@ -24,8 +24,8 @@ from torchvision import datasets
 from torchvision import transforms as pth_transforms
 from torchvision import models as torchvision_models
 
-import utils
-import vision_transformer as vits
+import dino.utils
+import dino.vision_transformer as vits
 
 
 def eval_linear(args):
diff --git a/dino/eval_video_segmentation.py b/dino/eval_video_segmentation.py
index 08a18c4..e851971 100644
--- a/dino/eval_video_segmentation.py
+++ b/dino/eval_video_segmentation.py
@@ -30,8 +30,8 @@ from torch.nn import functional as F
 from PIL import Image
 from torchvision import transforms
 
-import utils
-import vision_transformer as vits
+import dino.utils
+import dino.vision_transformer as vits
 
 
 @torch.no_grad()
diff --git a/dino/main_dino.py b/dino/main_dino.py
index cade987..317925d 100644
--- a/dino/main_dino.py
+++ b/dino/main_dino.py
@@ -30,9 +30,9 @@ import torch.nn.functional as F
 from torchvision import datasets, transforms
 from torchvision import models as torchvision_models
 
-import utils
-import vision_transformer as vits
-from vision_transformer import DINOHead
+import dino.utils
+import dino.vision_transformer as vits
+from dino.vision_transformer import DINOHead
 
 torchvision_archs = sorted(name for name in torchvision_models.__dict__
     if name.islower() and not name.startswith("__")
diff --git a/dino/run_with_submitit.py b/dino/run_with_submitit.py
index 33d4116..9a4696b 100644
--- a/dino/run_with_submitit.py
+++ b/dino/run_with_submitit.py
@@ -20,7 +20,7 @@ import os
 import uuid
 from pathlib import Path
 
-import main_dino
+import dino.main_dino
 import submitit
 
 
diff --git a/dino/video_generation.py b/dino/video_generation.py
index 94da983..f90ae86 100644
--- a/dino/video_generation.py
+++ b/dino/video_generation.py
@@ -26,8 +26,8 @@ from torchvision import transforms as pth_transforms
 import numpy as np
 from PIL import Image
 
-import utils
-import vision_transformer as vits
+import dino.utils
+import dino.vision_transformer as vits
 
 
 FOURCC = {
diff --git a/dino/vision_transformer.py b/dino/vision_transformer.py
index f69a7ad..4ad8004 100644
--- a/dino/vision_transformer.py
+++ b/dino/vision_transformer.py
@@ -21,7 +21,7 @@ from functools import partial
 import torch
 import torch.nn as nn
 
-from utils import trunc_normal_
+from dino.utils import trunc_normal_
 
 
 def drop_path(x, drop_prob: float = 0., training: bool = False):
diff --git a/dino/visualize_attention.py b/dino/visualize_attention.py
index 4288265..09891e6 100644
--- a/dino/visualize_attention.py
+++ b/dino/visualize_attention.py
@@ -31,8 +31,8 @@ from torchvision import transforms as pth_transforms
 import numpy as np
 from PIL import Image
 
-import utils
-import vision_transformer as vits
+import dino.utils
+import dino.vision_transformer as vits
 
 
 def apply_mask(image, mask, color, alpha=0.5):
-- 
GitLab