Skip to content

Commit 4add9e6

Browse files
ArlindKadraravinkohli
ArlindKadra
authored and
ravinkohli
committed
Updating search space (#156)
* Updating search space * fix typo * Bug fix * Fixing buggy implementation of predict when using gpu
1 parent 682113c commit 4add9e6

File tree

10 files changed

+31
-20
lines changed

10 files changed

+31
-20
lines changed

‎autoPyTorch/pipeline/components/setup/network/base_network.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ def predict(self, loader: torch.utils.data.DataLoader) -> torch.Tensor:
125125
return Y_snapshot_preds_tensor.mean(dim=0).cpu().numpy()
126126

127127
def _predict(self, network: torch.nn.Module, loader: torch.utils.data.DataLoader) -> torch.Tensor:
128+
network.to(self.device)
128129
network.float()
129130
network.eval()
130131
# Batch prediction
@@ -133,10 +134,10 @@ def _predict(self, network: torch.nn.Module, loader: torch.utils.data.DataLoader
133134
for i, (X_batch, Y_batch) in enumerate(loader):
134135
# Predict on batch
135136
X_batch = X_batch.float().to(self.device)
136-
Y_batch_pred = network(X_batch).detach().cpu()
137+
Y_batch_pred = network(X_batch)
137138
if self.final_activation is not None:
138139
Y_batch_pred = self.final_activation(Y_batch_pred)
139-
Y_batch_preds.append(Y_batch_pred)
140+
Y_batch_preds.append(Y_batch_pred.detach().cpu())
140141

141142
return torch.cat(Y_batch_preds, 0)
142143

‎autoPyTorch/pipeline/components/setup/network_backbone/MLPBackbone.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ def get_hyperparameter_search_space(
8686
num_units: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="num_units",
8787
value_range=(10, 1024),
8888
default_value=200,
89+
log=True
8990
),
9091
dropout: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="dropout",
9192
value_range=(0, 0.8),
9293
default_value=0.5,
9394
),
9495
) -> ConfigurationSpace:
95-
9696
cs = ConfigurationSpace()
9797

9898
# The number of hidden layers the network will have.
@@ -113,6 +113,7 @@ def get_hyperparameter_search_space(
113113
default_value=num_units.default_value,
114114
log=num_units.log)
115115
n_units_hp = get_hyperparameter(n_units_search_space, UniformIntegerHyperparameter)
116+
116117
cs.add_hyperparameter(n_units_hp)
117118

118119
if i > int(min_mlp_layers):

‎autoPyTorch/pipeline/components/setup/network_backbone/ResNetBackbone.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ def get_hyperparameter_search_space(
118118
num_units: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="num_units",
119119
value_range=(10, 1024),
120120
default_value=200,
121+
log=True
121122
),
122123
activation: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="activation",
123124
value_range=tuple(_activations.keys()),
@@ -182,6 +183,7 @@ def get_hyperparameter_search_space(
182183
log=num_units.log)
183184
n_units_hp = get_hyperparameter(n_units_search_space, UniformIntegerHyperparameter)
184185

186+
185187
blocks_per_group_search_space = HyperparameterSearchSpace(hyperparameter='blocks_per_group_%d' % i,
186188
value_range=blocks_per_group.value_range,
187189
default_value=blocks_per_group.default_value,

‎autoPyTorch/pipeline/components/setup/network_backbone/ShapedMLPBackbone.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def get_hyperparameter_search_space(
9393
max_units: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="max_units",
9494
value_range=(10, 1024),
9595
default_value=200,
96-
),
96+
log=True),
9797
output_dim: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="output_dim",
9898
value_range=(10, 1024),
9999
default_value=200,
100-
),
100+
log=True),
101101
mlp_shape: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="mlp_shape",
102102
value_range=('funnel', 'long_funnel',
103103
'diamond', 'hexagon',
@@ -111,7 +111,6 @@ def get_hyperparameter_search_space(
111111
),
112112

113113
) -> ConfigurationSpace:
114-
115114
cs = ConfigurationSpace()
116115

117116
# The number of groups that will compose the resnet. That is,

