Merge branch 'VariousUpdates'

FourierFlows · Jan 3, 2020 · ebd786d · ebd786d
2 parents 8fb5f37 + 5ff0aac
commit ebd786d
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 **/*.pdf
 **/.nfs*
 **/*.cov
+**/Manifest.toml
 
 docs/build/
 docs/site/

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,51 @@
+variables:
+  CI_IMAGE_TAG: 'cuda'
+  JULIA_NUM_THREADS: '4'
+  JULIA_CUDA_VERBOSE: 'true'
+
+# See: https://github.com/JuliaGPU/gitlab-ci
+include:
+  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v6.yml'
+
+image: nvidia/cuda:10.1-cudnn7-devel
+
+julia:1.0:
+  extends:
+    - .julia:1.0
+    - .test
+  tags:
+    - nvidia
+
+julia:1.1:
+  extends:
+    - .julia:1.1
+    - .test
+  tags:
+    - nvidia
+
+# the "primary" target, where we require a new GPU to make sure all tests are run
+julia:1.2:
+  image: juliagpu/cuda:10.1-cudnn7-cutensor1-devel-ubuntu18.04
+  extends:
+    - .julia:1.2
+    - .test
+  tags:
+    - nvidia
+    - sm_75
+  variables:
+    CI_THOROUGH: 'true'
+
+julia:1.3:
+  extends:
+    - .julia:1.3
+    - .test
+  tags:
+    - nvidia
+  allow_failure: true
+
+
+# other tasks
+coverage:
+  extends:
+    - .julia:1.2
+    - .coverage
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ os:
   - linux
 
 julia:
-  - 1.0
+  - 1.3
   - nightly
 
 matrix:
@@ -19,7 +19,7 @@ after_success:
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.0
+      julia: 1.3
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.instantiate();

diff --git a/Manifest.toml b/Manifest.toml
diff --git a/REQUIRE b/REQUIRE
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,7 @@
 environment:
   matrix:
-  - julia_version: 1
+  - julia_version: 1.2
+  - julia_version: 1.3
   - julia_version: nightly
 
 platform:

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -1,5 +1,2 @@
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-
-[compat]
-Documenter = "~0.20"
diff --git a/docs/make.jl b/docs/make.jl
@@ -3,25 +3,27 @@ if Base.HOME_PROJECT[] !== nothing
   Base.HOME_PROJECT[] = abspath(Base.HOME_PROJECT[])
 end
 
-using Documenter, PassiveTracerFlows
+using
+  Documenter,
+  PassiveTracerFlows
 
 makedocs(
    modules = [PassiveTracerFlows],
    doctest = false,
      clean = true,
  checkdocs = :all,
-    format = :html,
-   authors = "Gregory L. Wagner and Navid C. Constantinou",
-  sitename = "PassiveTracerFlows.jl",
-     pages = Any[
-              "Home" => "index.md",
-              "Modules" => Any[
-                "modules/traceradvdiff.md",
-              ],
-              "DocStrings" => Any[
-              "man/types.md",
-              "man/functions.md"]
-             ]
+  format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
+ authors = "Gregory L. Wagner and Navid C. Constantinou",
+sitename = "FourierFlows.jl",
+   pages = Any[
+           "Home" => "index.md",
+           "Modules" => Any[
+           "modules/traceradvdiff.md",
+           ],
+           "DocStrings" => Any[
+           "man/types.md",
+            "man/functions.md"]
+           ]
 )
 
-deploydocs( repo = "github.com/FourierFlows/PassiveTracerFlows.jl.git" )
+deploydocs(repo = "github.com/FourierFlows/PassiveTracerFlows.jl.git")