From c12ba88b78d4d6082f62f577b85ee9658bbd6a9f Mon Sep 17 00:00:00 2001 From: Michael Luciuk Date: Mon, 7 Jul 2025 10:22:13 -0400 Subject: [PATCH] Updated import ordering --- .../{onnx => application_packager}/convert_to_onnx.py | 2 +- .../{ort => application_packager}/convert_to_ort.py | 1 + .../{onnx => application_packager}/profile_onnx.py | 10 ++++++---- .../{dataset_building => dataset_manager}/data_gen.py | 8 +++++--- .../produce_dataset.py | 8 ++++++-- .../split_dataset.py | 3 ++- scripts/{training => model_builder}/cm_plotter.py | 3 ++- scripts/{training => model_builder}/mobilenetv3.py | 8 ++++---- .../{training => model_builder}/modulation_dataset.py | 6 ++++-- scripts/{training => model_builder}/plot_data.py | 11 ++++++----- scripts/{training => model_builder}/train.py | 10 ++++++---- 11 files changed, 43 insertions(+), 27 deletions(-) rename scripts/{onnx => application_packager}/convert_to_onnx.py (97%) rename scripts/{ort => application_packager}/convert_to_ort.py (99%) rename scripts/{onnx => application_packager}/profile_onnx.py (99%) rename scripts/{dataset_building => dataset_manager}/data_gen.py (99%) rename scripts/{dataset_building => dataset_manager}/produce_dataset.py (99%) rename scripts/{dataset_building => dataset_manager}/split_dataset.py (98%) rename scripts/{training => model_builder}/cm_plotter.py (99%) rename scripts/{training => model_builder}/mobilenetv3.py (100%) rename scripts/{training => model_builder}/modulation_dataset.py (98%) rename scripts/{training => model_builder}/plot_data.py (98%) rename scripts/{training => model_builder}/train.py (99%) diff --git a/scripts/onnx/convert_to_onnx.py b/scripts/application_packager/convert_to_onnx.py similarity index 97% rename from scripts/onnx/convert_to_onnx.py rename to scripts/application_packager/convert_to_onnx.py index 7a3d209..68dcb75 100644 --- a/scripts/onnx/convert_to_onnx.py +++ b/scripts/application_packager/convert_to_onnx.py @@ -2,8 +2,8 @@ import os import numpy as np import torch +from scripts.training.mobilenetv3 import RFClassifier, mobilenetv3 -from scripts.training.mobilenetv3 import mobilenetv3, RFClassifier from helpers.app_settings import get_app_settings diff --git a/scripts/ort/convert_to_ort.py b/scripts/application_packager/convert_to_ort.py similarity index 99% rename from scripts/ort/convert_to_ort.py rename to scripts/application_packager/convert_to_ort.py index 593268d..55782d7 100644 --- a/scripts/ort/convert_to_ort.py +++ b/scripts/application_packager/convert_to_ort.py @@ -1,4 +1,5 @@ import subprocess + from helpers.app_settings import get_app_settings settings = get_app_settings() diff --git a/scripts/onnx/profile_onnx.py b/scripts/application_packager/profile_onnx.py similarity index 99% rename from scripts/onnx/profile_onnx.py rename to scripts/application_packager/profile_onnx.py index 7f6ff04..3bcfb76 100644 --- a/scripts/onnx/profile_onnx.py +++ b/scripts/application_packager/profile_onnx.py @@ -1,9 +1,11 @@ -import onnxruntime as ort -import numpy as np -from helpers.app_settings import get_app_settings +import json import os import time -import json + +import numpy as np +import onnxruntime as ort + +from helpers.app_settings import get_app_settings def profile_onnx_model( diff --git a/scripts/dataset_building/data_gen.py b/scripts/dataset_manager/data_gen.py similarity index 99% rename from scripts/dataset_building/data_gen.py rename to scripts/dataset_manager/data_gen.py index 0fac831..6cbbf73 100644 --- a/scripts/dataset_building/data_gen.py +++ b/scripts/dataset_manager/data_gen.py @@ -1,7 +1,9 @@ -from utils.data import Recording -import numpy as np -from utils.signal import block_generator import argparse + +import numpy as np +from utils.data import Recording +from utils.signal import block_generator + from helpers.app_settings import get_app_settings settings = get_app_settings().dataset diff --git a/scripts/dataset_building/produce_dataset.py b/scripts/dataset_manager/produce_dataset.py similarity index 99% rename from scripts/dataset_building/produce_dataset.py rename to scripts/dataset_manager/produce_dataset.py index b2e65c2..54fb3c8 100644 --- a/scripts/dataset_building/produce_dataset.py +++ b/scripts/dataset_manager/produce_dataset.py @@ -1,7 +1,11 @@ -import os, h5py, numpy as np +import os from typing import List -from utils.io import from_npy + +import h5py +import numpy as np from split_dataset import split, split_recording +from utils.io import from_npy + from helpers.app_settings import DataSetConfig, get_app_settings meta_dtype = np.dtype( diff --git a/scripts/dataset_building/split_dataset.py b/scripts/dataset_manager/split_dataset.py similarity index 98% rename from scripts/dataset_building/split_dataset.py rename to scripts/dataset_manager/split_dataset.py index 732c84b..0f820b1 100644 --- a/scripts/dataset_building/split_dataset.py +++ b/scripts/dataset_manager/split_dataset.py @@ -1,6 +1,7 @@ import random from collections import defaultdict -from typing import List, Tuple, Dict +from typing import Dict, List, Tuple + import numpy as np diff --git a/scripts/training/cm_plotter.py b/scripts/model_builder/cm_plotter.py similarity index 99% rename from scripts/training/cm_plotter.py rename to scripts/model_builder/cm_plotter.py index 429293c..13770e3 100644 --- a/scripts/training/cm_plotter.py +++ b/scripts/model_builder/cm_plotter.py @@ -1,5 +1,6 @@ -import numpy as np from typing import Optional + +import numpy as np from matplotlib import pyplot as plt from sklearn.metrics import confusion_matrix diff --git a/scripts/training/mobilenetv3.py b/scripts/model_builder/mobilenetv3.py similarity index 100% rename from scripts/training/mobilenetv3.py rename to scripts/model_builder/mobilenetv3.py index 83556bd..125ae69 100644 --- a/scripts/training/mobilenetv3.py +++ b/scripts/model_builder/mobilenetv3.py @@ -1,8 +1,8 @@ -import numpy as np -import torch -import timm -from torch import nn import lightning as L +import numpy as np +import timm +import torch +from torch import nn sizes = [ "mobilenetv3_large_075", diff --git a/scripts/training/modulation_dataset.py b/scripts/model_builder/modulation_dataset.py similarity index 98% rename from scripts/training/modulation_dataset.py rename to scripts/model_builder/modulation_dataset.py index 5f65dc5..5826739 100644 --- a/scripts/training/modulation_dataset.py +++ b/scripts/model_builder/modulation_dataset.py @@ -1,10 +1,12 @@ -import sys, os +import os +import sys sys.path.insert(0, os.path.abspath("../..")) # or ".." if needed +import h5py import numpy as np import torch from torch.utils.data import Dataset -import h5py + from helpers.app_settings import get_app_settings settings = get_app_settings() diff --git a/scripts/training/plot_data.py b/scripts/model_builder/plot_data.py similarity index 98% rename from scripts/training/plot_data.py rename to scripts/model_builder/plot_data.py index 531c684..11e851e 100644 --- a/scripts/training/plot_data.py +++ b/scripts/model_builder/plot_data.py @@ -1,16 +1,17 @@ import os -import torch + import numpy as np +import torch from sklearn.metrics import classification_report os.environ["NNPACK"] = "0" -from matplotlib import pyplot as plt - -from scripts.training.mobilenetv3 import mobilenetv3, RFClassifier -from helpers.app_settings import get_app_settings from cm_plotter import plot_confusion_matrix +from matplotlib import pyplot as plt +from scripts.training.mobilenetv3 import RFClassifier, mobilenetv3 from scripts.training.modulation_dataset import ModulationH5Dataset +from helpers.app_settings import get_app_settings + def load_validation_data(): val_dataset = ModulationH5Dataset( diff --git a/scripts/training/train.py b/scripts/model_builder/train.py similarity index 99% rename from scripts/training/train.py rename to scripts/model_builder/train.py index 5d334ec..560a9d5 100644 --- a/scripts/training/train.py +++ b/scripts/model_builder/train.py @@ -1,14 +1,16 @@ -import sys, os +import os +import sys os.environ["NNPACK"] = "0" import lightning as L -from lightning.pytorch.callbacks import ModelCheckpoint +import mobilenetv3 import torch import torch.nn.functional as F import torchmetrics -from helpers.app_settings import get_app_settings +from lightning.pytorch.callbacks import ModelCheckpoint from modulation_dataset import ModulationH5Dataset -import mobilenetv3 + +from helpers.app_settings import get_app_settings script_dir = os.path.dirname(os.path.abspath(__file__)) data_dir = os.path.abspath(os.path.join(script_dir, ".."))