resnet_fpn_8_1

DaliCHEBBI · Nov 26, 2024 · 4104afc · 4104afc
1 parent 6e44d4d
commit 4104afc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/configs/model/resnet_fpn_mlp_model.yaml b/configs/model/resnet_fpn_mlp_model.yaml
@@ -0,0 +1,12 @@
+defaults:
+  - default.yaml
+  - override criterion: BinaryEntropyLoss.yaml
+
+lr: 0.001 
+
+neural_net_class_name: "ResNetFPN_8_1"
+neural_net_hparams:
+  INITIAL_DIM: 128
+  BLOC_DIMS: [128,196,256]
+
+mode: "feature+decision"
diff --git a/configs/model/resnet_fpn_model.yaml b/configs/model/resnet_fpn_model.yaml
@@ -0,0 +1,11 @@
+defaults:
+  - default.yaml
+
+lr: 0.001  
+
+neural_net_class_name: "ResNetFPN_8_1"
+neural_net_hparams:
+  INITIAL_DIM: 128
+  BLOC_DIMS: [128,196,256]
+
+mode: "feature"
diff --git a/simlearner3d/extract.py b/simlearner3d/extract.py
@@ -11,6 +11,7 @@
 from simlearner3d.models.generic_model import Model
 
 from simlearner3d.models.modules.msaff import MSNet,MSNETInferenceGatedAttention
+from simlearner3d.models.modules.resnet_fpn import ResNetFPN_8_1,ResNetFPN_8_1_Inference
 from simlearner3d.models.modules.unet import UNet,UNetInference
 from simlearner3d.models.modules.unetgatedattention import UNetGatedAttention, UNetInferenceGatedAttention
 from simlearner3d.models.modules.decision_net import DecisionNetworkOnCube
@@ -20,8 +21,8 @@
 
 NEURAL_NET_ARCHITECTURE_CONFIG_GROUP = "neural_net"
 
-MODEL_ZOO = [MSNet,UNet,UNetGatedAttention]
-MODEL_INFERENCE_ZOO=[MSNETInferenceGatedAttention,UNetInference,UNetInferenceGatedAttention]
+MODEL_ZOO = [ResNetFPN_8_1,MSNet,UNet,UNetGatedAttention]
+MODEL_INFERENCE_ZOO=[ResNetFPN_8_1_Inference,MSNETInferenceGatedAttention,UNetInference,UNetInferenceGatedAttention]
 
 
 def get_inference_neural_net_class(class_training: nn.Module) -> nn.Module:
@@ -90,13 +91,3 @@ def extract(config: DictConfig):
 
         print("Model Decision is saved as : ", out_decision_inference)
 
-
-
-
-
-
-
-
-
-
-
diff --git a/simlearner3d/models/generic_model.py b/simlearner3d/models/generic_model.py
@@ -2,6 +2,7 @@
 from pytorch_lightning import LightningModule
 from torch import nn
 
+from simlearner3d.models.modules.resnet_fpn import ResNetFPN_8_1, ResNetFPN_16_4
 from simlearner3d.models.modules.msaff import MSNet
 from simlearner3d.models.modules.unet import UNet
 from simlearner3d.models.modules.unetgatedattention import UNetGatedAttention
@@ -11,7 +12,7 @@
 
 log = utils.get_logger(__name__)
 
-MODEL_ZOO = [MSNet,UNet,UNetGatedAttention]
+MODEL_ZOO = [ResNetFPN_8_1,MSNet,UNet,UNetGatedAttention]
 
 
 def get_neural_net_class(class_name: str) -> nn.Module:

diff --git a/simlearner3d/qualify.py b/simlearner3d/qualify.py
@@ -19,6 +19,7 @@
 from simlearner3d.models.generic_model import Model
 
 from simlearner3d.models.modules.msaff import MSNet,MSNETInferenceGatedAttention
+from simlearner3d.models.modules.resnet_fpn import ResNetFPN_8_1,ResNetFPN_8_1_Inference
 from simlearner3d.models.modules.unet import UNet,UNetInference
 from simlearner3d.models.modules.unetgatedattention import UNetGatedAttention, UNetInferenceGatedAttention
 from simlearner3d.models.modules.decision_net import DecisionNetworkOnCube
@@ -29,8 +30,8 @@
 
 NEURAL_NET_ARCHITECTURE_CONFIG_GROUP = "neural_net"
 
-MODEL_ZOO = [MSNet,UNet,UNetGatedAttention]
-MODEL_INFERENCE_ZOO=[MSNETInferenceGatedAttention,UNetInference,UNetInferenceGatedAttention]
+MODEL_ZOO = [ResNetFPN_8_1,MSNet,UNet,UNetGatedAttention]
+MODEL_INFERENCE_ZOO=[ResNetFPN_8_1_Inference,MSNETInferenceGatedAttention,UNetInference,UNetInferenceGatedAttention]
 
 DEFAULT_MODE="feature"
 
@@ -97,7 +98,6 @@ def PlotJointDistribution(Simsplus,
     for j in range(200):
         for i in range(j+1):
             if (values[j,i]!='--'):
-                print(values)
                 SUM_GOOD+=values[j,i]   
     pourcent=str("%.2f" % SUM_GOOD)+" %"