Skip to content

Commit efb1c66

Browse files
authored
Merge pull request #384 from autonomio/dev
v.0.6.3 to Master
2 parents 7ef7dfa + cd21b55 commit efb1c66

Some content is hidden

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

41 files changed

+667
-103
lines changed
Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
11
---
22
name: Bug Report
3-
about: something needs fixing
3+
about: I want to report something that is broken
44

55
---
66

7-
Thanks so much for coming here to raise an issue. Please take a moment to 'check' the below boxes:
7+
Thank you very much for reporting a bug on Talos. Before you do, please go through the below checklist carefully and make sure to prepare your bug report in a way that facilitates effective handling of the matter.
88

9-
- [ ] I'm up-to-date with the latest release:
10-
11-
pip install -U talos
9+
#### 1) Confirm the below
1210

13-
- [ ] I've confirmed that my Keras model works outside of Talos.
11+
- [ ] My Python version is 3.5 or higher
12+
- [ ] I have searched through the issues [Issues](https://github.com/autonomio/talos/issues) for a duplicate
13+
- [ ] I've tested that my Keras model works as a stand-alone
1414

15-
If you still have an error, please submit **complete trace** and a code with:
15+
#### 2) Include the output of:
1616

17-
- output of shape for x and y e.g. (212,12)
18-
- Talos params dictionary
19-
- The Keras model wired for Talos
20-
- Description of extra variables in the model
17+
`talos.__version__`
2118

22-
You can provide the code in pastebin / gist or any other format you like.
19+
#### 3) Explain clearly what you expect to happen
20+
21+
*A description of what you tried to do and what you thought should happen.*
22+
23+
#### 4) Explain what actually happened
24+
25+
*A description of the issue in Talos that you had identified*
26+
27+
#### 5) Provide a code-complete reference
28+
29+
- [ ] My bug report includes an input model
30+
- [ ] My bug report includes a parameter dictionary
31+
- [ ] My bug report includes a `Scan()` command
32+
- [ ] My bug report question includes a link to a sample of the data
33+
34+
NOTE: If the data is sensitive and can't be shared, [create dummy data](https://scikit-learn.org/stable/modules/classes.html#samples-generator) that mimics it.
35+
36+
**A self-contained Jupyter Notebook, Google Colab, or similar is highly preferred and will speed up helping you with your issue.**
2337

2438
-------------------------------------------------------------------------
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: Feature Request
3+
about: I want to suggest a new feature
4+
5+
---
6+
7+
Thanks a lot for suggesting a feature to Talos. Please take a moment to go through the below checklist to provide context in a way that makes it easy to take your request forward.
8+
9+
#### 1) I think Talos should add...
10+
11+
*A description of the feature with as much detail as you believe is valuable*
12+
13+
#### 2) Once implemented, I can see how this feature will...
14+
15+
*Explain how researchers will benefit from having this feature in Talos**
16+
17+
#### 3) I believe this feature is... (choose one)
18+
19+
- [ ] ...critically important
20+
- [ ] ...must have
21+
- [ ] ...nice to have
22+
23+
#### 4) Given the chance, I'd be happy to make a PR for this feature...
24+
25+
- [ ] ...definitely
26+
- [ ] ...possibly
27+
- [ ] ...unlikely
28+
29+
-------------------------------------------------------------------------
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Support
3+
about: I want to ask for support
4+
5+
---
6+
7+
First off, make sure to check your [support options](https://github.com/autonomio/talos#-how-to-get-support).
8+
9+
The preferred way to resolve usage related matters is through the [docs](https://autonomio.github.io/talos/#/) which are maintained up-to-date with the latest version of Talos.
10+
11+
If you do end up asking for support in a new issue, make sure to follow the below steps carefully.
12+
13+
#### 1) Confirm the below
14+
15+
- [ ] I have looked for an answer in the [Docs](https://autonomio.github.io/talos)
16+
- [ ] My Python version is 3.5 or higher
17+
- [ ] I have searched through the issues [Issues](https://github.com/autonomio/talos/issues) for a duplicate
18+
- [ ] I've tested that my Keras model works as a stand-alone
19+
20+
#### 2) Include the output of:
21+
22+
`talos.__version__`
23+
24+
#### 3) Explain clearly what you are trying to achieve
25+
26+
*A description of your specific use-case and what you hope to achieve with it*
27+
28+
#### 4) Explain what you have already tried
29+
30+
*An outline of the steps that you have already taken so far*
31+
32+
#### 5) Provide a code-complete reference
33+
34+
- [ ] My support question includes an input model
35+
- [ ] My support question includes a parameter dictionary
36+
- [ ] My support question includes a `Scan()` command
37+
- [ ] My support question includes a link to a sample of the data
38+
39+
NOTE: If the data is sensitive and can't be shared, [create dummy data](https://scikit-learn.org/stable/modules/classes.html#samples-generator) that mimics it.
40+
41+
**A self-contained Jupyter Notebook, Google Colab, or similar is highly preferred and will speed up helping you with your issue.**
42+
43+
-------------------------------------------------------------------------

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## You want to make a PR to Talos
2+
3+
Thanks so much :) First, please take a moment to carefully check through
4+
the below items:
5+
6+
- [ ] Changes have gone through actual use testing
7+
- [ ] [Docs](https://autonomio.github.io/talos) are updated where relevant
8+
- [ ] Code is [PEP8](https://www.python.org/dev/peps/pep-0008/)
9+
- [ ] All local tests have passed (run ./test.sh in /talos)
10+
- [ ] Travis tests have passed
11+
- [ ] Open a pull request
12+
- [ ] PR is to daily-dev branch
13+
14+
<hr>

PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/Examples_Generator.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NOTE: In this example we will be using the `SequenceGenerator()` available in Ta
1818

1919
### Loading Data
2020
```python
21-
x, y = ta.templates.datasets.iris()
21+
x_train, y_train, x_val, y_val = talos.templates.datasets.mnist()
2222
```
2323
`x` and `y` are expected to be either numpy arrays or lists of numpy arrays.
2424

@@ -28,7 +28,7 @@ x, y = ta.templates.datasets.iris()
2828
def mnist_model(x_train, y_train, x_val, y_val, params):
2929

3030
model = Sequential()
31-
model.add(Conv2D(32, kernel_size=(3, 3), activation=params['activation'], input_shape=input_shape))
31+
model.add(Conv2D(32, kernel_size=(3, 3), activation=params['activation'], input_shape=(28, 28, 1)))
3232
model.add(Flatten())
3333
model.add(Dense(128, activation=params['activation']))
3434
model.add(Dropout(params['dropout']))
@@ -41,11 +41,11 @@ def mnist_model(x_train, y_train, x_val, y_val, params):
4141
out = model.fit_generator(SequenceGenerator(x_train,
4242
y_train,
4343
batch_size=params['batch_size']),
44-
epochs=params['epochs'],
45-
validation_data=[x_val, y_val],
46-
callbacks=[],
47-
workers=4,
48-
verbose=0)
44+
epochs=params['epochs'],
45+
validation_data=[x_val, y_val],
46+
callbacks=[],
47+
workers=4,
48+
verbose=0)
4949

5050
return out, model
5151
```

docs/Examples_Generator_Code.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ x, y = ta.templates.datasets.iris()
1414
def mnist_model(x_train, y_train, x_val, y_val, params):
1515

1616
model = Sequential()
17-
model.add(Conv2D(32, kernel_size=(3, 3), activation=params['activation'], input_shape=input_shape))
17+
model.add(Conv2D(32, kernel_size=(3, 3), activation=params['activation'], input_shape=(28, 28, 1)))
1818
model.add(Flatten())
1919
model.add(Dense(128, activation=params['activation']))
2020
model.add(Dropout(params['dropout']))
@@ -27,11 +27,11 @@ def mnist_model(x_train, y_train, x_val, y_val, params):
2727
out = model.fit_generator(SequenceGenerator(x_train,
2828
y_train,
2929
batch_size=params['batch_size']),
30-
epochs=params['epochs'],
31-
validation_data=[x_val, y_val],
32-
callbacks=[],
33-
workers=4,
34-
verbose=0)
30+
epochs=params['epochs'],
31+
validation_data=[x_val, y_val],
32+
callbacks=[],
33+
workers=4,
34+
verbose=0)
3535

3636
return out, model
3737

docs/Monitoring.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,9 @@ Scan(print_params=True)
2828
Epoch-by-epoch training data is available during the experiment using the `ExperimentLogCallback`:
2929

3030
```python
31-
31+
model.fit(...
32+
callbacks=[talos.utils.ExperimentLogCallback('experiment_name', params)])
3233
```
34+
Here `params` is the params dictionary in the `Scan()` input model. Both
35+
`experiment_name` and `experiment_id` should match with the current experiment,
36+
as otherwise

docs/Scan.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Argument | Input | Description
1919
`y` | array or list of arrays | prediction outcome variable
2020
`params` | dict | the parameter dictionary
2121
`model` | function | the Keras model as a function
22-
`experiment_name` | str | Used for experiment log
22+
`experiment_name` | str | Used for creating the experiment logging folder
2323
`x_val` | array or list of arrays | validation data for x
2424
`y_val` | array or list of arrays | validation data for y
2525
`val_split` | float | validation data split ratio
@@ -38,7 +38,8 @@ Argument | Input | Description
3838
`minimize_loss` | bool | `reduction_metric` is a loss
3939
`disable_progress_bar` | bool | Disable live updating progress bar
4040
`print_params` | bool | Print each permutation hyperparameters
41-
`clear_tf_session` | bool | Clear backend session between permutations
41+
`clear_session` | bool | Clear backend session between permutations
42+
`save_weights` | bool | Save model weights (increases memory pressure for large models)
4243

4344
NOTE: `boolean_limit` will only work if its the last argument in `Scan()` and the following bracket is on a newline:
4445

docs/Templates.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ talos.templates.datasets.breast_cancer()
3030
- telco_churn
3131
- titanic
3232
- iris
33+
- mnist
3334

3435
<hr>
3536

0 commit comments

Comments
 (0)