Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
263adf3
Don't require output module with SequentialDict
dxoigmn Jun 12, 2023
cd5d789
CallWith passes non-str arguments directly to module
dxoigmn Jun 13, 2023
169582a
Make *_step_log dicts where the key is the logging name and value is …
dxoigmn Jun 12, 2023
c37a03a
Add better example of dual model torchvision detectors
dxoigmn Jun 13, 2023
48e3be9
Make *_step_log dicts where the key is the logging name and value is …
dxoigmn Jun 12, 2023
01a2066
Fix configs
dxoigmn Jun 13, 2023
df1d0b2
remove sync_dist
dxoigmn Jun 13, 2023
14f4d1f
backwards compatibility
dxoigmn Jun 13, 2023
2e30587
Revert "Fix configs"
dxoigmn Jun 13, 2023
ca17006
Merge branch 'main' into better_litmodular
dxoigmn Jun 13, 2023
6fef148
style
dxoigmn Jun 13, 2023
c4e0d78
Make metric logging keys configurable
dxoigmn Jun 12, 2023
508798c
cleanup
dxoigmn Jun 13, 2023
fc770e8
Remove *_step_end
dxoigmn Jun 14, 2023
5050163
Merge branch 'better_litmodular2' into better_sequentialdict
dxoigmn Jun 14, 2023
4414822
Merge branch 'better_litmodular3' into better_sequentialdict
dxoigmn Jun 14, 2023
c31f4de
Don't require output module with SequentialDict
dxoigmn Jun 12, 2023
549f705
fix configs and tests
dxoigmn Jun 14, 2023
5e73817
Generalize attack objectives
dxoigmn Jun 14, 2023
62216f2
Merge branch 'better_litmodular2' into better_sequentialdict
dxoigmn Jun 14, 2023
19625c9
Merge branch 'better_sequentialdict' into better_detector
dxoigmn Jun 14, 2023
54882e7
style
dxoigmn Jun 14, 2023
ed49144
bugfix
dxoigmn Jun 14, 2023
c2eeebf
_return_as_dict -> _return_as_dict_
dxoigmn Jun 14, 2023
5be1688
path -> _path_
dxoigmn Jun 14, 2023
04a249a
Better Magic Module
dxoigmn Jun 14, 2023
d6fad0d
Interpolate rcnn_training_loss from training sequence
dxoigmn Jun 14, 2023
0eb7cef
Dont hardcode detector
dxoigmn Jun 14, 2023
b508ef6
Remove DualModeGeneralizedRCNN in favor of using configuration
dxoigmn Jun 14, 2023
54878b0
Remove DualModeGeneralizedRCNN in favor of using configuration
dxoigmn Jun 14, 2023
7b94311
Remove DualModeGeneralizedRCNN in favor of using configuration
dxoigmn Jun 14, 2023
b6f8ca3
CallWith passes non-str arguments directly to module
dxoigmn Jun 13, 2023
52f0501
_return_as_dict -> _return_as_dict_
dxoigmn Jun 14, 2023
a0761ee
style
dxoigmn Jun 14, 2023
cdc15a5
Merge branch 'better_sequentialdict2' into better_detector
dxoigmn Jun 14, 2023
2063b97
bugfix
dxoigmn Jun 14, 2023
4f41893
Improve load_state_dict
dxoigmn Jun 15, 2023
dcf222e
Load COCO_V1 weights
dxoigmn Jun 15, 2023
d4b60ce
Load COCO_V1 weights
dxoigmn Jun 15, 2023
b159543
Add GeneralizedRCNNPostProcessor
dxoigmn Jun 15, 2023
0b6ce3d
style
dxoigmn Jun 15, 2023
3faa5b6
Surround parameters by underscores
dxoigmn Jun 15, 2023
cc71934
bugfix
dxoigmn Jun 15, 2023
b2009a8
Revert "_return_as_dict -> _return_as_dict_"
dxoigmn Jun 15, 2023
cef11f3
fix imports
dxoigmn Jun 15, 2023
9522075
Move _call_with_args_ and _return_as_dict_ functionality into CallWith
dxoigmn Jun 15, 2023
ba58264
Allow overwriting _call_with_args_ and _return_as_dict_ in CallWith.f…
dxoigmn Jun 15, 2023
60fc2ad
Add _train_mode_ and _inference_mode_ to CallWith
dxoigmn Jun 15, 2023
2e51c66
Revert "Add _train_mode_ and _inference_mode_ to CallWith"
dxoigmn Jun 15, 2023
1671755
Revert "Revert "Add _train_mode_ and _inference_mode_ to CallWith""
dxoigmn Jun 15, 2023
731b23d
cleanup
dxoigmn Jun 15, 2023
ac942c7
Merge branch 'better_sequentialdict3' into better_sequentialdict4
dxoigmn Jun 15, 2023
8e664f1
cleanup
dxoigmn Jun 15, 2023
ae1b836
Fix configs
dxoigmn Jun 15, 2023
39f9aaa
cleanup
dxoigmn Jun 15, 2023
0973933
bugfix
dxoigmn Jun 15, 2023
6d3f42a
Merge branch 'better_sequentialdict3' into better_sequentialdict4
dxoigmn Jun 15, 2023
2ec4e49
Only set train mode and inference mode on Modules
dxoigmn Jun 15, 2023
741d282
bugfix
dxoigmn Jun 15, 2023
15c5a5f
CallWith is not a Module
dxoigmn Jun 15, 2023
cb55a31
Merge branch 'better_sequentialdict3' into better_sequentialdict4
dxoigmn Jun 15, 2023
fbba2d9
Merge branch 'better_sequentialdict4' into better_detector
dxoigmn Jun 15, 2023
27380ab
Remove Module in favor of changes to SequentialDict
dxoigmn Jun 15, 2023
96bbbd5
style
dxoigmn Jun 15, 2023
54ca2cb
Merge branch 'main' into better_litmodular3
dxoigmn Jun 22, 2023
bce7b53
Merge branch 'better_litmodular3' into better_sequentialdict
dxoigmn Jun 22, 2023
40dd262
cleanup
dxoigmn Jun 22, 2023
a218bb2
Merge branch 'main' into better_sequentialdict3
dxoigmn Jun 22, 2023
0716be3
Merge branch 'main' into better_sequentialdict3
dxoigmn Jun 22, 2023
ceaa744
bugfix
dxoigmn Jun 22, 2023
1972919
Merge branch 'main' into better_sequentialdict2
dxoigmn Jun 22, 2023
51c2f73
comments
dxoigmn Jun 22, 2023
d607fdf
Merge branch 'main' into better_sequentialdict3
dxoigmn Jun 22, 2023
b8d473b
fix merge error
dxoigmn Jun 22, 2023
e9cf67b
Change call special arg names
dxoigmn Jun 22, 2023
3f3e302
Merge branch 'better_sequentialdict3' into better_sequentialdict4
dxoigmn Jun 22, 2023
92c1cb3
Merge branch 'better_sequentialdict' into better_detector
dxoigmn Jun 23, 2023
7dc7dd9
Merge branch 'better_sequentialdict2' into better_detector
dxoigmn Jun 23, 2023
7184f5d
Merge branch 'better_sequentialdict3' into better_detector
dxoigmn Jun 23, 2023
46a201b
Merge branch 'better_sequentialdict4' into better_detector
dxoigmn Jun 23, 2023
f79fd69
Merge branch 'main' into better_detector
dxoigmn Jun 23, 2023
6987ef9
bugfix
dxoigmn Jun 23, 2023
94d0834
Merge branch 'main' into better_detector
dxoigmn Jun 28, 2023
b8a692a
Fix merge error
dxoigmn Jun 28, 2023
7e48a21
bugfix
dxoigmn Jun 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions mart/configs/attack/gain/rcnn_training_loss.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
_target_: mart.nn.CallWith
module:
_target_: mart.nn.Sum
_call_with_args_:
- "losses_and_detections.training.loss_objectness"
- "losses_and_detections.training.loss_rpn_box_reg"
- "losses_and_detections.training.loss_classifier"
- "losses_and_detections.training.loss_box_reg"
_call_with_args_: ${model.training_sequence.seq100.loss}
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ tags: ["regular_training"]
optimized_metric: "test_metrics/map"

