From 5438a72c43b4da7f1b4b9774240465ee11d171f3 Mon Sep 17 00:00:00 2001
From: Schneider Leo <leo.schneider@etu.ec-lyon.fr>
Date: Mon, 31 Mar 2025 14:18:51 +0200
Subject: [PATCH] change : file structure modification
---
config/config.py | 18 ------------------
image_ref/config.py | 22 ++++++++++++++++++++++
{dataset => image_ref}/dataset_ref.py | 0
image_ref/main.py | 6 +++---
4 files changed, 25 insertions(+), 21 deletions(-)
create mode 100644 image_ref/config.py
rename {dataset => image_ref}/dataset_ref.py (100%)
diff --git a/config/config.py b/config/config.py
index 902bbbc..6487965 100644
--- a/config/config.py
+++ b/config/config.py
@@ -20,23 +20,5 @@ def load_args():
return args
-def load_args_contrastive():
- parser = argparse.ArgumentParser()
- parser.add_argument('--epoches', type=int, default=3)
- parser.add_argument('--save_inter', type=int, default=50)
- parser.add_argument('--eval_inter', type=int, default=1)
- parser.add_argument('--noise_threshold', type=int, default=0)
- parser.add_argument('--lr', type=float, default=0.001)
- parser.add_argument('--batch_size', type=int, default=64)
- parser.add_argument('--model', type=str, default='ResNet18')
- parser.add_argument('--model_type', type=str, default='duo')
- parser.add_argument('--dataset_dir', type=str, default='../data/processed_data/npy_image/data_training')
- parser.add_argument('--dataset_ref_dir', type=str, default='img_ref')
- parser.add_argument('--output', type=str, default='../output/out_contrastive.csv')
- parser.add_argument('--save_path', type=str, default='../output/best_model_constrastive.pt')
- parser.add_argument('--pretrain_path', type=str, default=None)
- args = parser.parse_args()
-
- return args
diff --git a/image_ref/config.py b/image_ref/config.py
new file mode 100644
index 0000000..3a28cf8
--- /dev/null
+++ b/image_ref/config.py
@@ -0,0 +1,22 @@
+import argparse
+
+
+def load_args_contrastive():
+ parser = argparse.ArgumentParser()
+
+ parser.add_argument('--epoches', type=int, default=3)
+ parser.add_argument('--save_inter', type=int, default=50)
+ parser.add_argument('--eval_inter', type=int, default=1)
+ parser.add_argument('--noise_threshold', type=int, default=0)
+ parser.add_argument('--lr', type=float, default=0.001)
+ parser.add_argument('--batch_size', type=int, default=64)
+ parser.add_argument('--model', type=str, default='ResNet18')
+ parser.add_argument('--model_type', type=str, default='duo')
+ parser.add_argument('--dataset_dir', type=str, default='../data/processed_data/npy_image/data_training')
+ parser.add_argument('--dataset_ref_dir', type=str, default='img_ref')
+ parser.add_argument('--output', type=str, default='../output/out_contrastive.csv')
+ parser.add_argument('--save_path', type=str, default='../output/best_model_constrastive.pt')
+ parser.add_argument('--pretrain_path', type=str, default=None)
+ args = parser.parse_args()
+
+ return args
\ No newline at end of file
diff --git a/dataset/dataset_ref.py b/image_ref/dataset_ref.py
similarity index 100%
rename from dataset/dataset_ref.py
rename to image_ref/dataset_ref.py
diff --git a/image_ref/main.py b/image_ref/main.py
index 7578088..27565f2 100644
--- a/image_ref/main.py
+++ b/image_ref/main.py
@@ -6,11 +6,11 @@
import matplotlib.pyplot as plt
import numpy as np
-from config.config import load_args, load_args_contrastive
-from dataset.dataset_ref import load_data, load_data_duo
+from config import load_args_contrastive
+from dataset_ref import load_data, load_data_duo
import torch
import torch.nn as nn
-from image_ref.model import Classification_model_contrastive, Classification_model_duo_contrastive
+from model import Classification_model_contrastive, Classification_model_duo_contrastive
import torch.optim as optim
from sklearn.metrics import confusion_matrix
import seaborn as sn
--
GitLab