Skip to content

Commit 52d1fc1

Browse files
committed
add new combined dataset
1 parent bb7ac7b commit 52d1fc1

File tree

6 files changed

+23
-12
lines changed

6 files changed

+23
-12
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ target/
8484
lib/pycocotools/_mask.c
8585
lib/nms/cpu_nms.c
8686

87+
output/*
8788
outputs/*
8889
models/*
8990
logs/*

experiments/coco/hrnet/w48_384x288_adam_lr1e-3.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ DATASET:
2525
MODEL:
2626
INIT_WEIGHTS: true
2727
NAME: pose_hrnet
28-
NUM_JOINTS: 17
28+
NUM_JOINTS: 58
29+
# NUM_JOINTS: 17
2930
PRETRAINED: "models/pytorch/imagenet/hrnet_w48-8ef0771d.pth"
3031
TARGET_TYPE: gaussian
3132
IMAGE_SIZE:
@@ -112,7 +113,8 @@ TEST:
112113
BBOX_THRE: 1.0
113114
IMAGE_THRE: 0.0
114115
IN_VIS_THRE: 0.2
115-
MODEL_FILE: "models/pytorch/pose_coco/pose_hrnet_w48_384x288.pth"
116+
MODEL_FILE: "outputs/sherlock/model_best1e-3_62_epochs.pth"
117+
# MODEL_FILE: "models/pytorch/pose_coco/pose_hrnet_w48_384x288.pth"
116118
NMS_THRE: 1.0
117119
OKS_THRE: 0.9
118120
USE_GT_BBOX: true

experiments/infinity_coco/hrnet/w48_384x288_adam_lr1e-3.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ CUDNN:
55
ENABLED: true
66
DATA_DIR: ""
77
GPUS: (0,)
8-
OUTPUT_DIR: "outputs/output_infinity_coco_unfrozen"
9-
LOG_DIR: "logs/log_infinity_coco_unfrozen"
10-
WORKERS: 2
8+
OUTPUT_DIR: "outputs/output_new_infinity"
9+
LOG_DIR: "logs/output_new_infinity"
10+
WORKERS: 12
1111
PRINT_FREQ: 10
1212

1313
DATASET:
@@ -17,14 +17,14 @@ DATASET:
1717
FLIP: true
1818
NUM_JOINTS_HALF_BODY: 27
1919
PROB_HALF_BODY: 0.3
20-
ROOT: "../infinity_dataset_combined"
20+
ROOT: "../combined_infinity_dataset"
2121
ROOT_COCO: "/scratch/users/yonigoz/coco_dataset/"
2222
ROT_FACTOR: 45
2323
SCALE_FACTOR: 0.35
2424
TEST_SET: "test"
2525
TRAIN_SET: "train"
2626
TRAIN_SET_COCO: "train2017"
27-
COCO_INFINITY_RATIO: 10
27+
COCO_INFINITY_RATIO: 3
2828
MODEL:
2929
INIT_WEIGHTS: true
3030
NAME: pose_hrnet

experiments/infinity_coco/hrnet/w48_384x288_adam_lr1e-3_local.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ CUDNN:
55
ENABLED: true
66
DATA_DIR: ""
77
GPUS: (0,)
8-
OUTPUT_DIR: "outputs/output_infinity_coco_local"
9-
LOG_DIR: "logs/log_infinity_coco_local"
10-
WORKERS: 2
8+
OUTPUT_DIR: "outputs/output_new_infinity"
9+
LOG_DIR: "logs/output_new_infinity"
10+
WORKERS: 12
1111
PRINT_FREQ: 10
1212

1313
DATASET:
@@ -17,7 +17,7 @@ DATASET:
1717
FLIP: true
1818
NUM_JOINTS_HALF_BODY: 27
1919
PROB_HALF_BODY: 0.3
20-
ROOT: "../infinity_dataset_combined"
20+
ROOT: "../combined_infinity_dataset"
2121
ROOT_COCO: "data/coco/"
2222
ROT_FACTOR: 45
2323
SCALE_FACTOR: 0.35
@@ -63,6 +63,7 @@ MODEL:
6363
- "stage3"
6464
- "transition3"
6565
- "stage4"
66+
PRETRAIN_FINAL_LAYER: true
6667
FINAL_CONV_KERNEL: 1
6768
STAGE2:
6869
NUM_MODULES: 1

lib/core/function.py

+3
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ def validate(
131131
model.eval()
132132

133133
num_samples = len(val_dataset)
134+
# all_preds = np.zeros((num_samples, 17, 3), dtype=np.float32)
134135
all_preds = np.zeros((num_samples, config.MODEL.NUM_JOINTS, 3), dtype=np.float32)
135136
all_boxes = np.zeros((num_samples, 6))
136137
image_path = []
@@ -142,13 +143,15 @@ def validate(
142143
for i, (input, target, target_weight, meta) in enumerate(val_loader):
143144
# compute output
144145
outputs = model(input)
146+
# outputs = model(input)[:, :17, :, :]
145147
if isinstance(outputs, list):
146148
output = outputs[-1]
147149
else:
148150
output = outputs
149151

150152
if config.TEST.FLIP_TEST:
151153
input_flipped = input.flip(3)
154+
# outputs_flipped = model(input_flipped)[:, :17, :, :]
152155
outputs_flipped = model(input_flipped)
153156

154157
if isinstance(outputs_flipped, list):

lib/models/pose_hrnet.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,10 @@ def __init__(self, cfg, **kwargs):
343343
)
344344

345345
self.pretrained_layers = extra["PRETRAINED_LAYERS"]
346-
self.pretrain_final_layer = extra["PRETRAIN_FINAL_LAYER"]
346+
if "PRETRAIN_FINAL_LAYER" in extra:
347+
self.pretrain_final_layer = extra["PRETRAIN_FINAL_LAYER"]
348+
else:
349+
self.pretrain_final_layer = False
347350

348351
def _make_transition_layer(self, num_channels_pre_layer, num_channels_cur_layer):
349352
num_branches_cur = len(num_channels_cur_layer)
@@ -511,6 +514,7 @@ def init_weights(self, pretrained=""):
511514
self.load_state_dict(need_init_state_dict, strict=False)
512515

513516
if self.pretrain_final_layer:
517+
print("load final layer")
514518
self.final_layer.weight.data[:17, :, :, :] = pretrained_state_dict[
515519
"final_layer.weight"
516520
]

0 commit comments

Comments
 (0)