contrast raw and rotated

wwbwang · Apr 26, 2024 · 551bc78 · 551bc78
1 parent ba152ed
commit 551bc78
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 289 deletions.
diff --git a/inference_MPCN.sh b/inference_MPCN.sh
@@ -1,5 +1,4 @@
-branch_name=SIREN_noBN_noscreen_print1_
-# branch_name=MPCN_VISoR_new_datasets
+branch_name=SIREN_noA2C_trainbegin_screenflag_0.9max
 iter='10000000000'  # nan Appoint in terminal
 
 # 从命令行获取参数
@@ -24,7 +23,7 @@ CUDA_VISIBLE_DEVICES=0 python scripts/inference_pretrained.py \
     -o /share/home/wangwb/workspace/sr_3dunet/results/${branch_name}_net_g_${iter}\
     --model_path /share/home/wangwb/workspace/sr_3dunet/experiments/${branch_name}/models/net_g_A_${iter}.pth\
     --model_back_path /share/home/wangwb/workspace/sr_3dunet/experiments/${branch_name}/models/net_g_B_${iter}.pth\
-    --piece_flag True --piece_size 128 --piece_overlap 16 --piece_mod_size 16 --remove_size 8 --rotated_flag False
+    --piece_flag True --piece_size 128 --piece_overlap 16 --piece_mod_size 16 --remove_size 0 --rotated_flag False
 
     # /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/val_datasets
     # /share/home/wangwb/workspace/sr_3dunet/datasets/bigtif

diff --git a/options/MPCN.yml b/options/MPCN.yml
@@ -1,5 +1,5 @@
 # general settings
-name: MPCN_baseline
+name: SIREN_baseline
 model_type: MPCN_Model
 num_gpu: auto  # set num_gpu: 0 for cpu mode
 manual_seed: 0
@@ -14,8 +14,7 @@ datasets:
   train:
     name: rotated_blocks
     type: Unet_3D_Dataset
-    dataroot_gt: /share/home/wangwb/workspace/sr_3dunet/datasets/rotated_blocks
-    test_mode: False
+    dataroot_gt: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/rotated_datasets
     mean: 0 # 0.254 # 0.1535 # 0.0728 # 0.141
     percentiles: [0.01,0.9999]
     min_value: 0
@@ -41,15 +40,15 @@ network_g_A:
   type: UNet_3d_Generator
   in_channels: 1
   out_channels: 1
-  features: [64, 128, 256, 512]
+  features: [64, 128, 256]
   # norm_type: instance
   dim: 3
 
 network_g_B:
   type: UNet_3d_Generator
   in_channels: 1
   out_channels: 1
-  features: [64, 128, 256, 512]
+  features: [64, 128, 256]
   # norm_type: instance
   dim: 3
 
@@ -174,7 +173,7 @@ train:
 # logging settings
 logger:
   print_freq: 10
-  save_checkpoint_freq: !!float 2000
+  save_checkpoint_freq: !!float 1000
   use_tb_logger: true
   wandb:
     project: ~

diff --git a/options/MPCN_VISoR.yml b/options/MPCN_VISoR.yml
@@ -1,5 +1,5 @@
 # general settings
-name: SIREN_no3daug_trainbegin
+name: SIREN_screenflag_0.9max
 model_type: MPCN_VISoR_Model
 num_gpu: auto  # set num_gpu: 0 for cpu mode
 manual_seed: 0
@@ -14,10 +14,10 @@ datasets:
   train:
     name: rotated_blocks
     type: Paired_tif_Dataset
-    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/front_256_datasets
-    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/rotated_front_256_datasets
+    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/Raw_datasets
+    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/rotated_datasets
     mean: 0 # 0.254 # 0.1535 # 0.0728 # 0.141
-    percentiles: [0,1]
+    percentiles: [0.01, 0.9999]
     threshold_percentiles_cube: [0,0.99]
     threshold_percentiles_MIP: [0,0.99]
     screen_flag: False
@@ -45,10 +45,10 @@ datasets:
   val:  # setting sames as trainset
     name: rotated_blocks_val
     type: Paired_tif_Dataset    # FIXME