‎autoPyTorch/pipeline/components/setup/network_backbone/ShapedResNetBackbone.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def get_hyperparameter_search_space( # type: ignore[override]
9393
output_dim: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="output_dim",
9494
value_range=(10, 1024),
9595
default_value=200,
96+
log=True
9697
),
9798
num_groups: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="num_groups",
9899
value_range=(1, 15),
@@ -116,7 +117,9 @@ def get_hyperparameter_search_space( # type: ignore[override]
116117
),
117118
max_units: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="max_units",
118119
value_range=(10, 1024),
119-
default_value=200),
120+
default_value=200,
121+
log=True
122+
),
120123
activation: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="activation",
121124
value_range=tuple(_activations.keys()),
122125
default_value=list(_activations.keys())[0]),

‎autoPyTorch/pipeline/components/setup/optimizer/AdamOptimizer.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,13 @@ def get_hyperparameter_search_space(
9191
value_range=(0.9, 0.9999),
9292
default_value=0.9),
9393
use_weight_decay: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="use_weight_decay",
94-
value_range=(True, False),
95-
default_value=True,
96-
),
94+
value_range=(True, False),
95+
default_value=True,
96+
),
9797
weight_decay: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="weight_decay",
98-
value_range=(0.0, 0.1),
99-
default_value=0.0),
98+
value_range=(1E-7, 0.1),
99+
default_value=1E-4,
100+
log=True),
100101
) -> ConfigurationSpace:
101102
cs = ConfigurationSpace()
102103

‎autoPyTorch/pipeline/components/setup/optimizer/AdamWOptimizer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ def get_hyperparameter_search_space(
9595
default_value=True,
9696
),
9797
weight_decay: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="weight_decay",
98-
value_range=(0.0, 0.1),
99-
default_value=0.0),
98+
value_range=(1E-7, 0.1),
99+
default_value=1E-4,
100+
log=True),
100101
) -> ConfigurationSpace:
101102
cs = ConfigurationSpace()
102103

‎autoPyTorch/pipeline/components/setup/optimizer/RMSpropOptimizer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ def get_hyperparameter_search_space(
9595
default_value=True,
9696
),
9797
weight_decay: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="weight_decay",
98-
value_range=(0.0, 0.1),
99-
default_value=0.0),
98+
value_range=(1E-7, 0.1),
99+
default_value=1E-4,
100+
log=True),
100101
momentum: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="momentum",
101102
value_range=(0.0, 0.99),
102103
default_value=0.0),
@@ -107,7 +108,6 @@ def get_hyperparameter_search_space(
107108
add_hyperparameter(cs, lr, UniformFloatHyperparameter)
108109
add_hyperparameter(cs, alpha, UniformFloatHyperparameter)
109110
add_hyperparameter(cs, momentum, UniformFloatHyperparameter)
110-
111111
weight_decay = get_hyperparameter(weight_decay, UniformFloatHyperparameter)
112112
use_weight_decay = get_hyperparameter(use_weight_decay, CategoricalHyperparameter)
113113
cs.add_hyperparameters([use_weight_decay, weight_decay])

‎autoPyTorch/pipeline/components/setup/optimizer/SGDOptimizer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ def get_hyperparameter_search_space(
8686
default_value=True,
8787
),
8888
weight_decay: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="weight_decay",
89-
value_range=(0.0, 0.1),
90-
default_value=0.0),
89+
value_range=(1E-7, 0.1),
90+
default_value=1E-4,
91+
log=True),
9192
momentum: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="momentum",
9293
value_range=(0.0, 0.99),
9394
default_value=0.0),

‎autoPyTorch/pipeline/components/training/data_loader/base_data_loader.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,12 @@ def get_hyperparameter_search_space(
254254
dataset_properties: Optional[Dict] = None,
255255
batch_size: HyperparameterSearchSpace = HyperparameterSearchSpace(hyperparameter="batch_size",
256256
value_range=(32, 320),
257-
default_value=64)
257+
default_value=64,
258+
log=True)
258259
) -> ConfigurationSpace:
259260
cs = ConfigurationSpace()
260261
add_hyperparameter(cs, batch_size, UniformIntegerHyperparameter)
262+
261263
return cs
262264

263265
def __str__(self) -> str:

0 commit comments

Comments
 (0)