From 8a0745faab0f61a9fb2ecd1770b75f4b2e165ec9 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Wed, 6 Nov 2019 18:40:51 +0100 Subject: [PATCH] Restore Julia 1.0 compatibility. --- .gitlab-ci.yml | 14 ++++++++++++++ Manifest.toml | 18 +++++++++--------- Project.toml | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b87749f03..b55f4618f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,20 @@ include: image: nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04 +julia:1.0: + extends: + - .julia:1.0 + - .test + tags: + - nvidia + +julia:1.1: + extends: + - .julia:1.1 + - .test + tags: + - nvidia + julia:1.2: extends: - .julia:1.2 diff --git a/Manifest.toml b/Manifest.toml index 53a9501a8b..f5a589fd3e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -58,9 +58,9 @@ version = "4.0.2" [[CUDAnative]] deps = ["Adapt", "CEnum", "CUDAapi", "CUDAdrv", "DataStructures", "InteractiveUtils", "LLVM", "Libdl", "Printf", "TimerOutputs"] -git-tree-sha1 = "f4a95ba943507f1586c29208957141fc49d9d718" +git-tree-sha1 = "dd642afe5fd6633663a8c3d42f3b7638f2210b79" uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17" -version = "2.5.2" +version = "2.5.3" [[CodecZlib]] deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] @@ -106,9 +106,9 @@ version = "4.0.0" [[CuArrays]] deps = ["AbstractFFTs", "Adapt", "CEnum", "CUDAapi", "CUDAdrv", "CUDAnative", "DataStructures", "GPUArrays", "Libdl", "LinearAlgebra", "MacroTools", "NNlib", "Printf", "Random", "Requires", "SparseArrays", "TimerOutputs"] -git-tree-sha1 = "0d22d5a55e30e98617f258bb23688f141bfeae36" +git-tree-sha1 = "bc94d6cb335d418088f12641751aab63ff56509d" uuid = "3a865a2d-5b23-5a0f-bc46-62713ec82fae" -version = "1.4.1" +version = "1.4.2" [[DataAPI]] git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" @@ -153,9 +153,9 @@ version = "1.0.1" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "de38b0253ade98340fabaf220f368f6144541938" +git-tree-sha1 = "6827a8f73ff12707f209c920d204238a16892b55" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.7.4" +version = "0.8.0" [[FixedPointNumbers]] git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b" @@ -169,10 +169,10 @@ uuid = "f6369f11-7733-5829-9624-2563aa707210" version = "0.10.5" [[GPUArrays]] -deps = ["Adapt", "FFTW", "FillArrays", "LinearAlgebra", "Printf", "Random", "Serialization", "Test"] -git-tree-sha1 = "8d74ced24448c52b539a23d107bd2424ee139c0f" +deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"] +git-tree-sha1 = "a0a3b927b1a06e63fb8b91950cc7df340b7d912c" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "1.0.4" +version = "2.0.0" [[IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] diff --git a/Project.toml b/Project.toml index 76f7169ae5..587a459b22 100644 --- a/Project.toml +++ b/Project.toml @@ -26,10 +26,10 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] CUDAdrv = "4.0.1" -CuArrays = "1.4" +CuArrays = "1.4.2" NNlib = "0.6" Zygote = "0.4" -julia = "1.2" +julia = "1" [extras] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"