Skip to content
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.

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

Network #28

Merged
merged 42 commits into from
Dec 5, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
572f7c0
added temporal convolutional networks
bastiscode Sep 16, 2020
e97e353
added inception time network
bastiscode Sep 16, 2020
5674361
splitting networks into backbones and heads, initial commit
bastiscode Sep 23, 2020
5c76141
added temporal convolutional networks
bastiscode Sep 16, 2020
ea02c9a
added inception time network
bastiscode Sep 16, 2020
3b05510
splitting networks into backbones and heads, initial commit
bastiscode Sep 23, 2020
c8a6d59
Merge branch 'network' of github.com:LMZimmer/Auto-PyTorch_refactor i…
bastiscode Oct 21, 2020
306ee5f
backbones and heads are now handled by a BackboneHeadNet, leaving the…
bastiscode Oct 30, 2020
5c6e4fb
added temporal convolutional networks
bastiscode Sep 16, 2020
5803e41
added inception time network
bastiscode Sep 16, 2020
5ee3da3
splitting networks into backbones and heads, initial commit
bastiscode Sep 23, 2020
d5cdf70
backbones and heads are now handled by a BackboneHeadNet, leaving the…
bastiscode Oct 30, 2020
33849d0
Merge branch 'network' of github.com:LMZimmer/Auto-PyTorch_refactor i…
bastiscode Oct 30, 2020
35e3333
added image networks, added unittest, fixed bugs in networks and in b…
bastiscode Nov 2, 2020
93bc2c6
fixed minor issues in BackboneHeadNet
bastiscode Nov 5, 2020
e7db224
fixed minor issues in time_series.py
bastiscode Nov 5, 2020
32166c8
renamed ConvNetBackbone to ConvImageNetBackbone, added activation fun…
bastiscode Nov 5, 2020
2b853ff
merge development into network
bastiscode Nov 9, 2020
18f2060
added new fit requirements to base network
bastiscode Nov 9, 2020
313eaec
moved replacing of prefixes in a config dict to common utilities
bastiscode Nov 9, 2020
b0b0feb
added bn_args to image networks
bastiscode Nov 9, 2020
4d0c9d0
improved docstrings and added configspace to fully connected head
bastiscode Nov 9, 2020
565f8ef
added configspace to fully convolutional head
bastiscode Nov 9, 2020
ffa6cca
fixed flake8
bastiscode Nov 9, 2020
61888ac
changed fit requirement types in base network
bastiscode Dec 1, 2020
1cebc74
Merge branch 'development' into network
bastiscode Dec 2, 2020
fd5c47f
fixed missing numbers import
bastiscode Dec 2, 2020
dce8c56
changed fit requirement type to tuple
bastiscode Dec 2, 2020
533b17c
Fix flake8
Dec 4, 2020
f9d38fe
Fix mypi issues
Dec 4, 2020
534075e
Resolve conflicts
Dec 4, 2020
3b7ead0
Fix flake8
Dec 4, 2020
f3cf65c
Merge branch 'development' into network
LMZimmer Dec 4, 2020
d43e1c5
Change prints to logger
Dec 4, 2020
3071903
Merge branch 'network' of https://github.com/LMZimmer/Auto-PyTorch_re…
Dec 4, 2020
2a562e8
Remove test output
Dec 4, 2020
6da2187
Adapt gitignore
Dec 4, 2020
ab6d7b2
Infer input and output shape
Dec 4, 2020
3c32dbf
Fix unittests
Dec 4, 2020
9f1a1a3
Fix unittests
Dec 5, 2020
7868bb1
Modify .gitignore
Dec 5, 2020
5e81f71
Add ensemble data
Dec 5, 2020
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
Prev Previous commit
Next Next commit
Change prints to logger
  • Loading branch information
zimmerl committed Dec 4, 2020
commit d43e1c56a5318cfce3fa1e05a5ec8696aed3b935
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import logging
import math
from collections import OrderedDict
from typing import Any, Dict, List, Optional, Tuple

Expand Down Expand Up @@ -56,7 +58,7 @@ def build_backbone(self, input_shape: Tuple[int, ...]) -> nn.Module:
for i in range(2, self.config["num_layers"] + 1):
cw, ch = self._get_layer_size(cw, ch)
if cw == 0 or ch == 0:
print("> reduce network size due to too small layers.")
logging.info("> reduce network size due to too small layers.")
break
self._add_layer(layers, init_filter, init_filter * 2)
init_filter *= 2
Expand Down Expand Up @@ -189,7 +191,6 @@ def build_backbone(self, input_shape: Tuple[int, ...]) -> nn.Module:

image_size, min_image_size = min(iw, ih), 1

import math
division_steps = math.floor(math.log2(image_size) - math.log2(min_image_size) - 1e-5) + 1

if division_steps > len(block_config) + 1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def forward(self, x: torch.Tensor) -> torch.Tensor:
class _TemporalConvNet(nn.Module):
def __init__(self, num_inputs: int, num_channels: List[int], kernel_size: int = 2, dropout: float = 0.2):
super(_TemporalConvNet, self).__init__()
layers = []
layers: List[Any] = []
num_levels = len(num_channels)
for i in range(num_levels):
dilation_size = 2 ** i
Expand Down
3 changes: 0 additions & 3 deletions test/test_pipeline/components/test_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,6 @@ def test_backbone_head_net(self):
# test 10 random configurations
for i in range(10):
config = cs.sample_configuration()
print(
f'Testing with backbone={config["BackboneHeadNet:backbone"]} '
f'and head={config["BackboneHeadNet:head"]}')
network_choice.set_hyperparameters(config)
network_choice.fit(X={"input_shape": input_shape, "output_shape": output_shape}, y=None)
self.assertNotEqual(network_choice.choice.network, None)
Expand Down