Resolve conflicts

Author: Saransh-cpp

.github/workflows/clean_preview.yml

@@ -0,0 +1,27 @@
+# from https://github.com/CliMA/ClimaTimeSteppers.jl
+name: Doc Preview Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  doc-preview-cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout gh-pages branch
+        uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+      - name: Delete preview and history + push changes
+        run: |
+            if [ -d "previews/PR$PRNUM" ]; then
+              git config user.name "Documenter.jl"
+              git config user.email "[email protected]"
+              git rm -rf "previews/PR$PRNUM"
+              git commit -m "delete preview"
+              git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
+              git push --force origin gh-pages-new:gh-pages
+            fi
+        env:
+            PRNUM: ${{ github.event.number }}

.github/workflows/pr_comment.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create PR comment
-        if: github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name && ${{ github.event.label.name == 'documentation' }} # if this is a pull request build AND the pull request is NOT made from a fork
+        if: github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name && github.event.label.name == 'documentation' # if this is a pull request build AND the pull request is NOT made from a fork
         uses: thollander/actions-comment-pull-request@71efef56b184328c7ef1f213577c3a90edaa4aff
         with:
           message: 'Once the build has completed, you can preview any updated documentation at this URL: https://fluxml.ai/Flux.jl/previews/PR${{ github.event.number }}/ in ~20 minutes'

docs/src/saving.md

@@ -55,7 +55,9 @@ versions of Flux).
     Saving models this way will only store the trainable parameters which
     will result in incorrect behavior for layers like `BatchNorm`.
 
-```jldoctest saving
+```julia
+julia> using Flux
+
 julia> model = Chain(Dense(10 => 5,relu),Dense(5 => 2),softmax)
 Chain(
   Dense(10 => 5, relu),                 # 55 parameters
@@ -134,4 +136,3 @@ exactly where you left off. BSON is smart enough to [cache values](https://githu
 opt = ADAM()
 @save "model-$(now()).bson" model opt
 ```
-

src/layers/basic.jl

@@ -44,7 +44,7 @@ function Chain(; kw...)
 end
 
 @forward Chain.layers Base.getindex, Base.length, Base.first, Base.last,
-  Base.iterate, Base.lastindex, Base.keys
+  Base.iterate, Base.lastindex, Base.keys, Base.firstindex
 
 @functor Chain
 
@@ -68,7 +68,6 @@ end
 Base.getindex(c::Chain, i::AbstractArray) = Chain(c.layers[i])
 Base.getindex(c::Chain{<:NamedTuple}, i::AbstractArray) =
   Chain(NamedTuple{Base.keys(c)[i]}(Tuple(c.layers)[i]))
-
 function Base.show(io::IO, c::Chain)
   print(io, "Chain(")
   _show_layers(io, c.layers)

src/layers/recurrent.jl

@@ -83,7 +83,7 @@ rnn.state = hidden(rnn.cell)
 reset!(m::Recur) = (m.state = m.cell.state0)
 reset!(m) = foreach(reset!, functor(m)[1])
 
-flip(f, xs) = reverse(f.(reverse(xs)))
+flip(f, xs) = reverse([f(x) for x in reverse(xs)])
 
 function (m::Recur)(x::AbstractArray{T, 3}) where T
   h = [m(x_t) for x_t in eachslice(x, dims=3)]

src/optimise/train.jl

@@ -112,7 +112,8 @@ Multiple callbacks can be passed to `cb` as array.
 """
 function train!(loss, ps::Params, data, opt::AbstractOptimiser; cb = () -> ())
   cb = runall(cb)
-  n = (Base.IteratorSize(typeof(data)) == Base.HasLength()) ? length(data) : 0
+  itrsz = Base.IteratorSize(typeof(data))
+  n = (itrsz == Base.HasLength()) || (itrsz == Base.HasShape{1}()) ? length(data) : 0
   @withprogress for (i, d) in enumerate(data)
     try
       gs = gradient(ps) do
@@ -129,7 +130,7 @@ function train!(loss, ps::Params, data, opt::AbstractOptimiser; cb = () -> ())
         rethrow(ex)
       end
     end
-    @logprogress i / n
+    @logprogress iszero(n) ? nothing : i / n
   end
 end
 

test/layers/basic.jl

@@ -31,6 +31,10 @@ import Flux: activations
     @test_throws ArgumentError Chain(layers = Dense(10, 10), two = identity) # reserved name
 
     @test_nowarn Chain([Dense(10, 5, σ), Dense(5, 2)])(randn(Float32, 10))  # vector of layers
+    
+    c = Chain(Dense(10, 5, σ), Dense(5, 2), Dense(2, 1, relu))
+    @test c[1] == c[begin]
+    @test c[3] == c[end]
   end
 
   @testset "Activations" begin