Commit Graph

2414 Commits

Author SHA1 Message Date
Kyle Daruwalla
23f791e32b Add "during X phase" phrasing to testmode!/trainmode! docstring. 2020-03-01 12:49:30 -06:00
Kyle Daruwalla
35e460b044 Fixed broken @ref in docstring 2020-03-01 12:44:36 -06:00
Kyle Daruwalla
4cebf36361
Merge branch 'master' into feature/istraining 2020-03-01 12:32:15 -06:00
Kyle Daruwalla
c001d0f3c5 Added trainmode! and updated docs with warning 2020-03-01 12:30:41 -06:00
Kyle Daruwalla
568ecb1c97 Removed trainmode from tests 2020-02-29 16:25:18 -06:00
Kyle Daruwalla
5cbd2cecf2 Changed testmode! to return model 2020-02-29 16:09:59 -06:00
bors[bot]
77a7606dad
Merge #1051
1051: add DataLoader r=CarloLucibello a=CarloLucibello

Fix #450 

This adds a DataLoader type, largely adapted from the Knet one, therefore pinging @denizyuret to check if he is cool with this. Unfortunately, I cannot "unsee" his implementation, and in any case any reasonable alternative implementation will be pretty much similar I guess. 

This is an initial implementation to get things going, possibly in the future we will also want a distributed and out-of-memory option as the one implemented by @staticfloat here
https://github.com/FluxML/Metalhead.jl/blob/sf/training/training/ImageNet/dataset.jl



Co-authored-by: CarloLucibello <carlo.lucibello@gmail.com>
2020-02-29 19:27:27 +00:00
CarloLucibello
a1efc434c2 fix typo 2020-02-29 19:40:44 +01:00
CarloLucibello
a72258ea2a fix rebase 2020-02-29 18:55:49 +01:00
CarloLucibello
97141e8c98 improve docstring 2020-02-29 18:51:00 +01:00
CarloLucibello
487002878e restrict train! special casing 2020-02-29 18:51:00 +01:00
CarloLucibello
b6c79b38b4 add DataLoader
special case train! for the unsupervised data iterator
2020-02-29 18:50:59 +01:00
bors[bot]
37af9fb15c
Merge #1023
1023: Feature: Added Boston Housing Dataset r=CarloLucibello a=pranjaldatta

