Skip to content

Commit e5a3f0f

Browse files
committed
fix: experiment setting error
1 parent a4e5572 commit e5a3f0f

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

evaluate_trained_models.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
gpu_id=0
44
nb_worker=24
55

6-
exp_name="decode_ASC"
7-
CUDA_VISIBLE_DEVICES=${gpu_id} python evaluate.py -verbose 0 \
6+
exp_name="EvalASC"
7+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
88
-task ASC \
99
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
1010
-nb_worker ${nb_worker} \
1111
-bs_ASC 32 -bs_SED 24 -bs_TAG 32 \
1212
-dir_model_weight ./weights/DcaseNet_v3_finetune_best_ASC.pt
1313

14-
exp_name="decode_TAG"
15-
CUDA_VISIBLE_DEVICES=${gpu_id} python evaluate.py -verbose 0 \
14+
exp_name="EvalTAG"
15+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
1616
-task TAG \
1717
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
1818
-nb_worker ${nb_worker} \
1919
-bs_ASC 32 -bs_SED 24 -bs_TAG 32 \
2020
-dir_model_weight ./weights/DcaseNet_v3_finetune_best_TAG.pt
2121

22-
exp_name="decode_SED"
23-
CUDA_VISIBLE_DEVICES=${gpu_id} python evaluate.py -verbose 0 \
22+
exp_name="EvalSED"
23+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
2424
-task SED \
2525
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
2626
-nb_worker ${nb_worker} \

main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ def main():
164164
with open(save_dir+'modelsumm.txt', 'w') as f: f.write(str(model_summ))
165165

166166
#load weights
167-
if args.phase == 'fine_tune' or args.phase == 'eval':
167+
if 'fine-tune' in args.name or 'Eval' in args.name:
168168
model.load_state_dict(torch.load(args.dir_model_weight))
169169
model = model.to(device)
170170

171-
if args.phase == 'eval':
171+
if 'Eval' in args.name:
172172
if 'ASC' in args.task:
173173
acc, conf_mat = evaluate_ASC(model = model,
174174
evlset_gen = evlset_gen_ASC,

parser.py

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ def get_args():
99
##########
1010
## PATH ##
1111
##########
12-
parser.add_argument('-phase', type = str, required = True)
1312
parser.add_argument('-name', type = str, required = True)
1413
parser.add_argument('-save_dir', type = str, required = True)
1514
parser.add_argument('-dir_model_weight', type = str, default = '')

train.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212
if [ ${phase} -le 0 ]; then
1313
######
1414
# Joint train ASC, TAG, and SED tasks using DcaseNet-v3 architecture
15-
CUDA_VISIBLE_DEVICES=${gpu_id} python joint_train_DcaseNet.py -verbose 0 \
15+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
1616
-nb_iter_per_epoch 500 \
1717
-task ASC SED TAG \
1818
-name ${joint_model_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
@@ -28,8 +28,8 @@ fi
2828
if [ ${phase} -le 1 ]; then
2929
#####
3030
# fine-tune for ASC
31-
exp_name="finetune_ASC"
32-
CUDA_VISIBLE_DEVICES=${gpu_id} python fine_tune_single_task.py -verbose 0 \
31+
exp_name="fine-tune_ASC"
32+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
3333
-nb_iter_per_epoch 500 \
3434
-task ASC \
3535
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
@@ -46,8 +46,8 @@ fi
4646
if [ ${phase} -le 1 ]; then
4747
#####
4848
# fine-tune for TAG
49-
exp_name="finetune_TAG"
50-
CUDA_VISIBLE_DEVICES=${gpu_id} python fine_tune_single_task.py -verbose 0 \
49+
exp_name="fine-tune_TAG"
50+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
5151
-nb_iter_per_epoch 500 \
5252
-task TAG \
5353
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \
@@ -64,8 +64,8 @@ fi
6464
if [ ${phase} -le 1 ]; then
6565
#####
6666
# fine-tune for SED
67-
exp_name="finetune_SED"
68-
CUDA_VISIBLE_DEVICES=${gpu_id} python fine_tune_single_task.py -verbose 0 \
67+
exp_name="fine-tune_SED"
68+
CUDA_VISIBLE_DEVICES=${gpu_id} python main.py -verbose 0 \
6969
-nb_iter_per_epoch 500 \
7070
-task TAG \
7171
-name ${exp_name} -model_scp DcaseNet -model_name get_DcaseNet_v3 \

0 commit comments

Comments
 (0)