corrent names

Signed-off-by: root <root@pool0-01907.cm.cluster>

Author: root

generation/maisi/configs/environment_maisi3d-ddpm.json

@@ -1,12 +1,12 @@
 {
     "output_dir": "output",
-    "trained_autoencoder_path": "models/autoencoder_epoch273.pt",
-    "trained_diffusion_path": "models/diff_unet_3d_ddpm.pt",
-    "trained_controlnet_path": "models/controlnet_3d_ddpm.pt",
+    "trained_autoencoder_path": "models/autoencoder_v1.pt",
+    "trained_diffusion_path": "models/diff_unet_3d_ddpm-ct.pt",
+    "trained_controlnet_path": "models/controlnet_3d_ddpm-ct.pt",
     "trained_mask_generation_autoencoder_path": "models/mask_generation_autoencoder.pt",
     "trained_mask_generation_diffusion_path": "models/mask_generation_diffusion_unet.pt",
     "all_mask_files_base_dir": "datasets/all_masks_flexible_size_and_spacing_3000",
-    "all_mask_files_json": "./configs/candidate_masks_flexible_size_and_spacing_3000.json",
+    "all_mask_files_json": "datasets/candidate_masks_flexible_size_and_spacing_3000.json",
     "all_anatomy_size_conditions_json": "./configs/all_anatomy_size_condtions.json",
     "label_dict_json": "./configs/label_dict.json",
     "label_dict_remap_json": "./configs/label_dict_124_to_132.json"

generation/maisi/configs/environment_maisi3d-rflow.json

@@ -1,12 +1,12 @@
 {
     "output_dir": "output",
-    "trained_autoencoder_path": "models/autoencoder_epoch273.pt",
-    "trained_diffusion_path": "models/diff_unet_3d_rflow.pt",
-    "trained_controlnet_path": "models/controlnet_3d_rflow.pt",
+    "trained_autoencoder_path": "models/autoencoder_v1.pt",
+    "trained_diffusion_path": "models/diff_unet_3d_rflow-ct.pt",
+    "trained_controlnet_path": "models/controlnet_3d_rflow-ct.pt",
     "trained_mask_generation_autoencoder_path": "models/mask_generation_autoencoder.pt",
     "trained_mask_generation_diffusion_path": "models/mask_generation_diffusion_unet.pt",
     "all_mask_files_base_dir": "datasets/all_masks_flexible_size_and_spacing_4000",
-    "all_mask_files_json": "./configs/candidate_masks_flexible_size_and_spacing_4000.json",
+    "all_mask_files_json": "datasets/candidate_masks_flexible_size_and_spacing_4000.json",
     "all_anatomy_size_conditions_json": "./configs/all_anatomy_size_condtions.json",
     "label_dict_json": "./configs/label_dict.json",
     "label_dict_remap_json": "./configs/label_dict_124_to_132.json"

generation/maisi/configs/environment_maisi_controlnet_train.json

@@ -2,9 +2,9 @@
     "model_dir": "./models/",
     "output_dir": "./outputs",
     "tfevent_path": "./outputs/tfevent",
-    "trained_autoencoder_path": "./models/autoencoder_epoch273.pt",
-    "trained_diffusion_path": "./models/input_unet3d_data-all_steps1000size512ddpm_random_current_inputx_v1.pt",
-    "trained_controlnet_path": "./models/controlnet-20datasets-e20wl100fold0bc_noi_dia_fsize_current.pt",
+    "trained_autoencoder_path": "./models/autoencoder_v1.pt",
+    "trained_diffusion_path": "./models/diff_unet_3d_rflow-ct.pt",
+    "trained_controlnet_path": "./models/controlnet_3d_rflow-ct_current.pt",
     "exp_name": "controlnet_kits_finetune",
     "data_base_dir": ["./datasets/C4KC-KiTS_subset"],
     "json_data_list": ["./datasets/C4KC-KiTS_subset.json"]

generation/maisi/configs/environment_maisi_diff_model.json

@@ -6,6 +6,6 @@
     "model_filename": "diff_unet_ckpt.pt",
     "output_dir": "./predictions",
     "output_prefix": "unet_3d",
-    "trained_autoencoder_path": "./models/autoencoder_epoch273.pt",
+    "trained_autoencoder_path": "./models/autoencoder_v1.pt",
     "existing_ckpt_filepath": null
 }

generation/maisi/scripts/utils.py

@@ -410,7 +410,7 @@ def get_body_region_index_from_mask(input_mask):
     region_indices["region_3"] = [93, 94]
 
     nda = input_mask.cpu().numpy().squeeze()
-    unique_elements = np.lib.arraysetops.unique(nda)
+    unique_elements = np.unique(nda)
     unique_elements = list(unique_elements)
     # print(f"nda: {nda.shape} {unique_elements}.")
     overlap_array = np.zeros(len(region_indices), dtype=np.uint8)