From 18ea4803888c5b3c253c490853a403153bbd1a5d Mon Sep 17 00:00:00 2001 From: Carlo Lucibello Date: Mon, 6 Apr 2020 09:26:38 +0200 Subject: [PATCH 1/4] fix tests and new version --- Manifest.toml | 85 ++++++++++++++------------------------------------- Project.toml | 4 +-- test/data.jl | 11 ++++--- 3 files changed, 31 insertions(+), 69 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 2ba02f84..bc74cb6e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -20,9 +20,9 @@ version = "1.0.1" [[ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "bc779df8d73be70e4e05a63727d3a4dfb4c52b1f" +git-tree-sha1 = "41956a49a8a4fefa1bf6664bca4a3035aba4c3a0" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "0.1.5" +version = "0.2.3" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -52,9 +52,9 @@ version = "6.2.2" [[CUDAnative]] deps = ["Adapt", "BinaryProvider", "CEnum", "CUDAapi", "CUDAdrv", "Cthulhu", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "MacroTools", "Pkg", "Printf", "TimerOutputs"] -git-tree-sha1 = "4168c40ca3ff3475bc29a20a09ab7b910c4b8ef0" +git-tree-sha1 = "d1fc99635d0002c8a819b78cb1f441eb44310725" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "3.0.1" +version = "3.0.2" [[CodeTracking]] deps = ["InteractiveUtils", "UUIDs"] @@ -86,23 +86,17 @@ git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.2.0" -[[Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "2.2.0" - [[CompilerSupportLibraries_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "067567a322fe466c5ec8d01413eee7127bd11699" +git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612" uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.1+0" +version = "0.3.3+0" [[Cthulhu]] -deps = ["CodeTracking", "InteractiveUtils", "TerminalMenus", "Unicode"] -git-tree-sha1 = "5e0f928ccaab1fa2911fc4e204e8a6f5b0213eaf" +deps = ["CodeTracking", "InteractiveUtils", "REPL", "Unicode"] +git-tree-sha1 = "484790098c85c26f8e59051f8ff1a0745c034a7d" uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" -version = "1.0.0" +version = "1.0.1" [[CuArrays]] deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"] @@ -117,9 +111,9 @@ version = "1.1.0" [[DataStructures]] deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "5a431d46abf2ef2a4d5d00bd0ae61f651cf854c8" +git-tree-sha1 = "73eb18320fe3ba58790c8b8f6f89420f0a622773" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.10" +version = "0.17.11" [[Dates]] deps = ["Printf"] @@ -145,23 +139,11 @@ version = "1.0.1" deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[FFTW]] -deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"] -git-tree-sha1 = "109d82fa4b00429f9afcce873e9f746f11f018d3" -uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.2.0" - -[[FFTW_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "ddb57f4cf125243b4aa4908c94d73a805f3cbf2c" -uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+4" - [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "85c6b57e2680fa28d5c8adc798967377646fbf66" +git-tree-sha1 = "51cc2f9bc4eb9c6c0e81ec2f779d1085583cc956" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.8.5" +version = "0.8.7" [[FixedPointNumbers]] git-tree-sha1 = "3ba9ea634d4c8b289d590403b4a06f8e227a6238" @@ -170,9 +152,9 @@ version = "0.8.0" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c" +git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.9" +version = "0.10.10" [[GPUArrays]] deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] @@ -186,12 +168,6 @@ git-tree-sha1 = "1a4355e4b5b50be2311ebb644f34f3306dbd0410" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" version = "0.3.1" -[[IntelOpenMP_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "fb8e1c7a5594ba56f9011310790e03b5384998d6" -uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2018.0.3+0" - [[InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" @@ -209,6 +185,7 @@ uuid = "929cbde3-209d-540e-8aea-75f648917ca0" version = "1.3.4" [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -221,12 +198,6 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[MKL_jll]] -deps = ["IntelOpenMP_jll", "Libdl", "Pkg"] -git-tree-sha1 = "720629cc8cbd12c146ca01b661fd1a6cf66e2ff4" -uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2019.0.117+2" - [[MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a" @@ -313,10 +284,6 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -348,15 +315,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "19bfcb46245f69ff4013b3df3b977a289852c3a1" +git-tree-sha1 = "a6102b1f364befdb05746f386b67c6b7e3262c45" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.32.2" - -[[TerminalMenus]] -deps = ["Compat", "REPL", "Test"] -git-tree-sha1 = "9ae6ed0c94eee4d898e049820942af21daf15efc" -uuid = "dc548174-15c3-5faf-af27-7997cfbde655" -version = "0.1.0" +version = "0.33.0" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -389,15 +350,15 @@ version = "0.9.1" [[Zlib_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "fd36a6739e256527287c5444960d0266712cd49e" +git-tree-sha1 = "2f6c3e15e20e036ee0a0965879b31442b7ec50fa" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+8" +version = "1.2.11+9" [[Zygote]] -deps = ["ArrayLayouts", "DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "9688fce24bd8a9468fed12f3d5206099a39054dc" +deps = ["AbstractFFTs", "ArrayLayouts", "DiffRules", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] +git-tree-sha1 = "1ccbfbe8930376e31752b812daa2532c723dc332" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.4.12" +version = "0.4.13" [[ZygoteRules]] deps = ["MacroTools"] diff --git a/Project.toml b/Project.toml index e927e14a..6fd5834c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Flux" uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.10.3" +version = "0.10.4" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" @@ -35,7 +35,7 @@ NNlib = "0.6" Reexport = "0.2" StatsBase = "0" ZipFile = "0.7, 0.8, 0.9" -Zygote = "0.4" +Zygote = "0.4.13" julia = "1" [extras] diff --git a/test/data.jl b/test/data.jl index c7a8fdfd..b5faf359 100644 --- a/test/data.jl +++ b/test/data.jl @@ -76,10 +76,11 @@ end @test size(Iris.labels()) == (150,) end -@testset "Housing" begin - @test Housing.features() isa Matrix - @test size(Housing.features()) == (506, 13) - @test Housing.targets() isa Array{Float64} - @test size(Housing.targets()) == (506, 1) +@testset "Housing" begin + @test_broken Housing.features() isa Matrix # test broken due to SSL certifate expiration problem + @test_broken size(Housing.features()) == (506, 13) + + @test_broken Housing.targets() isa Array{Float64} + @test_broken size(Housing.targets()) == (506, 1) end From f9e97104466503c3b213347f2bfbc347f02589ff Mon Sep 17 00:00:00 2001 From: Carlo Lucibello Date: Mon, 6 Apr 2020 09:35:34 +0200 Subject: [PATCH 2/4] update travis and bound julia version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6fd5834c..1883d974 100644 --- a/Project.toml +++ b/Project.toml @@ -36,7 +36,7 @@ Reexport = "0.2" StatsBase = "0" ZipFile = "0.7, 0.8, 0.9" Zygote = "0.4.13" -julia = "1" +julia = "1.3" [extras] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From d6cb9f055da08538e84780071d2e670fd76b37c1 Mon Sep 17 00:00:00 2001 From: Carlo Lucibello Date: Mon, 6 Apr 2020 11:08:20 +0200 Subject: [PATCH 3/4] fix housing download --- src/data/housing.jl | 2 +- test/data.jl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/housing.jl b/src/data/housing.jl index 61391304..06ecc339 100644 --- a/src/data/housing.jl +++ b/src/data/housing.jl @@ -50,7 +50,7 @@ function load() isfile(deps("housing.data")) && return @info "Downloading the Boston housing Dataset" - download_and_verify("$(cache_prefix)https://archive.ics.uci.edu/ml/machine-learning-databases/housing/housing.data", + download_and_verify("$(cache_prefix)http://archive.ics.uci.edu/ml/machine-learning-databases/housing/housing.data", deps("housing.data"), "baadf72995725d76efe787b664e1f083388c79ba21ef9a7990d87f774184735a") diff --git a/test/data.jl b/test/data.jl index b5faf359..20492323 100644 --- a/test/data.jl +++ b/test/data.jl @@ -78,9 +78,9 @@ end @testset "Housing" begin - @test_broken Housing.features() isa Matrix # test broken due to SSL certifate expiration problem - @test_broken size(Housing.features()) == (506, 13) + @test Housing.features() isa Matrix # test broken due to SSL certifate expiration problem + @test size(Housing.features()) == (506, 13) - @test_broken Housing.targets() isa Array{Float64} - @test_broken size(Housing.targets()) == (506, 1) + @test Housing.targets() isa Array{Float64} + @test size(Housing.targets()) == (506, 1) end From c54d71ce56e84bd5cbff8d265d771ef7fc2a8aeb Mon Sep 17 00:00:00 2001 From: Carlo Lucibello Date: Mon, 6 Apr 2020 13:20:28 +0200 Subject: [PATCH 4/4] update travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90cf039b..d2ab83c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ os: julia: - 1.3 + - 1 - nightly notifications: @@ -15,7 +16,7 @@ notifications: jobs: include: - stage: "Documentation" - julia: 1.3 + julia: 1 os: linux script: - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));