Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit cf65346

Browse files
prigoyalfacebook-github-bot
prigoyal
authored and
facebook-github-bot
committed
Organize hooks better in a dedicated HOOKS key in the config (#174)
Summary: Pull Request resolved: #174 vissl has many hooks that can be configured. but they were scattered all over the defaults.yaml unclear what parameter is a hook. reorganizing them under `HOOKS` for better readibility Reviewed By: min-xu-ai Differential Revision: D26284129 fbshipit-source-id: c71a69bb838cdb76d3e0594efddf584a5b3f8b68
1 parent 1b4d93f commit cf65346

File tree

60 files changed

+288
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+288
-172
lines changed

‎GETTING_STARTED.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ imagenet_full_size
4141

4242
### If VISSL is built from source
4343
We provide a config to train model using the pretext SimCLR task on the ResNet50 model.
44-
Change the `DATA.TRAIN.DATA_PATHS` path to the ImageNet train dataset folder path.
44+
Change the `DATA.TRAIN.DATA_PATHS` path to the ImageNet train dataset folder path.
4545

4646
```bash
4747
cd $HOME/vissl
@@ -52,7 +52,7 @@ python3 tools/run_distributed_engines.py \
5252
config.DATA.TRAIN.DATA_PATHS=["/path/to/my/imagenet/folder/train"] \
5353
config=test/integration_test/quick_simclr_imagefolder \
5454
config.CHECKPOINT.DIR="./checkpoints" \
55-
config.TENSORBOARD_SETUP.USE_TENSORBOARD=true
55+
config.HOOKS.TENSORBOARD_SETUP.USE_TENSORBOARD=true
5656
```
5757

5858
### If using pre-built conda/pip VISSL packages
@@ -100,7 +100,7 @@ python3 run_distributed_engines.py \
100100
config.DATA.TRAIN.DATA_PATHS=["/path/to/my/imagenet/folder/train"] \
101101
config=quick_1gpu_resnet50_simclr \
102102
config.CHECKPOINT.DIR="./checkpoints" \
103-
config.TENSORBOARD_SETUP.USE_TENSORBOARD=true
103+
config.HOOKS.TENSORBOARD_SETUP.USE_TENSORBOARD=true
104104
```
105105

106106
Explore **all the parameters and settings VISSL supports** in [VISSL defaults.yaml file](https://github.com/facebookresearch/vissl/blob/master/vissl/config/defaults.yaml)

‎configs/config/benchmark/imagenet1k_fulltune/eval_resnet_8gpu_transfer_in1k_fulltune.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/imagenet1k/eval_resnet_8gpu_transfer_in1k_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/imagenet1k/other_styles/eval_resnet_final_output_8gpu_transfer_in1k_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/imagenet1k/other_styles/eval_resnet_moco_8gpu_transfer_in1k_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 28
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/imagenet1k/other_styles/eval_resnet_res5_avgpool_output_8gpu_transfer_in1k_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/inaturalist18/eval_resnet_8gpu_transfer_inaturalist18_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 0
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 8
1315
TRAIN:

‎configs/config/benchmark/linear_image_classification/openimages/eval_resnet_8gpu_transfer_openimages_linear.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 2
1315
TRAIN:

‎configs/config/benchmark/places205_fulltune/eval_resnet_8gpu_transfer_places205_fulltune.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/semi_supervised/imagenet1k/eval_resnet_8gpu_transfer_in1k_semi_sup_fulltune.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: False
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: False
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/benchmark/semi_supervised/places205/eval_resnet_8gpu_transfer_places205_semi_sup_fulltune.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: False
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: False
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/debugging/benchmark/linear_image_classification/eval_resnet_8gpu_transfer_imagenette_160.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: True
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: True
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/debugging/pretrain/simclr/simclr_1node_resnet_imagenette_160.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
10-
ROLLING_BTIME_FREQ: 313
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
ROLLING_BTIME_FREQ: 313
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/pretrain/clusterfit/clusterfit_resnet_8gpu_imagenet.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 1
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: False
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: False
1012
DATA:
1113
NUM_DATALOADER_WORKERS: 5
1214
TRAIN:

‎configs/config/pretrain/deepcluster_v2/deepclusterv2_2crops_resnet.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
10-
ROLLING_BTIME_FREQ: 313
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
ROLLING_BTIME_FREQ: 313
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 8
1315
TRAIN:

‎configs/config/pretrain/jigsaw/jigsaw_8gpu_resnet.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: False
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: False
1012
DATA:
1113
NUM_DATALOADER_WORKERS: 5
1214
TRAIN:

‎configs/config/pretrain/moco/moco_1node_resnet.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
10-
ROLLING_BTIME_FREQ: 313
11-
TENSORBOARD_SETUP:
12-
USE_TENSORBOARD: True
13-
EXPERIMENT_LOG_DIR: "moco_v2_reference"
14-
LOG_PARAMS: False
15-
FLUSH_EVERY_N_MIN: 20
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
ROLLING_BTIME_FREQ: 313
13+
TENSORBOARD_SETUP:
14+
USE_TENSORBOARD: True
15+
EXPERIMENT_LOG_DIR: "moco_v2_reference"
16+
LOG_PARAMS: False
17+
FLUSH_EVERY_N_MIN: 20
1618
DATA:
1719
NUM_DATALOADER_WORKERS: 5
1820
TRAIN:

‎configs/config/pretrain/npid/npid++_4nodes_resnet.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: False
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: False
1012
DATA:
1113
NUM_DATALOADER_WORKERS: 8
1214
TRAIN:

‎configs/config/pretrain/npid/npid_8gpu_resnet.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: False
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: False
1012
DATA:
1113
NUM_DATALOADER_WORKERS: 5
1214
TRAIN:

‎configs/config/pretrain/rotnet/rotnet_8gpu_resnet.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ config:
77
TEST_MODEL: True
88
SEED_VALUE: 1
99
MULTI_PROCESSING_METHOD: forkserver
10-
MONITOR_PERF_STATS: False
10+
HOOKS:
11+
PERF_STATS:
12+
MONITOR_PERF_STATS: False
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/pretrain/simclr/models/efficientnet_B0.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# @package _global_
22
config:
3+
HOOKS:
4+
MODEL_COMPLEXITY:
5+
COMPUTE_COMPLEXITY: True
6+
INPUT_SHAPE: [3, 224, 224]
37
DATA:
48
TRAIN:
59
TRANSFORMS:
@@ -20,9 +24,6 @@ config:
2024
mean: [0.485, 0.456, 0.406]
2125
std: [0.229, 0.224, 0.225]
2226
MODEL:
23-
MODEL_COMPLEXITY:
24-
COMPUTE_COMPLEXITY: True
25-
INPUT_SHAPE: [3, 224, 224]
2627
TRUNK:
2728
NAME: efficientnet
2829
TRUNK_PARAMS:

‎configs/config/pretrain/simclr/models/efficientnet_B1.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ config:
1919
- name: Normalize
2020
mean: [0.485, 0.456, 0.406]
2121
std: [0.229, 0.224, 0.225]
22-
MODEL:
22+
HOOKS:
2323
MODEL_COMPLEXITY:
2424
COMPUTE_COMPLEXITY: True
2525
INPUT_SHAPE: [3, 240, 240]
26+
MODEL:
2627
TRUNK:
2728
NAME: efficientnet
2829
TRUNK_PARAMS:

‎configs/config/pretrain/simclr/models/efficientnet_B2.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ config:
1919
- name: Normalize
2020
mean: [0.485, 0.456, 0.406]
2121
std: [0.229, 0.224, 0.225]
22-
MODEL:
22+
HOOKS:
2323
MODEL_COMPLEXITY:
2424
COMPUTE_COMPLEXITY: True
2525
INPUT_SHAPE: [3, 260, 260]
26+
MODEL:
2627
TRUNK:
2728
NAME: efficientnet
2829
TRUNK_PARAMS:

‎configs/config/pretrain/simclr/simclr_8node_resnet.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
10-
ROLLING_BTIME_FREQ: 313
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
ROLLING_BTIME_FREQ: 313
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 5
1315
TRAIN:

‎configs/config/pretrain/swav/models/efficientnet_B0.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ config:
2020
- name: Normalize
2121
mean: [0.485, 0.456, 0.406]
2222
std: [0.229, 0.224, 0.225]
23-
MODEL:
23+
HOOKS:
2424
MODEL_COMPLEXITY:
2525
COMPUTE_COMPLEXITY: True
2626
INPUT_SHAPE: [3, 224, 224]
27+
MODEL:
2728
TRUNK:
2829
NAME: efficientnet
2930
TRUNK_PARAMS:

‎configs/config/pretrain/swav/models/efficientnet_B1.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ config:
2020
- name: Normalize
2121
mean: [0.485, 0.456, 0.406]
2222
std: [0.229, 0.224, 0.225]
23-
MODEL:
23+
HOOKS:
2424
MODEL_COMPLEXITY:
2525
COMPUTE_COMPLEXITY: True
2626
INPUT_SHAPE: [3, 240, 240]
27+
MODEL:
2728
TRUNK:
2829
NAME: efficientnet
2930
TRUNK_PARAMS:

‎configs/config/pretrain/swav/models/efficientnet_B2.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ config:
2020
- name: Normalize
2121
mean: [0.485, 0.456, 0.406]
2222
std: [0.229, 0.224, 0.225]
23-
MODEL:
23+
HOOKS:
2424
MODEL_COMPLEXITY:
2525
COMPUTE_COMPLEXITY: True
2626
INPUT_SHAPE: [3, 260, 260]
27+
MODEL:
2728
TRUNK:
2829
NAME: efficientnet
2930
TRUNK_PARAMS:

‎configs/config/pretrain/swav/swav_8node_resnet.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
10-
ROLLING_BTIME_FREQ: 313
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
ROLLING_BTIME_FREQ: 313
1113
DATA:
1214
NUM_DATALOADER_WORKERS: 8
1315
TRAIN:

‎configs/config/test/cpu_test/test_cpu_efficientnet_simclr.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ config:
66
TEST_MODEL: False
77
SEED_VALUE: 0
88
MULTI_PROCESSING_METHOD: forkserver
9-
MONITOR_PERF_STATS: True
9+
HOOKS:
10+
PERF_STATS:
11+
MONITOR_PERF_STATS: True
12+
MODEL_COMPLEXITY:
13+
COMPUTE_COMPLEXITY: False
14+
INPUT_SHAPE: [3, 224, 224]
1015
DATA:
1116
NUM_DATALOADER_WORKERS: 0
1217
TRAIN:
@@ -40,9 +45,6 @@ config:
4045
METERS:
4146
name: ""
4247
MODEL:
43-
MODEL_COMPLEXITY:
44-
COMPUTE_COMPLEXITY: False
45-
INPUT_SHAPE: [3, 224, 224]
4648
TRUNK:
4749
NAME: efficientnet
4850
TRUNK_PARAMS:

0 commit comments

Comments
 (0)