[Boston Housing Dataset](https://archive.ics.uci.edu/ml/machine-learning-databases/housing/) is one of the most common datasets that are used by beginners. It is as popular as other datasets like Iris etc. Hence, it feels only natural that this dataset is a part of Flux.

Added src/data/housing.jl: code for downloading and loading the dataset
Edited src/data/Data.jl: To include and export housing.jl
Edited test/data.jl: Added test for the dataset.

*All tests in test/data.jl are passing*

Co-authored-by: pranjaldatta <pranjaldatta99@gmail.com>
Co-authored-by: Pranjal  Datta <pranjaldatta99@gmail.com>
2020-02-29 15:54:34 +00:00
bors[bot]
81a55a0c9e
Merge #1041
1041: add NNlib docs + misc docs improvements r=CarloLucibello a=CarloLucibello

Partially addressing https://github.com/FluxML/NNlib.jl/issues/137.

Also, I'm leaving out the `σ`  activation and using its alias `sigmoid`, since `σ` conveys little information and it is also used to denote a generic activation in the Dense layer. I think we should deprecate `σ` in NNlib, has this been discussed already?

In an ideal world, before merging this, we should get NNlib to either unexport or add docs to its undocumented exports  

Co-authored-by: Carlo Lucibello <carlo.lucibello@gmail.com>
2020-02-29 10:24:39 +00:00
Carlo Lucibello
425fcdbe69 NNlib docs + misc docs improvements 2020-02-29 11:14:48 +01:00
bors[bot]
2dd23574c0
Merge #998
998: test restructure on the GPU r=CarloLucibello a=ChrisRackauckas

Requires https://github.com/FluxML/Zygote.jl/pull/474 to pass

Co-authored-by: Chris Rackauckas <accounts@chrisrackauckas.com>
2020-02-29 09:08:11 +00:00
Dhairya Gandhi
35f6998be7 pkg up 2020-02-27 22:19:06 +05:30
Dhairya Gandhi
a121742f9c pkg up 2020-02-27 13:56:05 +05:30
bors[bot]
531d3d4d8b
Merge #1052
1052: update docs and export update! r=dhairyagandhi96 a=CarloLucibello

Fix #951 

Co-authored-by: CarloLucibello <carlo.lucibello@gmail.com>
2020-02-26 19:33:53 +00:00
CarloLucibello
759fe9df2f update docs and export update! 2020-02-26 20:27:39 +01:00
Pranjal Datta
90bb3205f4
Merge pull request #2 from pranjaldatta/housing_added
added newlines  at end of file
2020-02-26 15:08:37 +05:30
pranjaldatta
569021a9f1 added newlines at end of file 2020-02-26 15:05:23 +05:30
Kyle Daruwalla
ba5259a269 Added docs on testmode! 2020-02-25 13:53:49 -06:00
bors[bot]
55616afc11
Merge #960
960: Added utility function outdims to compute output dimensions of a layer r=dhairyagandhi96 a=darsnack

Based on Slack chatter, I added a utility function, `outdims`, that computes the output dimensions for given input dimensions.

Example
```julia
layer = Conv((3, 3), 3 => 16)
outdims(layer, (10, 10)) # returns (8, 8)
```

Co-authored-by: Kyle Daruwalla <daruwalla@wisc.edu>
2020-02-25 17:40:05 +00:00
Dhairya Gandhi
7e58766467
Merge pull request #1047 from MotJuMi/master
Edit description of convolutional layer
2020-02-25 15:39:23 +05:30
Bulat Suleymanov
db4eaf254b
Edit description of convolutional layer 2020-02-24 13:16:51 +05:00
Dhairya Gandhi
34ceed5c1f
Merge pull request #1046 from ianshmean/patch-1
Bump Colors compat to include 0.10, 0.11
2020-02-24 10:41:49 +05:30
Ian Butterworth
6ced7e1ecf
expand Colors compat 2020-02-23 13:42:11 -05:00
Kyle Daruwalla
924b8f49ec Updated to place function definitions in the appropriate places. 2020-02-21 15:10:28 -06:00
Kyle Daruwalla
7c12af065a Added testmode! functionality back to normalization layers. 2020-02-21 14:35:10 -06:00
Kyle Daruwalla
f5b9cf659c Updated docs to specify exactly what layers support outdims 2020-02-20 23:38:56 -06:00
Dhairya Gandhi
88b0c65d72
Merge pull request #1035 from matsueushi/remove_get_macro
Remove get! macro
2020-02-20 12:58:16 +05:30
Dhairya Gandhi
8f7a0bb264
Merge pull request #1030 from JuliaTagBot/master
Install TagBot as a GitHub Action
2020-02-19 21:47:31 +05:30
Dhairya Gandhi
a38af748e5
Merge pull request #1037 from heliosdrm/heliosdrm-patch-1
update compat to Juno 0.8
2020-02-19 21:46:33 +05:30
bors[bot]
e4a84c120f
Merge #1021
1021: nograd for onecold, onehot, onehotbatch r=MikeInnes a=CarloLucibello

fixes #1020 

Co-authored-by: CarloLucibello <carlo.lucibello@gmail.com>
2020-02-17 14:12:48 +00:00
Helios De Rosario
9bb388d953
update Juno compat 2020-02-16 18:29:18 +01:00
Helios De Rosario
6f0710d364
Merge pull request #1 from FluxML/master
update to origin
2020-02-16 18:27:35 +01:00
Viral B. Shah
0b8d1574bf
Merge pull request #984 from aminya/CompatHelper
Adding CompatHelper
2020-02-16 09:44:09 -05:00
matsueushi
6ea7b95384 Remove unused using 2020-02-15 20:06:15 -05:00
bors[bot]
fe85a38d78 Merge #1032
1032: Remove outdated reference to truncate! r=dhairyagandhi96 a=mcognetta



Co-authored-by: Marco <mcognetta@users.noreply.github.com>
2020-02-10 08:30:15 +00:00
Marco
ae0455517a Remove outdated reference to truncate! 2020-02-10 00:03:11 -08:00
Kyle Daruwalla
c37fc3cfa6 Recommitting to trigger build 2020-02-09 19:45:04 -06:00
Julia TagBot
d7b20d1a78 Install TagBot as a GitHub Action 2020-02-08 20:02:52 +07:00
Pranjal Datta
d1522deee4
Merge pull request #1 from pranjaldatta/housing_added
Feature: Added Boston Housing Dataset
2020-02-07 04:01:00 +05:30
pranjaldatta
197a1a70c0 added BostonHousing dataset and testing 2020-02-07 03:47:19 +05:30
CarloLucibello
6499344af3 nograd for onecold, onehot, onehotbatch 2020-02-06 15:41:46 +01:00
bors[bot]
60043fa2aa
Merge #1013
1013: Adapt to GPUArrays/CuArrays changes r=dhairyagandhi96 a=maleadt

Changes in response to a29df67184 and https://github.com/JuliaGPU/CuArrays.jl/pull/576. I suppose the next CuArrays release will need to be breaking because of this.

Maybe the `crossentropy` signature needs to be adjusted to support integer vectors, but I'll leave that decision up to Flux developers. This at least is the quick fix to get the tests passing again.

Co-authored-by: Tim Besard <tim.besard@gmail.com>
2020-02-03 16:29:48 +00:00
Dhairya Gandhi
ddc2c20e68
Merge pull request #994 from FluxML/ox/doccustomtraining
Add custom training loops to docs
2020-02-01 11:13:54 +05:30
Tim Besard
e2c2ec5575 Don't invoke GPU crossentropy with integers.
Broadcasting log on integers does not work.
2020-01-31 08:22:54 +01:00
Tim Besard
e66a7f130f Don't compare CPU with GPU arrays. 2020-01-31 08:22:21 +01:00