fixed linter issues (cvat-ai#2305)

manasars · Oct 14, 2020 · 7543f5e · 7543f5e
1 parent 29170ca
commit 7543f5e
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py
@@ -297,7 +297,7 @@ def update(self, instance, validated_data):
                     .format(db_label.name))
             if not label.get('color', None):
                 label_names = [l.name for l in
-                    models.Label.objects.filter(task_id=instance.id).exclude(id=db_label.id).order_by('id')
+                    instance.label_set.all().exclude(id=db_label.id).order_by('id')
                 ]
                 db_label.color = get_label_color(db_label.name, label_names)
             else:

diff --git a/serverless/openvino/dextr/nuclio/model_handler.py b/serverless/openvino/dextr/nuclio/model_handler.py
@@ -9,7 +9,7 @@
 
 class ModelHandler:
     def __init__(self):
-        base_dir = os.environ.get("MODEL_PATH", "/opt/nuclio")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH", "/opt/nuclio"))
         model_xml = os.path.join(base_dir, "dextr.xml")
         model_bin = os.path.join(base_dir, "dextr.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/model_handler.py b/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/model_handler.py
@@ -12,8 +12,8 @@
 
 class ModelHandler:
     def __init__(self):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/intel/person-reidentification-retail-0300/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/intel/person-reidentification-retail-0300/FP32"))
         model_xml = os.path.join(base_dir, "person-reidentification-retail-0300.xml")
         model_bin = os.path.join(base_dir, "person-reidentification-retail-0300.bin")
 

diff --git a/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/model_handler.py b/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/model_handler.py
@@ -10,8 +10,8 @@
 
 class ModelHandler:
     def __init__(self, labels):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/intel/semantic-segmentation-adas-0001/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/intel/semantic-segmentation-adas-0001/FP32"))
         model_xml = os.path.join(base_dir, "semantic-segmentation-adas-0001.xml")
         model_bin = os.path.join(base_dir, "semantic-segmentation-adas-0001.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/serverless/openvino/omz/intel/text-detection-0004/nuclio/model_handler.py b/serverless/openvino/omz/intel/text-detection-0004/nuclio/model_handler.py
@@ -191,8 +191,8 @@ def _decode(self):
 
 class ModelHandler:
     def __init__(self, labels):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/intel/text-detection-0004/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/intel/text-detection-0004/FP32"))
         model_xml = os.path.join(base_dir, "text-detection-0004.xml")
         model_bin = os.path.join(base_dir, "text-detection-0004.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/model_handler.py b/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/model_handler.py
@@ -7,8 +7,8 @@
 
 class ModelHandler:
     def __init__(self, labels):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/public/faster_rcnn_inception_v2_coco/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/public/faster_rcnn_inception_v2_coco/FP32"))
         model_xml = os.path.join(base_dir, "faster_rcnn_inception_v2_coco.xml")
         model_bin = os.path.join(base_dir, "faster_rcnn_inception_v2_coco.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/...ess/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/model_handler.py b/...ess/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/model_handler.py
@@ -32,8 +32,8 @@ def segm_postprocess(box: list, raw_cls_mask, im_h, im_w):
 
 class ModelHandler:
     def __init__(self, labels):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/public/mask_rcnn_inception_resnet_v2_atrous_coco/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/public/mask_rcnn_inception_resnet_v2_atrous_coco/FP32"))
         model_xml = os.path.join(base_dir, "mask_rcnn_inception_resnet_v2_atrous_coco.xml")
         model_bin = os.path.join(base_dir, "mask_rcnn_inception_resnet_v2_atrous_coco.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/serverless/openvino/omz/public/yolo-v3-tf/nuclio/model_handler.py b/serverless/openvino/omz/public/yolo-v3-tf/nuclio/model_handler.py
@@ -112,8 +112,8 @@ def intersection_over_union(box_1, box_2):
 
 class ModelHandler:
     def __init__(self, labels):
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/open_model_zoo/public/yolo-v3-tf/FP32")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/open_model_zoo/public/yolo-v3-tf/FP32"))
         model_xml = os.path.join(base_dir, "yolo-v3-tf.xml")
         model_bin = os.path.join(base_dir, "yolo-v3-tf.bin")
         self.model = ModelLoader(model_xml, model_bin)

diff --git a/serverless/pytorch/foolwood/siammask/nuclio/model_handler.py b/serverless/pytorch/foolwood/siammask/nuclio/model_handler.py
@@ -14,8 +14,8 @@ def __init__(self):
         self.device = torch.device('cuda' if torch.cuda.is_available() else 'cpu')
         torch.backends.cudnn.benchmark = True
 
-        base_dir = os.environ.get("MODEL_PATH",
-            "/opt/nuclio/SiamMask/experiments/siammask_sharp")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH",
+            "/opt/nuclio/SiamMask/experiments/siammask_sharp"))
         class configPath:
             config = os.path.join(base_dir, "config_davis.json")
 

diff --git a/serverless/pytorch/saic-vul/fbrs/nuclio/model_handler.py b/serverless/pytorch/saic-vul/fbrs/nuclio/model_handler.py
@@ -36,7 +36,7 @@ def convert_mask_to_polygon(mask):
 class ModelHandler:
     def __init__(self):
         torch.backends.cudnn.deterministic = True
-        base_dir = os.environ.get("MODEL_PATH", "/opt/nuclio/fbrs")
+        base_dir = os.path.abspath(os.environ.get("MODEL_PATH", "/opt/nuclio/fbrs"))
         model_path = os.path.join(base_dir, "resnet101_dh256_sbd.pth")
         state_dict = torch.load(model_path, map_location='cpu')
 

diff --git a/serverless/tensorflow/matterport/mask_rcnn/nuclio/model_loader.py b/serverless/tensorflow/matterport/mask_rcnn/nuclio/model_loader.py
@@ -17,7 +17,7 @@
 # The directory should contain a clone of
 # https://github.com/matterport/Mask_RCNN repository and
 # downloaded mask_rcnn_coco.h5 model.
-MASK_RCNN_DIR = os.environ.get('MASK_RCNN_DIR')
+MASK_RCNN_DIR = os.path.abspath(os.environ.get('MASK_RCNN_DIR'))
 if MASK_RCNN_DIR:
     sys.path.append(MASK_RCNN_DIR)  # To find local version of the library
     sys.path.append(os.path.join(MASK_RCNN_DIR, 'samples/coco'))