Skip to content

Commit 61cfcf4

Browse files
lcadalzomatt wartelldavidslateryusong-tanReed Gordon-Sarney
authored
Version bump to 13.5 (#1146) (#1147)
* abstain metric (#1132) * abstain metric * update doc and add test * Update scenarios md (#1136) * updating scenarios.md with Eval 3 results * formatting * formatting * formatting * added a note indicating DAPRICOT results are from the dev test data Co-authored-by: Yusong Tan <[email protected]> * Dev 0.13.5 poison (#1133) * nan instead of valueerror * fully instrumented gtsrb * fully instrumented resisc10 * minor update * clean label * Bug fixes suggested by Mike Tan and Kevin Eykholt. Co-authored-by: Reed Gordon-Sarney <[email protected]> * bug fix and updates (#1143) * version bump * version bump in config files Co-authored-by: davidslater <[email protected]> Co-authored-by: lcadalzo <[email protected]> Co-authored-by: Yusong Tan <[email protected]> Co-authored-by: Reed Gordon-Sarney <[email protected]> Co-authored-by: yusong-tan <[email protected]> Co-authored-by: matt wartell <[email protected]> Co-authored-by: davidslater <[email protected]> Co-authored-by: Yusong Tan <[email protected]> Co-authored-by: Reed Gordon-Sarney <[email protected]> Co-authored-by: yusong-tan <[email protected]>
1 parent eab8710 commit 61cfcf4

File tree

56 files changed

+56
-56
lines changed

Some content is hidden

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

56 files changed

+56
-56
lines changed

‎armory/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
# Semantic Version
11-
__version__ = "0.13.4"
11+
__version__ = "0.13.5"
1212

1313

1414
# Submodule imports

‎scenario_configs/apricot_frcnn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"name": "ObjectDetectionTask"
4545
},
4646
"sysconfig": {
47-
"docker_image": "twosixarmory/tf1:0.13.4",
47+
"docker_image": "twosixarmory/tf1:0.13.5",
4848
"external_github_repo": null,
4949
"gpus": "all",
5050
"output_dir": null,

‎scenario_configs/apricot_frcnn_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"name": "ObjectDetectionTask"
5858
},
5959
"sysconfig": {
60-
"docker_image": "twosixarmory/tf1:0.13.4",
60+
"docker_image": "twosixarmory/tf1:0.13.5",
6161
"external_github_repo": null,
6262
"gpus": "all",
6363
"output_dir": null,

‎scenario_configs/cifar10_baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"name": "ImageClassificationTask"
5050
},
5151
"sysconfig": {
52-
"docker_image": "twosixarmory/pytorch:0.13.4",
52+
"docker_image": "twosixarmory/pytorch:0.13.5",
5353
"external_github_repo": null,
5454
"gpus": "all",
5555
"output_dir": null,

‎scenario_configs/cifar10_defended_example.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"name": "ImageClassificationTask"
5858
},
5959
"sysconfig": {
60-
"docker_image": "twosixarmory/pytorch:0.13.4",
60+
"docker_image": "twosixarmory/pytorch:0.13.5",
6161
"external_github_repo": null,
6262
"gpus": "all",
6363
"output_dir": null,

‎scenario_configs/dapricot_frcnn_masked_pgd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"name": "ObjectDetectionTask"
5454
},
5555
"sysconfig": {
56-
"docker_image": "twosixarmory/tf1:0.13.4",
56+
"docker_image": "twosixarmory/tf1:0.13.5",
5757
"external_github_repo": "colour-science/colour",
5858
"gpus": "all",
5959
"output_dir": null,

‎scenario_configs/gtsrb_scenario_baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"name": "GTSRB"
5959
},
6060
"sysconfig": {
61-
"docker_image": "twosixarmory/tf1:0.13.4",
61+
"docker_image": "twosixarmory/tf1:0.13.5",
6262
"external_github_repo": null,
6363
"gpus": "all",
6464
"output_dir": null,

‎scenario_configs/gtsrb_scenario_baseline_pytorch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"name": "GTSRB"
5959
},
6060
"sysconfig": {
61-
"docker_image": "twosixarmory/pytorch:0.13.4",
61+
"docker_image": "twosixarmory/pytorch:0.13.5",
6262
"external_github_repo": null,
6363
"gpus": "all",
6464
"output_dir": null,

‎scenario_configs/gtsrb_scenario_clbd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"name": "GTSRB_CLBD"
5959
},
6060
"sysconfig": {
61-
"docker_image": "twosixarmory/tf1:0.13.4",
61+
"docker_image": "twosixarmory/tf1:0.13.5",
6262
"external_github_repo": null,
6363
"gpus": "all",
6464
"output_dir": null,

‎scenario_configs/gtsrb_scenario_clbd_bullethole.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"name": "GTSRB_CLBD"
6565
},
6666
"sysconfig": {
67-
"docker_image": "twosixarmory/tf1:0.13.4",
67+
"docker_image": "twosixarmory/tf1:0.13.5",
6868
"external_github_repo": null,
6969
"gpus": "all",
7070
"output_dir": null,

‎scenario_configs/gtsrb_scenario_clbd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "GTSRB_CLBD"
7070
},
7171
"sysconfig": {
72-
"docker_image": "twosixarmory/tf1:0.13.4",
72+
"docker_image": "twosixarmory/tf1:0.13.5",
7373
"external_github_repo": null,
7474
"gpus": "all",
7575
"output_dir": null,

‎scenario_configs/gtsrb_scenario_poison.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"name": "GTSRB"
4949
},
5050
"sysconfig": {
51-
"docker_image": "twosixarmory/tf1:0.13.4",
51+
"docker_image": "twosixarmory/tf1:0.13.5",
5252
"external_github_repo": null,
5353
"gpus": "all",
5454
"use_gpu": false

‎scenario_configs/librispeech_asr_imperceptible_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"name": "AutomaticSpeechRecognition"
8282
},
8383
"sysconfig": {
84-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
84+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
8585
"external_github_repo": "hkakitani/deepspeech.pytorch",
8686
"gpus": "all",
8787
"local_repo_path": null,

‎scenario_configs/librispeech_asr_imperceptible_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"name": "AutomaticSpeechRecognition"
7171
},
7272
"sysconfig": {
73-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
73+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
7474
"external_github_repo": "hkakitani/deepspeech.pytorch",
7575
"gpus": "all",
7676
"local_repo_path": null,

‎scenario_configs/librispeech_asr_kenansville_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"name": "AutomaticSpeechRecognition"
6565
},
6666
"sysconfig": {
67-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
67+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
6868
"external_github_repo": "hkakitani/deepspeech.pytorch",
6969
"gpus": "all",
7070
"local_repo_path": null,

‎scenario_configs/librispeech_asr_kenansville_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"name": "AutomaticSpeechRecognition"
5454
},
5555
"sysconfig": {
56-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
56+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
5757
"external_github_repo": "hkakitani/deepspeech.pytorch",
5858
"gpus": "all",
5959
"local_repo_path": null,

‎scenario_configs/librispeech_asr_pgd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"name": "AutomaticSpeechRecognition"
7676
},
7777
"sysconfig": {
78-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
78+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
7979
"external_github_repo": "hkakitani/deepspeech.pytorch",
8080
"gpus": "all",
8181
"local_repo_path": null,

‎scenario_configs/librispeech_asr_pgd_multipath_channel_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"name": "AutomaticSpeechRecognition"
8181
},
8282
"sysconfig": {
83-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
83+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
8484
"external_github_repo": "hkakitani/deepspeech.pytorch",
8585
"gpus": "all",
8686
"local_repo_path": null,

‎scenario_configs/librispeech_asr_pgd_multipath_channel_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "AutomaticSpeechRecognition"
7070
},
7171
"sysconfig": {
72-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
72+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
7373
"external_github_repo": "hkakitani/deepspeech.pytorch",
7474
"gpus": "all",
7575
"local_repo_path": null,

‎scenario_configs/librispeech_asr_pgd_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"name": "AutomaticSpeechRecognition"
6565
},
6666
"sysconfig": {
67-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
67+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
6868
"external_github_repo": "hkakitani/deepspeech.pytorch",
6969
"gpus": "all",
7070
"local_repo_path": null,

‎scenario_configs/librispeech_asr_snr_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "AutomaticSpeechRecognition"
7070
},
7171
"sysconfig": {
72-
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.4",
72+
"docker_image": "twosixarmory/pytorch-deepspeech:0.13.5",
7373
"external_github_repo": "hkakitani/deepspeech.pytorch",
7474
"gpus": "all",
7575
"local_repo_path": null,

‎scenario_configs/librispeech_baseline_sincnet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"name": "AudioClassificationTask"
5656
},
5757
"sysconfig": {
58-
"docker_image": "twosixarmory/pytorch:0.13.4",
58+
"docker_image": "twosixarmory/pytorch:0.13.5",
5959
"external_github_repo": "hkakitani/SincNet",
6060
"gpus": "all",
6161
"output_dir": null,

‎scenario_configs/librispeech_baseline_sincnet_snr_pgd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"name": "AudioClassificationTask"
6060
},
6161
"sysconfig": {
62-
"docker_image": "twosixarmory/pytorch:0.13.4",
62+
"docker_image": "twosixarmory/pytorch:0.13.5",
6363
"external_github_repo": "hkakitani/SincNet",
6464
"gpus": "all",
6565
"output_dir": null,

‎scenario_configs/librispeech_baseline_sincnet_targeted.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"name": "AudioClassificationTask"
6363
},
6464
"sysconfig": {
65-
"docker_image": "twosixarmory/pytorch:0.13.4",
65+
"docker_image": "twosixarmory/pytorch:0.13.5",
6666
"external_github_repo": "hkakitani/SincNet",
6767
"gpus": "all",
6868
"output_dir": null,

‎scenario_configs/mnist_baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"name": "ImageClassificationTask"
4848
},
4949
"sysconfig": {
50-
"docker_image": "twosixarmory/tf1:0.13.4",
50+
"docker_image": "twosixarmory/tf1:0.13.5",
5151
"external_github_repo": null,
5252
"gpus": "all",
5353
"output_dir": null,

‎scenario_configs/resisc10_poison_dlbd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"name": "RESISC10"
115115
},
116116
"sysconfig": {
117-
"docker_image": "twosixarmory/pytorch:0.13.4",
117+
"docker_image": "twosixarmory/pytorch:0.13.5",
118118
"external_github_repo": null,
119119
"gpus": "all",
120120
"output_dir": null,

‎scenario_configs/resisc45_baseline_densenet121.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"name": "ImageClassificationTask"
4646
},
4747
"sysconfig": {
48-
"docker_image": "twosixarmory/tf1:0.13.4",
48+
"docker_image": "twosixarmory/tf1:0.13.5",
4949
"external_github_repo": null,
5050
"gpus": "all",
5151
"output_dir": null,

‎scenario_configs/resisc45_baseline_densenet121_cascade.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"name": "ImageClassificationTask"
7171
},
7272
"sysconfig": {
73-
"docker_image": "twosixarmory/tf1:0.13.4",
73+
"docker_image": "twosixarmory/tf1:0.13.5",
7474
"external_github_repo": null,
7575
"gpus": "all",
7676
"output_dir": null,

‎scenario_configs/resisc45_baseline_densenet121_finetune.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"name": "ImageClassificationTask"
4646
},
4747
"sysconfig": {
48-
"docker_image": "twosixarmory/tf1:0.13.4",
48+
"docker_image": "twosixarmory/tf1:0.13.5",
4949
"external_github_repo": null,
5050
"gpus": "all",
5151
"output_dir": null,

‎scenario_configs/resisc45_baseline_densenet121_patch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"name": "ImageClassificationTask"
5959
},
6060
"sysconfig": {
61-
"docker_image": "twosixarmory/tf1:0.13.4",
61+
"docker_image": "twosixarmory/tf1:0.13.5",
6262
"external_github_repo": null,
6363
"gpus": "all",
6464
"output_dir": null,

‎scenario_configs/resisc45_baseline_densenet121_targeted.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"name": "ImageClassificationTask"
5353
},
5454
"sysconfig": {
55-
"docker_image": "twosixarmory/tf1:0.13.4",
55+
"docker_image": "twosixarmory/tf1:0.13.5",
5656
"external_github_repo": null,
5757
"gpus": "all",
5858
"output_dir": null,

‎scenario_configs/so2sat_eo_masked_pgd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"name": "So2SatClassification"
137137
},
138138
"sysconfig": {
139-
"docker_image": "twosixarmory/tf1:0.13.4",
139+
"docker_image": "twosixarmory/tf1:0.13.5",
140140
"external_github_repo": null,
141141
"gpus": "all",
142142
"output_dir": null,

‎scenario_configs/so2sat_eo_masked_pgd_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"name": "So2SatClassification"
9191
},
9292
"sysconfig": {
93-
"docker_image": "twosixarmory/tf1:0.13.4",
93+
"docker_image": "twosixarmory/tf1:0.13.5",
9494
"external_github_repo": null,
9595
"gpus": "all",
9696
"output_dir": null,

‎scenario_configs/so2sat_sar_masked_pgd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"name": "So2SatClassification"
137137
},
138138
"sysconfig": {
139-
"docker_image": "twosixarmory/tf1:0.13.4",
139+
"docker_image": "twosixarmory/tf1:0.13.5",
140140
"external_github_repo": null,
141141
"gpus": "all",
142142
"output_dir": null,

‎scenario_configs/so2sat_sar_masked_pgd_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"name": "So2SatClassification"
9191
},
9292
"sysconfig": {
93-
"docker_image": "twosixarmory/tf1:0.13.4",
93+
"docker_image": "twosixarmory/tf1:0.13.5",
9494
"external_github_repo": null,
9595
"gpus": "all",
9696
"output_dir": null,

‎scenario_configs/ucf101_baseline_finetune.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"name": "Ucf101"
5353
},
5454
"sysconfig": {
55-
"docker_image": "twosixarmory/pytorch:0.13.4",
55+
"docker_image": "twosixarmory/pytorch:0.13.5",
5656
"external_github_repo": "yusong-tan/MARS",
5757
"gpus": "all",
5858
"output_dir": null,

‎scenario_configs/ucf101_baseline_pretrained_targeted.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"name": "Ucf101"
5959
},
6060
"sysconfig": {
61-
"docker_image": "twosixarmory/pytorch:0.13.4",
61+
"docker_image": "twosixarmory/pytorch:0.13.5",
6262
"external_github_repo": "yusong-tan/MARS",
6363
"gpus": "all",
6464
"output_dir": null,

‎scenario_configs/ucf101_pretrained_flicker_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"name": "Ucf101"
6868
},
6969
"sysconfig": {
70-
"docker_image": "twosixarmory/pytorch:0.13.4",
70+
"docker_image": "twosixarmory/pytorch:0.13.5",
7171
"external_github_repo": "yusong-tan/MARS",
7272
"gpus": "all",
7373
"output_dir": null,

‎scenario_configs/ucf101_pretrained_flicker_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"name": "Ucf101"
5656
},
5757
"sysconfig": {
58-
"docker_image": "twosixarmory/pytorch:0.13.4",
58+
"docker_image": "twosixarmory/pytorch:0.13.5",
5959
"external_github_repo": "yusong-tan/MARS",
6060
"gpus": "all",
6161
"output_dir": null,

‎scenario_configs/ucf101_pretrained_frame_saliency_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"name": "Ucf101"
7777
},
7878
"sysconfig": {
79-
"docker_image": "twosixarmory/pytorch:0.13.4",
79+
"docker_image": "twosixarmory/pytorch:0.13.5",
8080
"external_github_repo": "yusong-tan/MARS",
8181
"gpus": "all",
8282
"output_dir": null,

‎scenario_configs/ucf101_pretrained_frame_saliency_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"name": "Ucf101"
6565
},
6666
"sysconfig": {
67-
"docker_image": "twosixarmory/pytorch:0.13.4",
67+
"docker_image": "twosixarmory/pytorch:0.13.5",
6868
"external_github_repo": "yusong-tan/MARS",
6969
"gpus": "all",
7070
"output_dir": null,

‎scenario_configs/ucf101_pretrained_masked_pgd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"name": "Ucf101"
7474
},
7575
"sysconfig": {
76-
"docker_image": "twosixarmory/pytorch:0.13.4",
76+
"docker_image": "twosixarmory/pytorch:0.13.5",
7777
"external_github_repo": "yusong-tan/MARS",
7878
"gpus": "all",
7979
"output_dir": null,

‎scenario_configs/ucf101_pretrained_masked_pgd_undefended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"name": "Ucf101"
6262
},
6363
"sysconfig": {
64-
"docker_image": "twosixarmory/pytorch:0.13.4",
64+
"docker_image": "twosixarmory/pytorch:0.13.5",
6565
"external_github_repo": "yusong-tan/MARS",
6666
"gpus": "all",
6767
"output_dir": null,

‎scenario_configs/xview_frcnn_masked_pgd_defended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"name": "ObjectDetectionTask"
6565
},
6666
"sysconfig": {
67-
"docker_image": "twosixarmory/pytorch:0.13.4",
67+
"docker_image": "twosixarmory/pytorch:0.13.5",
6868
"external_github_repo": null,
6969
"gpus": "all",
7070
"output_dir": null,

0 commit comments

Comments
 (0)