Merge pull request #2194 from jonathanBieler/master

fixed BSON loadmodel! documentation and added a test case

Author: ToucheSir

Project.toml

@@ -48,6 +48,7 @@ FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
 
 [targets]
-test = ["Test", "Documenter", "IterTools", "LinearAlgebra", "FillArrays", "ComponentArrays"]
+test = ["Test", "Documenter", "IterTools", "LinearAlgebra", "FillArrays", "ComponentArrays", "BSON"]

docs/src/saving.md

@@ -76,13 +76,13 @@ This can be done as
 
 ```julia
 using Flux: loadmodel!
-using BSON: @load
+using BSON
 
 # some predefined model
 model = Chain(Dense(10 => 5, relu), Dense(5 => 2), softmax)
 
 # load one model into another
-model = loadmodel!(model, @load("mymodel.bson"))
+model = loadmodel!(model, BSON.load("mymodel.bson")[:model])
 ```
 
 This ensures that the model loaded from `"mymodel.bson"` matches the structure of `model`. [`Flux.loadmodel!`](@ref) is also convenient for copying parameters between models in memory.

test/utils.jl

@@ -8,6 +8,7 @@ using StatsBase: var, std
 using Statistics, LinearAlgebra
 using Random
 using Test
+using BSON
 
 @testset "Throttle" begin
   @testset "default behaviour" begin
@@ -560,6 +561,17 @@ end
     end
   end
 
+  @testset "loadmodel!(dst, src) with BSON" begin
+    m1 = Chain(Dense(Float32[1 2; 3 4; 5 6], Float32[7, 8, 9]), Dense(3 => 1))
+    m2 = Chain(Dense(Float32[0 0; 0 0; 0 0], Float32[0, 0, 0]), Dense(3 => 1))
+    @test m1[1].weight != m2[1].weight
+    mktempdir() do dir
+      BSON.@save joinpath(dir, "test.bson") m1
+      m2 = Flux.loadmodel!(m2, BSON.load(joinpath(dir, "test.bson"))[:m1])
+      @test m1[1].weight == m2[1].weight
+    end
+  end
+
   @testset "destructure" begin
     import Flux: destructure
     @testset "Bias type $bt" for bt in (zeros, nobias)