Merge #1345

1345: update for Cuda 2 r=CarloLucibello a=CarloLucibello and mark as broken a cuda test on the `huber_loss` that was already failing on master (for reasons i do not understand) Co-authored-by: Carlo Lucibello <carlo.lucibello@gmail.com>
FluxML · Nov 3, 2020 · e00322f · e00322f · CarloLucibello · Nov 3, 2020
2 parents c5b0cec + f3aec7d
commit e00322f
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+.vscode/
 docs/build/
 docs/site/
 deps
+# Manifest.toml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,33 +1,8 @@
-include:
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v6.yml'
+include: 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v6.yml'
 
-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
-#     - .test
-#   tags:
-#     - nvidia
-
-julia:1.4:
+julia:1.5:
   extends:
-    - .julia:1.4
+    - .julia:1.5
     - .test
   tags:
     - nvidia

diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ os:
   # - osx
 
 julia:
-  - 1.4
-  - 1
+  - 1.5
+  # - 1 # uncomment when 1.6 is out
   - nightly
 
 notifications:
@@ -16,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()));