merge object detection da

Author: JunguangJiang

examples/domain_adaptation/object_detection/cycle_gan.py

@@ -29,12 +29,12 @@
 
 
 sys.path.append('../../..')
-import dalib.translation.cyclegan as cyclegan
-from dalib.translation.cyclegan.util import ImagePool, set_requires_grad
-from common.vision.transforms import Denormalize
-from common.utils.data import ForeverDataIterator
-from common.utils.meter import AverageMeter, ProgressMeter
-from common.utils.logger import CompleteLogger
+import tllib.translation.cyclegan as cyclegan
+from tllib.translation.cyclegan.util import ImagePool, set_requires_grad
+from tllib.vision.transforms import Denormalize
+from tllib.utils.data import ForeverDataIterator
+from tllib.utils.meter import AverageMeter, ProgressMeter
+from tllib.utils.logger import CompleteLogger
 
 
 device = torch.device("cuda" if torch.cuda.is_available() else "cpu")

examples/domain_adaptation/object_detection/d_adapt/bbox_adaptation.py

@@ -21,12 +21,12 @@
 import torch.nn.functional as F
 from detectron2.modeling.box_regression import Box2BoxTransform
 
-from common.utils.data import ForeverDataIterator
-from common.utils.meter import AverageMeter, ProgressMeter
-from common.utils.logger import CompleteLogger
-from common.modules.regressor import Regressor
-from dalib.adaptation.mdd import ImageRegressor, RegressionMarginDisparityDiscrepancy
-from dalib.adaptation.d_adapt.proposal import ProposalDataset, PersistentProposalList, flatten, ExpandCrop
+from tllib.utils.data import ForeverDataIterator
+from tllib.utils.meter import AverageMeter, ProgressMeter
+from tllib.utils.logger import CompleteLogger
+from tllib.modules.regressor import Regressor
+from tllib.alignment.mdd import ImageRegressor, RegressionMarginDisparityDiscrepancy
+from tllib.alignment.d_adapt.proposal import ProposalDataset, PersistentProposalList, flatten, ExpandCrop
 
 import utils
 

examples/domain_adaptation/object_detection/d_adapt/category_adaptation.py

@@ -24,16 +24,15 @@
 import torch.nn.functional as F
 
 sys.path.append('../../../..')
-from dalib.modules.domain_discriminator import DomainDiscriminator
-from dalib.adaptation.cdan import ConditionalDomainAdversarialLoss, ImageClassifier
-from dalib.adaptation.d_adapt.proposal import ProposalDataset, flatten, Proposal
-from common.utils.data import ForeverDataIterator
-from common.utils.metric import accuracy, ConfusionMatrix
-from common.utils.meter import AverageMeter, ProgressMeter
-from common.utils.logger import CompleteLogger
-from common.vision.transforms import ResizeImage
-
-sys.path.append('.')
+from tllib.modules.domain_discriminator import DomainDiscriminator
+from tllib.alignment.cdan import ConditionalDomainAdversarialLoss, ImageClassifier
+from tllib.alignment.d_adapt.proposal import ProposalDataset, flatten, Proposal
+from tllib.utils.data import ForeverDataIterator
+from tllib.utils.metric import accuracy, ConfusionMatrix
+from tllib.utils.meter import AverageMeter, ProgressMeter
+from tllib.utils.logger import CompleteLogger
+from tllib.vision.transforms import ResizeImage
+
 import utils
 
 device = torch.device("cuda" if torch.cuda.is_available() else "cpu")

examples/domain_adaptation/object_detection/d_adapt/d_adapt.py

@@ -25,14 +25,13 @@
 from detectron2.evaluation import inference_on_dataset
 
 sys.path.append('../../../..')
-import dalib.adaptation.d_adapt.modeling.meta_arch as models
-from dalib.adaptation.d_adapt.proposal import ProposalGenerator, ProposalMapper, PersistentProposalList, flatten
-from dalib.adaptation.d_adapt.feedback import get_detection_dataset_dicts, DatasetMapper
+import tllib.alignment.d_adapt.modeling.meta_arch as models
+from tllib.alignment.d_adapt.proposal import ProposalGenerator, ProposalMapper, PersistentProposalList, flatten
+from tllib.alignment.d_adapt.feedback import get_detection_dataset_dicts, DatasetMapper
 
 sys.path.append('..')
 import utils
 
-sys.path.append('.')
 import category_adaptation
 import bbox_adaptation
 

examples/domain_adaptation/object_detection/prepare_gta5_to_voc.py

@@ -21,9 +21,8 @@
 from detectron2.utils.events import EventStorage
 
 sys.path.append('../../..')
-import common.vision.models.object_detection.meta_arch as models
+import tllib.vision.models.object_detection.meta_arch as models
 
-sys.path.append('.')
 import utils
 
 

examples/domain_adaptation/object_detection/source_only.py

@@ -30,8 +30,8 @@
 from fvcore.common.param_scheduler import *
 import timm
 
-import common.vision.datasets.object_detection as datasets
-import common.vision.models as models
+import tllib.vision.datasets.object_detection as datasets
+import tllib.vision.models as models
 
 
 class PascalVOCDetectionPerClassEvaluator(PascalVOCDetectionEvaluator):

examples/domain_adaptation/object_detection/utils.py

@@ -18,9 +18,8 @@
 from detectron2.utils.visualizer import ColorMode
 
 sys.path.append('../../..')
-import common.vision.models.object_detection.meta_arch as models
+import tllib.vision.models.object_detection.meta_arch as models
 
-sys.path.append('.')
 import utils
 
 

examples/domain_adaptation/object_detection/visualize.py

@@ -12,7 +12,7 @@
 from detectron2.modeling.postprocessing import detector_postprocess
 from detectron2.modeling.meta_arch.build import META_ARCH_REGISTRY
 
-from common.vision.models.object_detection.meta_arch import TLGeneralizedRCNN
+from tllib.vision.models.object_detection.meta_arch import TLGeneralizedRCNN
 
 
 @META_ARCH_REGISTRY.register()

dalib/adaptation/d_adapt/__init__.py renamed to tllib/alignment/d_adapt/__init__.py

@@ -15,7 +15,7 @@
 from detectron2.data.detection_utils import convert_image_to_rgb
 from detectron2.utils.events import get_event_storage
 
-from common.vision.models.object_detection.meta_arch import TLRetinaNet
+from tllib.vision.models.object_detection.meta_arch import TLRetinaNet
 from ..matcher import MaxOverlapMatcher
 
 

dalib/adaptation/d_adapt/feedback.py renamed to tllib/alignment/d_adapt/feedback.py

@@ -10,7 +10,7 @@
     FastRCNNOutputLayers
 )
 from detectron2.structures import Instances
-from common.loss.label_smooth import LabelSmoothSoftmaxCEV1
+from tllib.modules.loss import LabelSmoothSoftmaxCEV1
 
 import torch