From 7ebb2cfac5cac9b011d09f20a633b736822dfbe3 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Wed, 11 Sep 2019 21:10:12 +0530 Subject: [PATCH 01/13] test on julia 1.2 --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05217e81..9b39e5b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,6 @@ include: - julia -e 'using InteractiveUtils; versioninfo()' - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325 - - julia -e 'using Pkg; - Pkg.add("CuArrays");' - julia --project -e 'using Pkg; Pkg.instantiate(); Pkg.build(); @@ -35,3 +33,11 @@ test:v1.1: only: - staging - trying + +test:v1.2: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.2' + only: + - staging + - trying From b8d872d842d873451b85b65090a1109e2191db98 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Wed, 11 Sep 2019 21:11:02 +0530 Subject: [PATCH 02/13] update to Flux 0.9+ --- test/cuda/cuda.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/cuda/cuda.jl b/test/cuda/cuda.jl index 3508e561..0bb7b2ef 100644 --- a/test/cuda/cuda.jl +++ b/test/cuda/cuda.jl @@ -1,4 +1,5 @@ -using Flux, CuArrays, Test +using Flux, Test +using Flux.CuArrays using Flux: gpu @info "Testing GPU Support" From 37fe91d54dcc8a3c16d20e865793a37264517e2e Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Wed, 18 Sep 2019 12:05:31 +0530 Subject: [PATCH 03/13] remove branch restrictions --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b39e5b7..1e69dd3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,22 +22,13 @@ test:v1.0: extends: .flux variables: CI_VERSION_TAG: 'v1.0' - only: - - staging - - trying test:v1.1: extends: .flux variables: CI_VERSION_TAG: 'v1.1' - only: - - staging - - trying test:v1.2: extends: .flux variables: CI_VERSION_TAG: 'v1.2' - only: - - staging - - trying From 99b6fe57e94d948a18894b67b62e3c565cd4a719 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Wed, 18 Sep 2019 12:32:11 +0530 Subject: [PATCH 04/13] extend test template --- .gitlab-ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e69dd3f..8e0fa64e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,28 +7,17 @@ variables: include: - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v3/common.yml' -.flux: - extends: .test - script: - - julia -e 'using InteractiveUtils; - versioninfo()' - - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325 - - julia --project -e 'using Pkg; - Pkg.instantiate(); - Pkg.build(); - Pkg.test(; coverage=true);' - test:v1.0: - extends: .flux + extends: .test variables: CI_VERSION_TAG: 'v1.0' test:v1.1: - extends: .flux + extends: .test variables: CI_VERSION_TAG: 'v1.1' test:v1.2: - extends: .flux + extends: .test variables: CI_VERSION_TAG: 'v1.2' From 787097f9ea0d34f27462bf80ad28399573ca1b2e Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Sat, 21 Sep 2019 00:20:54 +0530 Subject: [PATCH 05/13] use CuArrays#stable --- Manifest.toml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 17eb544e..4480dcfd 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -58,9 +58,9 @@ version = "3.1.0" [[CUDAnative]] deps = ["Adapt", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Printf", "TimerOutputs"] -git-tree-sha1 = "0a00bef482b7c9127495c7f4a2a85e73b13b5af8" +git-tree-sha1 = "52ae1ce10ebfa686e227655c47b19add89308623" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "2.3.0" +version = "2.3.1" [[CodecZlib]] deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] @@ -106,7 +106,9 @@ version = "4.0.0" [[CuArrays]] deps = ["AbstractFFTs", "Adapt", "CUDAapi", "CUDAdrv", "CUDAnative", "GPUArrays", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"] -git-tree-sha1 = "46b48742a84bb839e74215b7e468a4a1c6ba30f9" +git-tree-sha1 = "de756b0ed9ffe17890ce77b59bc76b10f96747e7" +repo-rev = "stable" +repo-url = "https://github.com/JuliaGPU/CuArrays.jl.git" uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" version = "1.2.1" @@ -147,9 +149,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FFTW]] deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] -git-tree-sha1 = "e1a479d3c972f20c9a70563eec740bbfc786f515" +git-tree-sha1 = "6c5b420da0b8c12098048561b8d58f81adea506f" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "0.3.0" +version = "1.0.1" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -170,9 +172,9 @@ version = "0.10.3" [[GPUArrays]] deps = ["Adapt", "FFTW", "FillArrays", "LinearAlgebra", "Printf", "Random", "Serialization", "StaticArrays", "Test"] -git-tree-sha1 = "dd169c636d1d3656a9faca772f5bd7c226a61254" +git-tree-sha1 = "77e27264276fe97a7e7fb928bf8999a145abc018" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "1.0.1" +version = "1.0.3" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] @@ -198,9 +200,9 @@ version = "0.7.2" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "52cfea426bd248a427aace7d88eb5d45b84ea297" +git-tree-sha1 = "4a05f742837779a00bd8c9a18da6817367c4245d" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "1.2.0" +version = "1.3.0" [[LibGit2]] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" @@ -264,7 +266,7 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "0.3.7" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] From 6846551f5756be70432c7bd89d107f7e690e59df Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Sun, 22 Sep 2019 22:02:05 +0530 Subject: [PATCH 06/13] fix cuda init --- Manifest.toml | 16 ++++++++-------- Project.toml | 1 + src/cuda/curnn.jl | 12 +++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 4480dcfd..c524a684 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -46,9 +46,9 @@ version = "0.6.2" [[CUDAapi]] deps = ["Libdl", "Logging"] -git-tree-sha1 = "9b2b4b71d6b7f946c9689bb4dea03ff92e3c7091" +git-tree-sha1 = "e063efb91cfefd7e6afd92c435d01398107a500b" uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" -version = "1.1.0" +version = "1.2.0" [[CUDAdrv]] deps = ["CUDAapi", "Libdl", "Printf"] @@ -106,9 +106,7 @@ version = "4.0.0" [[CuArrays]] deps = ["AbstractFFTs", "Adapt", "CUDAapi", "CUDAdrv", "CUDAnative", "GPUArrays", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"] -git-tree-sha1 = "de756b0ed9ffe17890ce77b59bc76b10f96747e7" -repo-rev = "stable" -repo-url = "https://github.com/JuliaGPU/CuArrays.jl.git" +git-tree-sha1 = "46b48742a84bb839e74215b7e468a4a1c6ba30f9" uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" version = "1.2.1" @@ -390,7 +388,7 @@ version = "0.8.3" [[Zygote]] deps = ["DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "9186cb0b3b59219e4aba0840614d6a9d7282012e" +git-tree-sha1 = "38241b40ebd8748bcacad5e6c7ba3ab3cc7a15c9" repo-rev = "master" repo-url = "https://github.com/FluxML/Zygote.jl.git" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" @@ -398,6 +396,8 @@ version = "0.3.4" [[ZygoteRules]] deps = ["MacroTools"] -git-tree-sha1 = "def5f96ac2895fd9b48435f6b97020979ee0a4c6" +git-tree-sha1 = "c4c29b30b8ff3be13d4244e78be7df2a42bc54d0" +repo-rev = "master" +repo-url = "https://github.com/FluxML/ZygoteRules.jl.git" uuid = "700de1a5-db45-46bc-99cf-38207098b444" -version = "0.1.0" +version = "0.2.0" diff --git a/Project.toml b/Project.toml index 2fcdc943..a55d1385 100644 --- a/Project.toml +++ b/Project.toml @@ -24,6 +24,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" ZipFile = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" +ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444" [compat] CUDAapi = "1.1" diff --git a/src/cuda/curnn.jl b/src/cuda/curnn.jl index ca8b5140..2063b382 100644 --- a/src/cuda/curnn.jl +++ b/src/cuda/curnn.jl @@ -83,12 +83,14 @@ function rnnWorkspaceSize(r::RNNDesc, seqlen, xdesc) return Int(size[]) end -const workspace = [CuVector{UInt8}(undef, 1)] +const workspace = Ref{Union{Nothing,CuVector{UInt8}}}(nothing) -getworkspace(bytes) = - length(workspace[]) ≥ bytes ? - workspace[] : - (workspace[] = CuVector{UInt8}(undef, bytes)) +function getworkspace(bytes) + if workspace[] === nothing || length(workspace[]) < bytes + workspace[] = CuVector{UInt8}(undef, bytes) + end + workspace[] +end getworkspace(r::RNNDesc, seqlen, xdesc) = getworkspace(rnnWorkspaceSize(r, seqlen, xdesc)) From 783ae137e125a9636410b9a823a8efe72feb49dd Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Mon, 23 Sep 2019 16:51:11 +0530 Subject: [PATCH 07/13] remove targets and env --- .gitlab-ci.yml | 21 ++++++--------------- Manifest.toml | 30 ++++++++++++++---------------- Project.toml | 1 - 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e0fa64e..fffa1d7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,19 +5,10 @@ variables: CI_IMAGE_TAG: 'cuda' include: - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v3/common.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.2.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.3.yml' + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_dev.yml' -test:v1.0: - extends: .test - variables: - CI_VERSION_TAG: 'v1.0' - -test:v1.1: - extends: .test - variables: - CI_VERSION_TAG: 'v1.1' - -test:v1.2: - extends: .test - variables: - CI_VERSION_TAG: 'v1.2' +test:dev: + allow_failure: true diff --git a/Manifest.toml b/Manifest.toml index c524a684..17eb544e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -46,9 +46,9 @@ version = "0.6.2" [[CUDAapi]] deps = ["Libdl", "Logging"] -git-tree-sha1 = "e063efb91cfefd7e6afd92c435d01398107a500b" +git-tree-sha1 = "9b2b4b71d6b7f946c9689bb4dea03ff92e3c7091" uuid = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3" -version = "1.2.0" +version = "1.1.0" [[CUDAdrv]] deps = ["CUDAapi", "Libdl", "Printf"] @@ -58,9 +58,9 @@ version = "3.1.0" [[CUDAnative]] deps = ["Adapt", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Printf", "TimerOutputs"] -git-tree-sha1 = "52ae1ce10ebfa686e227655c47b19add89308623" +git-tree-sha1 = "0a00bef482b7c9127495c7f4a2a85e73b13b5af8" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "2.3.1" +version = "2.3.0" [[CodecZlib]] deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] @@ -147,9 +147,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FFTW]] deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] -git-tree-sha1 = "6c5b420da0b8c12098048561b8d58f81adea506f" +git-tree-sha1 = "e1a479d3c972f20c9a70563eec740bbfc786f515" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.0.1" +version = "0.3.0" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -170,9 +170,9 @@ version = "0.10.3" [[GPUArrays]] deps = ["Adapt", "FFTW", "FillArrays", "LinearAlgebra", "Printf", "Random", "Serialization", "StaticArrays", "Test"] -git-tree-sha1 = "77e27264276fe97a7e7fb928bf8999a145abc018" +git-tree-sha1 = "dd169c636d1d3656a9faca772f5bd7c226a61254" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "1.0.3" +version = "1.0.1" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] @@ -198,9 +198,9 @@ version = "0.7.2" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "4a05f742837779a00bd8c9a18da6817367c4245d" +git-tree-sha1 = "52cfea426bd248a427aace7d88eb5d45b84ea297" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "1.3.0" +version = "1.2.0" [[LibGit2]] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" @@ -264,7 +264,7 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "0.3.7" [[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -388,7 +388,7 @@ version = "0.8.3" [[Zygote]] deps = ["DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "38241b40ebd8748bcacad5e6c7ba3ab3cc7a15c9" +git-tree-sha1 = "9186cb0b3b59219e4aba0840614d6a9d7282012e" repo-rev = "master" repo-url = "https://github.com/FluxML/Zygote.jl.git" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" @@ -396,8 +396,6 @@ version = "0.3.4" [[ZygoteRules]] deps = ["MacroTools"] -git-tree-sha1 = "c4c29b30b8ff3be13d4244e78be7df2a42bc54d0" -repo-rev = "master" -repo-url = "https://github.com/FluxML/ZygoteRules.jl.git" +git-tree-sha1 = "def5f96ac2895fd9b48435f6b97020979ee0a4c6" uuid = "700de1a5-db45-46bc-99cf-38207098b444" -version = "0.2.0" +version = "0.1.0" diff --git a/Project.toml b/Project.toml index a55d1385..2fcdc943 100644 --- a/Project.toml +++ b/Project.toml @@ -24,7 +24,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" ZipFile = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" -ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444" [compat] CUDAapi = "1.1" From 98308a85ea69a3be68bf4c69231b8bee43de014c Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Mon, 23 Sep 2019 16:55:53 +0530 Subject: [PATCH 08/13] add gitlab common yaml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fffa1d7f..a7f471e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: CI_IMAGE_TAG: 'cuda' include: + - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/common.yml' - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml' - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.2.yml' - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.3.yml' From d8a069b3042d504a5eec25b5d439611358bfa234 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Tue, 24 Sep 2019 00:28:52 +0530 Subject: [PATCH 09/13] fix env --- Manifest.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 17eb544e..2d1af7e8 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -58,9 +58,9 @@ version = "3.1.0" [[CUDAnative]] deps = ["Adapt", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Printf", "TimerOutputs"] -git-tree-sha1 = "0a00bef482b7c9127495c7f4a2a85e73b13b5af8" +git-tree-sha1 = "52ae1ce10ebfa686e227655c47b19add89308623" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "2.3.0" +version = "2.3.1" [[CodecZlib]] deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] @@ -147,9 +147,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FFTW]] deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] -git-tree-sha1 = "e1a479d3c972f20c9a70563eec740bbfc786f515" +git-tree-sha1 = "03f8776fbdae28c20c0d1d2ae4e090cd1dfcd247" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "0.3.0" +version = "1.0.0" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -170,9 +170,9 @@ version = "0.10.3" [[GPUArrays]] deps = ["Adapt", "FFTW", "FillArrays", "LinearAlgebra", "Printf", "Random", "Serialization", "StaticArrays", "Test"] -git-tree-sha1 = "dd169c636d1d3656a9faca772f5bd7c226a61254" +git-tree-sha1 = "b5009ac44b141ded5e6f04c4db83807970f56e91" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "1.0.1" +version = "1.0.2" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] @@ -198,9 +198,9 @@ version = "0.7.2" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "52cfea426bd248a427aace7d88eb5d45b84ea297" +git-tree-sha1 = "4a05f742837779a00bd8c9a18da6817367c4245d" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "1.2.0" +version = "1.3.0" [[LibGit2]] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" @@ -264,7 +264,7 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "0.3.7" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -388,7 +388,7 @@ version = "0.8.3" [[Zygote]] deps = ["DiffRules", "FFTW", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "9186cb0b3b59219e4aba0840614d6a9d7282012e" +git-tree-sha1 = "ce6d7142d665b1e4c71c678fa7db4da3bbc6743f" repo-rev = "master" repo-url = "https://github.com/FluxML/Zygote.jl.git" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" From 928b5dcc2a3623e0feefa7847477a699c1cfbf21 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Tue, 24 Sep 2019 00:51:35 +0530 Subject: [PATCH 10/13] fix Zygote --- Manifest.toml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index a7764294..c524a684 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -147,15 +147,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FFTW]] deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] -<<<<<<< HEAD -git-tree-sha1 = "03f8776fbdae28c20c0d1d2ae4e090cd1dfcd247" -uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.0.0" -======= git-tree-sha1 = "6c5b420da0b8c12098048561b8d58f81adea506f" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" version = "1.0.1" ->>>>>>> upstream/master [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -176,15 +170,9 @@ version = "0.10.3" [[GPUArrays]] deps = ["Adapt", "FFTW", "FillArrays", "LinearAlgebra", "Printf", "Random", "Serialization", "StaticArrays", "Test"] -<<<<<<< HEAD -git-tree-sha1 = "b5009ac44b141ded5e6f04c4db83807970f56e91" -uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "1.0.2" -======= git-tree-sha1 = "77e27264276fe97a7e7fb928bf8999a145abc018" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" version = "1.0.3" ->>>>>>> upstream/master [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] From fe4ecc588035d2c4ec075cb589d139af67d8fc1e Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Tue, 24 Sep 2019 16:15:48 +0530 Subject: [PATCH 11/13] trying out extending directly --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7f471e0..9173bd74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,19 @@ variables: include: - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/common.yml' + +.test: + extends: .test + script: + - julia -e 'using InteractiveUtils; + versioninfo()' + - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325 + - julia --project -e 'using Pkg; + Pkg.instantiate(); + Pkg.build(); + Pkg.test(; coverage=true);' + +include: - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml' - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.2.yml' - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.3.yml' From cf593a5744a06cd3809d138d27567de371221d02 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Tue, 24 Sep 2019 16:43:48 +0530 Subject: [PATCH 12/13] revert to custom target --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9173bd74..9af14c6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: include: - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/common.yml' -.test: +.flux: extends: .test script: - julia -e 'using InteractiveUtils; @@ -18,11 +18,34 @@ include: Pkg.build(); Pkg.test(; coverage=true);' -include: - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.2.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.3.yml' - - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_dev.yml' +test:v1.0: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.0' + +test:v1.1: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.1' + +test:v1.2: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.2' + +test:v1.3: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.3' + +test:v1.0: + extends: .flux + variables: + CI_VERSION_TAG: 'v1.0' test:dev: + extends: .flux + variables: + CI_VERSION_TAG: 'dev' + allow_failure: true From ce910da948ee2ec33387fc34237fb2e0edb7231a Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Tue, 24 Sep 2019 17:04:13 +0530 Subject: [PATCH 13/13] compat julia v1.0 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index a55d1385..609af949 100644 --- a/Project.toml +++ b/Project.toml @@ -31,7 +31,7 @@ CUDAapi = "1.1" CuArrays = "1.2" NNlib = "0.6" Zygote = "0.3" -julia = "1.1" +julia = "1" [extras] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"