fix conflict

Author: tknopp

.github/workflows/CI.yml

@@ -4,8 +4,12 @@ env:
 on:
   push:
     branches: '*'
+    paths-ignore:
+      - 'docs/**'
     tags: '*'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
 concurrency:
   # Skip intermediate builds: always.
   # Cancel intermediate builds: only if it is a pull request build.
@@ -28,7 +32,7 @@ jobs:
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
@@ -46,7 +50,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
         with:
           version: '1'

.github/workflows/FormatCheck.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           version: ${{ matrix.julia-version }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install JuliaFormatter and format
         # This will use the latest version by default but you can set the version like so:
         #

.github/workflows/Invalidations.yml

@@ -19,12 +19,12 @@ jobs:
     - uses: julia-actions/setup-julia@v1
       with:
         version: '1'
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: julia-actions/julia-buildpkg@v1
     - uses: julia-actions/julia-invalidations@v1
       id: invs_pr
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.repository.default_branch }}
     - uses: julia-actions/julia-buildpkg@v1

Project.toml

@@ -1,7 +1,7 @@
 name = "NeuralOperators"
 uuid = "ea5c82af-86e5-48da-8ee1-382d6ad7af4b"
 authors = ["JingYu Ning <[email protected]> and contributors"]
-version = "0.4.6"
+version = "0.4.7"
 
 [deps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
@@ -21,6 +21,7 @@ FFTW = "1"
 Flux = "0.14"
 GeometricFlux = "0.14"
 KernelAbstractions = "0.7, 0.8, 0.9"
+Statistics = "1"
 Tullio = "0.3"
 Zygote = "0.6"
 julia = "1.6"

docs/Project.toml

@@ -5,7 +5,7 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 NeuralOperators = "ea5c82af-86e5-48da-8ee1-382d6ad7af4b"
 
 [compat]
-Documenter = "0.27"
-DocumenterCitations = "0.2"
+Documenter = "1"
+DocumenterCitations = "1"
 Flux = "0.13"
 NeuralOperators = "0.4"

docs/make.jl

@@ -5,22 +5,23 @@ using DocumenterCitations
 cp("./docs/Manifest.toml", "./docs/src/assets/Manifest.toml", force = true)
 cp("./docs/Project.toml", "./docs/src/assets/Project.toml", force = true)
 
-bib = CitationBibliography(joinpath(@__DIR__, "bibliography.bib"), sorting = :nyt)
+bib = CitationBibliography(joinpath(@__DIR__, "bibliography.bib"), style = :numeric)
 
 DocMeta.setdocmeta!(NeuralOperators, :DocTestSetup, :(using NeuralOperators);
                     recursive = true)
 
 include("pages.jl")
 
-makedocs(bib,
-         modules = [NeuralOperators],
+makedocs(modules = [NeuralOperators],
          authors = "JingYu Ning <[email protected]> and contributors",
          repo = "https://github.com/SciML/NeuralOperators.jl/blob/{commit}{path}#{line}",
          sitename = "NeuralOperators.jl",
+         clean = true, doctest = false, linkcheck = true,
          format = Documenter.HTML(;
                                   prettyurls = get(ENV, "CI", "false") == "true",
                                   canonical = "https://docs.sciml.ai/NeuralOperators/stable/",
                                   assets = ["assets/favicon.ico"]),
+         plugins=[bib],
          pages = pages)
 
 deploydocs(;

docs/src/index.md

@@ -143,32 +143,19 @@ Pkg.status(; mode = PKGMODE_MANIFEST) # hide
 </details>
 ```
 
-```@raw html
-You can also download the 
-<a href="
-```
-
-```@eval
-using TOML
-version = TOML.parse(read("../../Project.toml", String))["version"]
-name = TOML.parse(read("../../Project.toml", String))["name"]
-link = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
-       "/assets/Manifest.toml"
-```
-
-```@raw html
-">manifest</a> file and the
-<a href="
-```
-
 ```@eval
 using TOML
+using Markdown
 version = TOML.parse(read("../../Project.toml", String))["version"]
 name = TOML.parse(read("../../Project.toml", String))["name"]
-link = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
-       "/assets/Project.toml"
-```
-
-```@raw html
-">project</a> file.
-```
+link_manifest = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
+                "/assets/Manifest.toml"
+link_project = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
+               "/assets/Project.toml"
+Markdown.parse("""You can also download the
+[manifest]($link_manifest)
+file and the
+[project]($link_project)
+file.
+""")
+```

example/Burgers/Project.toml

@@ -13,7 +13,7 @@ NeuralOperators = "ea5c82af-86e5-48da-8ee1-382d6ad7af4b"
 
 [compat]
 BSON = "0.3"
-CUDA = "3.12, 4"
+CUDA = "3.12, 4, 5"
 DataDeps = "0.7"
 Flux = "0.13"
 FluxTraining = "0.3"

example/DoublePendulum/Project.toml

@@ -17,7 +17,7 @@ Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 [compat]
 BSON = "0.3"
 CSV = "0.10"
-CUDA = "3.12, 4"
+CUDA = "3.12, 4, 5"
 DataDeps = "0.7"
 DataFrames = "1.4"
 Flux = "0.13"

example/FlowOverCircle/Project.toml

@@ -18,7 +18,7 @@ WaterLily = "ed894a53-35f9-47f1-b17f-85db9237eebd"
 
 [compat]
 BSON = "0.3"
-CUDA = "3.12, 4"
+CUDA = "3.12, 4, 5"
 Flux = "0.13"
 FluxTraining = "0.3"
 GeometricFlux = "0.13"