Skip to content

Commit

Permalink
Merge branch 'main' into tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vchuravy authored Apr 1, 2024
2 parents 178d9c5 + b794cf4 commit 80bf0d8
Show file tree
Hide file tree
Showing 47 changed files with 2,532 additions and 897 deletions.
1 change: 1 addition & 0 deletions .JuliaFormatter.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
style = "yas"
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ steps:
matrix:
setup:
version:
- "1.8"
- "1.9"
- "1.10"
plugins:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ on:
- main
- release-*
tags: '*'

concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ matrix.libEnzyme }} libEnzyme - assertions=${{ matrix.assertions }} - ${{ github.event_name }}
Expand Down Expand Up @@ -222,9 +229,7 @@ jobs:
- run: |
julia --project=docs -e '
using Pkg
Pkg.develop(path="lib/EnzymeCore")
Pkg.develop(path="lib/EnzymeTestUtils")
Pkg.develop(PackageSpec(path=pwd()))
Pkg.develop([PackageSpec(path="lib/EnzymeCore"), PackageSpec(path="lib/EnzymeTestUtils"), PackageSpec(path=pwd())])
Pkg.instantiate()'
env:
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/Format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Format suggestions

on:
pull_request:

concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
format:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: 1
- run: |
julia -e 'using Pkg; Pkg.add("JuliaFormatter")'
julia -e 'using JuliaFormatter; format("."; verbose=true)'
- uses: reviewdog/action-suggester@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
tool_name: JuliaFormatter
fail_on_error: true
5 changes: 1 addition & 4 deletions .github/workflows/scripts_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ jobs:
- run: |
julia --project=docs -e '
using Pkg
Pkg.develop(path="lib/EnzymeCore")
Pkg.develop(PackageSpec(path=pwd()))
Pkg.develop(path="lib/EnzymeTestUtils")
Pkg.develop(PackageSpec(path=pwd()))
Pkg.develop([PackageSpec(path="lib/EnzymeCore"), PackageSpec(path=pwd()), PackageSpec(path="lib/EnzymeTestUtils")])
Pkg.instantiate()'
env:
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
Expand Down
14 changes: 10 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Enzyme"
uuid = "7da242da-08ed-463a-9acd-ee780be4f1d9"
authors = ["William Moses <[email protected]>", "Valentin Churavy <[email protected]>"]
version = "0.11.14"
version = "0.12.0"

[deps]
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
Expand All @@ -16,11 +16,17 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[weakdeps]
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

[extensions]
EnzymeSpecialFunctionsExt = "SpecialFunctions"

[compat]
CEnum = "0.4, 0.5"
EnzymeCore = "0.6.4, 0.6.5"
Enzyme_jll = "0.0.98"
GPUCompiler = "0.21, 0.22, 0.23, 0.24, 0.25"
EnzymeCore = "0.7"
Enzyme_jll = "0.0.103"
GPUCompiler = "0.21, 0.22, 0.23, 0.24, 0.25, 0.26"
LLVM = "6.1"
Libdl = "1.6"
LinearAlgebra = "1.6"
Expand Down
12 changes: 7 additions & 5 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const EXAMPLES_DIR = joinpath(@__DIR__, "..", "examples")
const OUTPUT_DIR = joinpath(@__DIR__, "src/generated")

examples = Pair{String,String}[
"Basics" => "autodiff"
"Box model" => "box"
"AutoDiff API" => "autodiff"
"Custom rules" => "custom_rule"
]

Expand Down Expand Up @@ -51,10 +51,12 @@ makedocs(;
pages = [
"Home" => "index.md",
"Examples" => examples,
"API" => "api.md",
"Implementing pullbacks" => "pullbacks.md",
"For developers" => "dev_docs.md",
"Internal API" => "internal_api.md",
"FAQ" => "faq.md",
"API reference" => "api.md",
"Advanced" => [
"For developers" => "dev_docs.md",
"Internal API" => "internal_api.md",
]
],
doctest = true,
strict = true,
Expand Down
4 changes: 2 additions & 2 deletions docs/src/api.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# API
# API reference

## Types and constants

Expand All @@ -14,7 +14,7 @@ Modules = [Enzyme, EnzymeCore, EnzymeCore.EnzymeRules, EnzymeTestUtils, Enzyme.A
Order = [:macro, :function]
```

# Documentation
## Documentation

```@autodocs
Modules = [Enzyme, EnzymeCore, EnzymeCore.EnzymeRules, EnzymeTestUtils, Enzyme.API]
Expand Down
Loading

0 comments on commit 80bf0d8

Please sign in to comment.