-    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/front_256_datasets
-    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/rotated_front_256_datasets
+    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/Raw_datasets
+    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/rotated_datasets
     mean: 0 # 0.254 # 0.1535 # 0.0728 # 0.141
-    percentiles: [0,1]
+    percentiles: [0.01, 0.999]
     threshold_percentiles_cube: [0,0.99]
     threshold_percentiles_MIP: [0,0.99]
     screen_flag: True
@@ -61,7 +61,7 @@ datasets:
     use_flip: true
     use_rot: true
     gt_size: [64, 128] # fullsize is 128
-    gt_probs: [0, 1]
+    gt_probs: [1, 0]
     iso_dimension: -1 # -3/-2/-1 <--> 0/1/2, means anisotropic in dimension 2
     aniso_dimension: -2
 
@@ -197,9 +197,9 @@ train:
 
 # validation settings
 val:
-  val_freq: !!float 100   # FIXME
+  val_freq: !!float 50   # FIXME
   save_img: True
-  save_number: 4
+  save_number: 2
 
 # logging settings
 logger:

diff --git a/options/MPCN_VISoR_noA2C.yml b/options/MPCN_VISoR_noA2C.yml
@@ -1,5 +1,5 @@
 # general settings
-name: SIREN_no3daug_noA2C_trainbegin_screenflag_0.9max
+name: SIREN_noA2C_trainbegin_screenflag_0.9max
 model_type: MPCN_VISoR_noA2CModel
 num_gpu: auto  # set num_gpu: 0 for cpu mode
 manual_seed: 0
@@ -14,12 +14,12 @@ datasets:
   train:
     name: rotated_blocks
     type: Paired_tif_Dataset
-    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/front_256_datasets
-    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/rotated_front_256_datasets
+    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/Raw_datasets
+    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/rotated_datasets
     mean: 0 # 0.254 # 0.1535 # 0.0728 # 0.141
-    percentiles: [0,1]
-    threshold_percentiles_cube: [0.01,0.9]
-    threshold_percentiles_MIP: [0.01,0.9]
+    percentiles: [0.01, 0.999]
+    threshold_percentiles_cube: [0,0.99]
+    threshold_percentiles_MIP: [0,0.99]
     screen_flag: True
     min_value: 0
     max_value: 65535
@@ -36,19 +36,19 @@ datasets:
 
     # data loader
     use_shuffle: true
-    num_worker_per_gpu: 1
-    batch_size_per_gpu: 2
+    num_worker_per_gpu: 8
+    batch_size_per_gpu: 8
     dataset_enlarge_ratio: 1
     prefetch_mode: ~ # cuda  # FIXME
     pin_memory: True
 
   val:  # setting sames as trainset
     name: rotated_blocks_val
     type: Paired_tif_Dataset    # FIXME
-    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/front_256_datasets
-    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Mouse_Brain/rotated_front_256_datasets
+    datasets_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/Raw_datasets
+    datasets_rotated_cube: /share/home/wangwb/workspace/sr_3dunet/datasets/Monkey_Brain/rotated_datasets
     mean: 0 # 0.254 # 0.1535 # 0.0728 # 0.141
-    percentiles: [0,1]
+    percentiles: [0.01, 0.999]
     threshold_percentiles_cube: [0,0.99]
     threshold_percentiles_MIP: [0,0.99]
     screen_flag: True
@@ -61,7 +61,7 @@ datasets:
     use_flip: true
     use_rot: true
     gt_size: [64, 128] # fullsize is 128
-    gt_probs: [0, 1]
+    gt_probs: [1, 0]
     iso_dimension: -1 # -3/-2/-1 <--> 0/1/2, means anisotropic in dimension 2
     aniso_dimension: -2
 
@@ -197,9 +197,9 @@ train:
 
 # validation settings
 val:
-  val_freq: !!float 100   # FIXME
+  val_freq: !!float 50   # FIXME
   save_img: True
-  save_number: 4
+  save_number: 2
 
 # logging settings
 logger: