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

replace Hparams by init args #1896

Merged
merged 101 commits into from
May 24, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
1fced53
remove the need for hparams
williamFalcon May 19, 2020
7fe5f13
remove the need for hparams
williamFalcon May 19, 2020
0283055
remove the need for hparams
williamFalcon May 19, 2020
599c9ad
remove the need for hparams
williamFalcon May 19, 2020
32c7435
replace self.hparams
williamFalcon May 19, 2020
29d3e0a
replace self.hparams
williamFalcon May 19, 2020
f508424
replace self.hparams
williamFalcon May 19, 2020
28b85bd
replace self.hparams
williamFalcon May 19, 2020
355eb7a
replace self.hparams
williamFalcon May 19, 2020
5cc272a
replace self.hparams
williamFalcon May 19, 2020
a5bcd1c
replace self.hparams
williamFalcon May 19, 2020
a4a7407
replace self.hparams
williamFalcon May 19, 2020
8f7e8a2
replace self.hparams
williamFalcon May 19, 2020
b1cd0b5
replace self.hparams
williamFalcon May 19, 2020
e97237e
replace self.hparams
williamFalcon May 19, 2020
a2f6cb5
replace self.hparams
williamFalcon May 19, 2020
9216d28
replace self.hparams
williamFalcon May 19, 2020
7cbc1b2
replace self.hparams
williamFalcon May 19, 2020
137ae13
replace self.hparams
williamFalcon May 19, 2020
b6a9336
replace self.hparams
williamFalcon May 19, 2020
6ea138c
replace self.hparams
williamFalcon May 19, 2020
485ce20
replace self.hparams
williamFalcon May 19, 2020
14dab1b
replace self.hparams
williamFalcon May 19, 2020
268277a
replace self.hparams
williamFalcon May 19, 2020
2111e4b
replace self.hparams
williamFalcon May 19, 2020
07a1c00
replace self.hparams
williamFalcon May 19, 2020
90a1226
replace self.hparams
williamFalcon May 19, 2020
4429d22
replace self.hparams
williamFalcon May 19, 2020
6060a02
replace self.hparams
williamFalcon May 19, 2020
6f856df
replace self.hparams
williamFalcon May 19, 2020
da385fe
replace self.hparams
williamFalcon May 19, 2020
065226d
replace self.hparams
williamFalcon May 19, 2020
f634a8e
replace self.hparams
williamFalcon May 19, 2020
34055b5
replace self.hparams
williamFalcon May 19, 2020
e05c11b
replace self.hparams
williamFalcon May 19, 2020
0937108
replace self.hparams
williamFalcon May 19, 2020
f6587ce
fixed
williamFalcon May 19, 2020
0303695
fixed
williamFalcon May 19, 2020
2b0ceb8
fixed
williamFalcon May 19, 2020
e226c88
fixed
williamFalcon May 19, 2020
ec00520
fixed
williamFalcon May 19, 2020
72793c3
fixed
williamFalcon May 19, 2020
840265d
fixed
williamFalcon May 19, 2020
4bb28fa
fixed
williamFalcon May 19, 2020
91569a8
fixed
williamFalcon May 19, 2020
509036e
fixed
williamFalcon May 19, 2020
a99ffb7
fixed
williamFalcon May 19, 2020
5c3ea20
fixed
williamFalcon May 19, 2020
9d08be3
fixed
williamFalcon May 19, 2020
0452418
fixed
williamFalcon May 19, 2020
0b5557f
finished moco
williamFalcon May 20, 2020
6cd5ea9
basic
williamFalcon May 20, 2020
ed1090c
testing
Borda May 20, 2020
295654e
todo
Borda May 20, 2020
1465a03
recurse
Borda May 20, 2020
91ab93e
hparams
Borda May 20, 2020
0519723
persist
Borda May 20, 2020
a19df1d
hparams
Borda May 20, 2020
1f87263
chlog
Borda May 20, 2020
f35eab0
tests
Borda May 20, 2020
3555e83
tests
Borda May 20, 2020
2a1b2dc
tests
Borda May 20, 2020
3c79ae3
tests
Borda May 21, 2020
5767188
tests
Borda May 21, 2020
cbb00b5
tests
Borda May 21, 2020
acc020f
review
Borda May 21, 2020
b3b6236
saving
Borda May 21, 2020
b97e0b1
tests
Borda May 22, 2020
5a4740a
tests
Borda May 22, 2020
2a6be20
tests
Borda May 22, 2020
e80b006
docs
Borda May 22, 2020
e50b78f
finished moco
williamFalcon May 22, 2020
fd7be0d
hparams
Borda May 22, 2020
c319528
review
Borda May 22, 2020
b313477
Apply suggestions from code review
Borda May 22, 2020
488d18a
hparams
Borda May 22, 2020
d24b78e
overwrite
Borda May 22, 2020
0d7ee37
transform
Borda May 22, 2020
fb7898a
transform
Borda May 22, 2020
3d8a3db
transform
Borda May 22, 2020
db6f943
transform
Borda May 23, 2020
66717da
cleaning
Borda May 23, 2020
088c3bd
cleaning
Borda May 23, 2020
dfd3a26
tests
Borda May 23, 2020
72f4cd0
examples
Borda May 23, 2020
2a8872b
examples
Borda May 23, 2020
5fe6f02
examples
Borda May 23, 2020
bad8d11
Apply suggestions from code review
Borda May 24, 2020
55b58f7
chp key
Borda May 24, 2020
5383014
tests
Borda May 24, 2020
1fd8cce
Apply suggestions from code review
Borda May 24, 2020
ab3be59
class
Borda May 24, 2020
10ca1a8
Merge branch 'no_hparams' of https://github.com/PyTorchLightning/pyto…
Borda May 24, 2020
8f57274
updated docs
williamFalcon May 24, 2020
20ad2ca
updated docs
williamFalcon May 24, 2020
f683160
updated docs
williamFalcon May 24, 2020
db5d1bf
updated docs
williamFalcon May 24, 2020
6af55e7
save
Borda May 24, 2020
04e8e67
wip
Borda May 24, 2020
a432f6e
fix
Borda May 24, 2020
2892e5a
flake8
Borda May 24, 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
3 changes: 2 additions & 1 deletion tests/base/model_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ def __init__(self,
self.b2 = b2

# if you specify an example input, the summary will show input/output for each layer
self.example_input_array = torch.rand(5, 28 * 28)
# TODO: to be fixed in #1773
#self.example_input_array = torch.rand(5, 28 * 28)

# build model
self.__build_model()
Expand Down
7 changes: 4 additions & 3 deletions tests/models/test_hparams.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@


class SubClassEvalModel(EvalModelTemplate):
any_other_loss = torch.nn.CrossEntropyLoss()
Borda marked this conversation as resolved.
Show resolved Hide resolved

def __init__(self, *args, subclass_arg=1200, **kwargs):
Borda marked this conversation as resolved.
Show resolved Hide resolved
super().__init__(*args, **kwargs)
Expand Down Expand Up @@ -56,13 +57,13 @@ def test_collect_init_arguments(tmpdir, cls):
assert CHECKPOINT_KEY_MODULE_ARGS in raw_checkpoint
assert raw_checkpoint[CHECKPOINT_KEY_MODULE_ARGS]['batch_size'] == 179

if isinstance(model, AggSubClassEvalModel):
assert isinstance(model.my_loss, torch.nn.CrossEntropyLoss)

# verify that model loads correctly
model = cls.load_from_checkpoint(raw_checkpoint_path)
assert model.batch_size == 179

if isinstance(model, AggSubClassEvalModel):
assert isinstance(model.my_loss, torch.nn.CrossEntropyLoss)

# verify that we can overwrite whatever we want
model = cls.load_from_checkpoint(raw_checkpoint_path, batch_size=99)
assert model.batch_size == 99