Rename to Linnaeus

cli/fcos/__main__.py → cli/linnaeus/__main__.py

@@ -2,7 +2,7 @@
 import pathlib
 
 parser = argparse.ArgumentParser(
-    prog="FCOS Command Line Tool",
+    prog="Linnaeus Command Line Tool",
     description="This tool provides an easy interface for fcos training and running",
     epilog="<Insert famous quote here>"
 )
@@ -33,14 +33,14 @@
 
 if args.command == "train":
     try:
-        from fcos.train import train
+        from linnaeus.train import train
         del args.command
 
         train(**vars(args))
     except ImportError:
         print("Train Module not included.")
 elif args.command == "predict":
-    from fcos.cli import predict
+    from linnaeus.cli import predict
     del args.command
 
     predict.main(**vars(args))

cli/fcos/cli/predict.py → cli/linnaeus/cli/predict.py

@@ -1,7 +1,7 @@
-from fcos.core.models import FCOS
-from fcos.core.loaders import ClassLoader
-from fcos.core.data_augmentation import preprocessing
-from fcos.core.mAP.functions import fcos_to_boxes
+from linnaeus.core.models import FCOS
+from linnaeus.core.loaders import ClassLoader
+from linnaeus.core.data_augmentation import preprocessing
+from linnaeus.core.mAP.functions import fcos_to_boxes
 import numpy as np
 import torch
 import cv2

cli/pyproject.toml

@@ -1,19 +1,19 @@
 [tool.poetry]
-name = "fcos-cli"
+name = "linnaeus-cli"
 version = "0.1.0"
 description = ""
 authors = ["DTheLegend <[email protected]>"]
 readme = "README.md"
-packages = [{include = "fcos"}]
+packages = [{include = "linnaeus"}]
 
 [tool.poetry.dependencies]
 python = "3.10.6"
-fcos-core = {path = "../core"}
-fcos-train = {path = "../train", optional=true}
+linnaeus-core = {path = "../core"}
+linnaeus-train = {path = "../train", optional=true}
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.extras]
-train = ["fcos-train"]
+train = ["linnaeus-train"]

core/fcos/core/loaders/folder_data_set_loader.py → core/linnaeus/core/loaders/folder_data_set_loader.py

@@ -5,7 +5,7 @@
 from torch.utils.data import Dataset
 from pathlib import Path
 
-from fcos.core.data_augmentation import preprocessing
+from linnaeus.core.data_augmentation import preprocessing
 
 class FolderDataSetLoader(Dataset):
 

core/fcos/core/mAP/functions.py → core/linnaeus/core/mAP/functions.py

@@ -142,6 +142,7 @@ def return_mAP(model, dataset, classes):
         col = cuda_image.shape[3]
         confs, locs, centers = model(cuda_image)
         boxes = fcos_to_boxes(classes, confs, locs, centers, row, col)
+        boxes.sort(key=take2, reverse=True)
         for gt_box in tags:
             box_class = classes[int(gt_box[0].item())]
             gt_count_all[box_class] += 1
@@ -152,6 +153,7 @@ def return_mAP(model, dataset, classes):
     mp = 0
     mr = 0
     for c in classes:
+        mAP_all[c].sort(key=take2, reverse=True)
         p, r, ap = compute_mAP(mAP_all[c], gt_count_all[c])
         mAP += ap * gt_count_all[c]
         mp += p * gt_count_all[c]

core/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
-name = "fcos-core"
+name = "linnaeus-core"
 version = "0.1.7"
 description = ""
 authors = ["DTheLegend <[email protected]>"]
 readme = "README.md"
-packages = [{include = "fcos"}]
+packages = [{include = "linnaeus"}]
 
 [tool.poetry.dependencies]
 python = "3.10.6"

main/pyproject.toml

@@ -1,20 +1,20 @@
 [tool.poetry]
-name = "fcos"
+name = "linnaeus"
 version = "0.1.0"
 description = ""
 authors = ["DTheLegend <[email protected]>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "3.10.6"
-fcos-core = {path = "../core"}
-fcos-cli = {path = "../cli", optional=true}
-fcos-train = {path = "../train", optional=true}
+linnaeus-core = {path = "../core"}
+linnaeus-cli = {path = "../cli", optional=true}
+linnaeus-train = {path = "../train", optional=true}
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.extras]
-cli = ["fcos-cli"]
-train = ["fcos-train"]
+cli = ["linnaeus-cli"]
+train = ["linnaeus-train"]

train/fcos/train/loss/fcos_loss.py → train/linnaeus/train/loss/fcos_loss.py

@@ -1,6 +1,6 @@
 import torch
 import torch.nn as nn
-from fcos.core.mAP import MapMaster
+from linnaeus.core.mAP import MapMaster
 from .iou_loss import IOULoss
 
 class FCOSLoss(nn.Module):

train/fcos/train/train.py → train/linnaeus/train/train.py

@@ -1,7 +1,7 @@
 import torch
-from fcos.core.loaders import FolderDataSetLoader, ClassLoader
-from fcos.train.loss import FCOSLoss
-from fcos.core.models import FCOS
+from linnaeus.core.loaders import FolderDataSetLoader, ClassLoader
+from linnaeus.train.loss import FCOSLoss
+from linnaeus.core.models import FCOS
 import torch.utils.data as Data
 import os
 from fcos.core.mAP import return_mAP

train/pyproject.toml

@@ -1,14 +1,14 @@
 [tool.poetry]
-name = "fcos-train"
+name = "linnaeus-train"
 version = "0.1.7"
 description = ""
 authors = ["DTheLegend <[email protected]>"]
 readme = "README.md"
-packages = [{include = "fcos"}]
+packages = [{include = "linnaeus"}]
 
 [tool.poetry.dependencies]
 python = "3.10.6"
-fcos-core= {path = "../core"}
+linnaeus-core= {path = "../core"}
 tqdm = "^4.64.1"