model:
load_state_dict: null

modules:
losses_and_detections:
model:
roi_heads:
box_predictor:
num_classes: 3
weights: null

optimizer:
lr: 0.0125
Expand Down
7 changes: 0 additions & 7 deletions mart/configs/experiment/COCO_TorchvisionFasterRCNN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ datamodule:
world_size: 1

model:
modules:
losses_and_detections:
model:
# Inferred by torchvision.
num_classes: null
weights: COCO_V1

optimizer:
lr: 0.0125
momentum: 0.9
Expand Down
11 changes: 5 additions & 6 deletions mart/configs/experiment/COCO_TorchvisionRetinaNet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,18 @@ callbacks:
trainer:
# 117,266 training images, 6 epochs, batch_size=2, 351798
max_steps: 351798
precision: 16
# FIXME: "nms_kernel" not implemented for 'BFloat16', torch.ops.torchvision.nms().
precision: 32

datamodule:
ims_per_batch: 2
world_size: 1

model:
modules:
losses_and_detections:
model:
# Inferred by torchvision.
num_classes: null
weights: COCO_V1
detector:
num_classes: null # inferred by torchvision
weights: COCO_V1

optimizer:
lr: 0.0125
Expand Down
82 changes: 82 additions & 0 deletions mart/configs/model/torchvision_dual_faster_rcnn.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# We simply wrap a torchvision object detection model for validation.
defaults:
- torchvision_object_detection

# log all losses separately in losses.
training_step_log:
loss_objectness: "losses.loss_objectness"
loss_rpn_box_reg: "losses.loss_rpn_box_reg"
loss_classifier: "losses.loss_classifier"
loss_box_reg: "losses.loss_box_reg"

training_sequence:
seq010:
preprocessor: ["input"]

seq020:
detector:
_name_: losses
_train_mode_: True
images: preprocessor
targets: target

seq030:
detector:
_name_: preds
_train_mode_: False
_inference_mode_: True
images: preprocessor
targets: target

seq100:
loss:
# Sum up the losses.
[
"losses.loss_objectness",
"losses.loss_rpn_box_reg",
"losses.loss_classifier",
"losses.loss_box_reg",
]

validation_sequence:
seq010:
preprocessor: ["input"]

seq020:
detector:
_name_: losses
_train_mode_: True
images: preprocessor
targets: target

seq030:
detector:
_name_: preds
_train_mode_: False
_inference_mode_: True
images: preprocessor
targets: target

test_sequence:
seq010:
preprocessor: ["input"]

seq020:
detector:
_name_: losses
_train_mode_: True
images: preprocessor
targets: target

seq030:
detector:
_name_: preds
_train_mode_: False
_inference_mode_: True
images: preprocessor
targets: target

modules:
detector:
_target_: torchvision.models.detection.fasterrcnn_resnet50_fpn
weights: "COCO_V1"
Loading