From 1dc53831625da1d8605e005ef8504343b1ee9a72 Mon Sep 17 00:00:00 2001 From: Liyu Xiao Date: Fri, 13 Jun 2025 15:03:42 -0400 Subject: [PATCH] fixed paths --- .gitignore | 19 ++++++++++++++++--- .riahub/workflows/workflow.yaml | 3 +++ onnx_scripts/profile_onnx.py | 3 +-- scripts/dataset_building/data_gen.py | 2 +- scripts/training/train.py | 10 ++++------ 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6b57304..bba28b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,22 @@ -.venv/ - # Byte-compiled / optimized / DLL files __pycache__/ *.ckpt *.ipynb *.onnx *.json -*.h5 \ No newline at end of file +*.h5 + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# PyCharm +.idea/ + +# Visual Studio Code +.vscode/ \ No newline at end of file diff --git a/.riahub/workflows/workflow.yaml b/.riahub/workflows/workflow.yaml index c7d1e3b..623c344 100644 --- a/.riahub/workflows/workflow.yaml +++ b/.riahub/workflows/workflow.yaml @@ -68,6 +68,7 @@ jobs: NO_NNPACK: 1 PYTORCH_NO_NNPACK: 1 run: | + mkdir -p checkpoint_files PYTHONPATH=. python scripts/training/train.py echo "training model" @@ -79,6 +80,8 @@ jobs: - name: 4. Convert to ONNX file run: | + mkdir -p onnx_scripts + mkdir -p onnx_files MKL_DISABLE_FAST_MM=1 PYTHONPATH=. python onnx_scripts/convert_to_onnx.py echo "building inference app" diff --git a/onnx_scripts/profile_onnx.py b/onnx_scripts/profile_onnx.py index f4f265d..ad18c7f 100644 --- a/onnx_scripts/profile_onnx.py +++ b/onnx_scripts/profile_onnx.py @@ -1,7 +1,6 @@ import onnxruntime as ort import numpy as np from helpers.app_settings import get_app_settings -from onnx_files import ONNX_DIR import os def profile_onnx_model(path_to_onnx: str, num_runs: int = 100): @@ -38,5 +37,5 @@ def profile_onnx_model(path_to_onnx: str, num_runs: int = 100): if __name__ == "__main__": settings = get_app_settings() - output_path = os.path.join(ONNX_DIR, f"{settings.inference.onnx_model_filename}.onnx") + output_path = os.path.join("onnx_files", "convert_to_onnx.onnx") profile_onnx_model(output_path) diff --git a/scripts/dataset_building/data_gen.py b/scripts/dataset_building/data_gen.py index ed2e88a..287105f 100644 --- a/scripts/dataset_building/data_gen.py +++ b/scripts/dataset_building/data_gen.py @@ -15,7 +15,7 @@ mods = { def generate_modulated_signals(output_dir): for modulation in ["bpsk", "qpsk", "qam16", "qam64"]: for snr in np.arange(-6, 13, 3): - for i in range(100): + for i in range(3): recording_length = 1024 beta = 0.3 # the rolloff factor, can be changed to add variety sps = 4 # samples per symbol, or the relative bandwidth of the digital signal. Can also be changed. diff --git a/scripts/training/train.py b/scripts/training/train.py index bbb295a..2107b87 100644 --- a/scripts/training/train.py +++ b/scripts/training/train.py @@ -29,11 +29,9 @@ def train_model(): batch_size = training_cfg.batch_size epochs = training_cfg.epochs - checkpoint_dir = training_cfg.checkpoint_dir - checkpoint_filename = training_cfg.checkpoint_filename - train_data = f"{dataset_cfg.output_dir}/train.h5" - val_data = f"{dataset_cfg.output_dir}/val.h5" + train_data = "data/dataset/train.h5" + val_data = "data/dataset/val.h5" label = "modulation" @@ -122,8 +120,8 @@ def train_model(): checkpoint_callback = ModelCheckpoint( - dirpath=checkpoint_dir, - filename=checkpoint_filename, + dirpath="checkpoint_files", + filename="inference_recognition_model.ckpt", save_top_k=1, verbose=True, # Disable checkpoint verbose output monitor="val_acc",