Skip to content

Shake Shake updates #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Sep 30, 2021
Merged

Shake Shake updates #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a5374ed
To test locally
ravinkohli Sep 2, 2021
06ad658
fix bug in trainer choice fit
ravinkohli Sep 6, 2021
1942279
fix ensemble bug
ravinkohli Sep 8, 2021
2dc8850
Correct bug in cleanup
ravinkohli Sep 8, 2021
a80eb9e
To test locally
ravinkohli Sep 2, 2021
87168db
Merge branch 'shake-even' of github.com:automl/Auto-PyTorch into shak…
ravinkohli Sep 10, 2021
06d80d4
Cleanup for removing time debug statements
ravinkohli Sep 16, 2021
d8b553a
ablation for adversarial
ravinkohli Sep 20, 2021
062de69
Merge branch 'cocktail_fixes_time_debug' of github.com:automl/Auto-Py…
ravinkohli Sep 20, 2021
34712b3
shuffle false in dataloader
ravinkohli Sep 21, 2021
49f40dc
drop last false in dataloader
ravinkohli Sep 21, 2021
f4ea158
fix bug for validation set, and cutout and cutmix
ravinkohli Sep 23, 2021
fca1399
To test locally
ravinkohli Sep 2, 2021
5d03fb2
Merge branch 'shake-even' of github.com:automl/Auto-PyTorch into shak…
ravinkohli Sep 24, 2021
209a4e8
shuffle = False
ravinkohli Sep 24, 2021
d18fcca
To test locally
ravinkohli Sep 2, 2021
b432882
Merge branch 'shake-even' of github.com:automl/Auto-PyTorch into shak…
ravinkohli Sep 24, 2021
b38bfb3
updates to search space
ravinkohli Sep 26, 2021
8c2f2ac
updates to search space
ravinkohli Sep 26, 2021
f0676b1
update branch with search space
ravinkohli Sep 26, 2021
82d950c
undo search space update
ravinkohli Sep 27, 2021
30ba55e
fix bug in shake shake flag
ravinkohli Sep 27, 2021
e406f5b
limit to shake-even
ravinkohli Sep 27, 2021
863cc06
restrict to even even
ravinkohli Sep 27, 2021
2921781
Add even even and others for shake-drop also
ravinkohli Sep 29, 2021
e9359da
fix bug in passing alpha beta method
ravinkohli Sep 29, 2021
7f25e6f
restrict to only even even
ravinkohli Sep 29, 2021
dd5cb5b
fix silly bug:
ravinkohli Sep 29, 2021
0bb8436
remove imputer and ordinal encoder for categorical transformer in fea…
ravinkohli Sep 30, 2021
89e595e
Address comments from shuhei
ravinkohli Sep 30, 2021
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
29 changes: 13 additions & 16 deletions autoPyTorch/pipeline/components/setup/network_backbone/ResNetBackbone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,14 @@ def get_hyperparameter_search_space(
value_range=(True, False),
default_value=True,
),
shake_shake_method: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="shake_shake_method",
value_range=('shake-shake',
'shake-even',
'even-even',
'M3'),
default_value='shake-shake',
),
shake_alpha_beta_method: HyperparameterSearchSpace = HyperparameterSearchSpace(
hyperparameter="shake_alpha_beta_method",
value_range=('shake-shake',
'shake-even',
'even-even',
'M3'),
default_value='shake-shake',
),
use_shake_drop: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="use_shake_drop",
value_range=(True, False),
default_value=True,
Expand Down Expand Up @@ -187,12 +188,8 @@ def get_hyperparameter_search_space(

if skip_connection_flag:

shake_shake_flag = False
shake_drop_prob_flag = False
if 'shake-drop' in multi_branch_choice.value_range:
shake_drop_prob_flag = True
if 'shake-shake' in multi_branch_choice.value_range:
shake_shake_flag = True
shake_shake_flag = 'shake-shake' in multi_branch_choice.value_range
shake_drop_prob_flag = 'shake-drop' in multi_branch_choice.value_range

mb_choice = get_hyperparameter(multi_branch_choice, CategoricalHyperparameter)
cs.add_hyperparameter(mb_choice)
Expand All @@ -202,10 +199,10 @@ def get_hyperparameter_search_space(
shake_drop_prob = get_hyperparameter(max_shake_drop_probability, UniformFloatHyperparameter)
cs.add_hyperparameter(shake_drop_prob)
cs.add_condition(CS.EqualsCondition(shake_drop_prob, mb_choice, "shake-drop"))
if shake_shake_flag:
method = get_hyperparameter(shake_shake_method, CategoricalHyperparameter)
if shake_shake_flag or shake_drop_prob_flag:
method = get_hyperparameter(shake_alpha_beta_method, CategoricalHyperparameter)
cs.add_hyperparameter(method)
cs.add_condition(CS.EqualsCondition(method, mb_choice, "shake-shake"))
cs.add_condition(CS.InCondition(method, mb_choice, ["shake-shake", "shake-drop"]))

# It is the upper bound of the nr of groups,
# since the configuration will actually be sampled.
Expand Down
35 changes: 13 additions & 22 deletions autoPyTorch/pipeline/components/setup/network_backbone/ShapedResNetBackbone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,14 @@ def get_hyperparameter_search_space( # type: ignore[override]
'stairs'),
default_value='funnel',
),
# shake_shake_method: HyperparameterSearchSpace = HyperparameterSearchSpace(
# hyperparameter="shake_shake_method",
# value_range=('shake-shake',
# 'shake-even',
# 'even-even',
# 'M3'),
# default_value='shake-shake',
# ),
shake_shake_method: HyperparameterSearchSpace = HyperparameterSearchSpace(
hyperparameter="shake_shake_method",
value_range=('even-even', ),
default_value='even-even',
),
shake_alpha_beta_method: HyperparameterSearchSpace = HyperparameterSearchSpace(
hyperparameter="shake_alpha_beta_method",
value_range=('shake-shake',
'shake-even',
'even-even',
'M3'),
default_value='shake-shake',
),
max_shake_drop_probability: HyperparameterSearchSpace = HyperparameterSearchSpace(
hyperparameter="max_shake_drop_probability",
value_range=(0, 1),
Expand Down Expand Up @@ -201,12 +196,8 @@ def get_hyperparameter_search_space( # type: ignore[override]

if skip_connection_flag:

shake_shake_flag = False
shake_drop_prob_flag = False
if 'shake-drop' in multi_branch_choice.value_range:
shake_drop_prob_flag = True
if 'shake-shake' in multi_branch_choice.value_range:
shake_shake_flag = True
shake_shake_flag = 'shake-shake' in multi_branch_choice.value_range
shake_drop_prob_flag = 'shake-drop' in multi_branch_choice.value_range

mb_choice = get_hyperparameter(multi_branch_choice, CategoricalHyperparameter)
cs.add_hyperparameter(mb_choice)
Expand All @@ -216,9 +207,9 @@ def get_hyperparameter_search_space( # type: ignore[override]
shake_drop_prob = get_hyperparameter(max_shake_drop_probability, UniformFloatHyperparameter)
cs.add_hyperparameter(shake_drop_prob)
cs.add_condition(CS.EqualsCondition(shake_drop_prob, mb_choice, "shake-drop"))
if shake_shake_flag:
method = get_hyperparameter(shake_shake_method, CategoricalHyperparameter)
if shake_shake_flag or shake_drop_prob_flag:
method = get_hyperparameter(shake_alpha_beta_method, CategoricalHyperparameter)
cs.add_hyperparameter(method)
cs.add_condition(CS.EqualsCondition(method, mb_choice, "shake-shake"))
cs.add_condition(CS.InCondition(method, mb_choice, ["shake-shake", "shake-drop"]))

return cs
11 changes: 6 additions & 5 deletions autoPyTorch/pipeline/components/setup/network_backbone/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,14 @@ def shake_get_alpha_beta(
return result if not is_cuda else (result[0].cuda(), result[1].cuda())

# TODO implement other update methods
if method != 'even-even':
alpha = torch.rand(1)
else:
if method == 'even-even':
alpha = torch.FloatTensor([0.5])
if method in ['shake-shake', 'shake-drop']:
else:
alpha = torch.rand(1)

if method == 'shake-shake':
beta = torch.rand(1)
elif 'even' in method: # 'shake-even' or 'even-even'
elif method in ['shake-even', 'even-even']:
beta = torch.FloatTensor([0.5])
elif method == 'M3':
beta = torch.FloatTensor(
Expand Down