Skip to content

Commit b1d944b

Browse files
Merge pull request #378 from JuliaArrays/cleanup
A bit more cleanup
2 parents c08790a + f747789 commit b1d944b

File tree

7 files changed

+52
-129
lines changed

7 files changed

+52
-129
lines changed

.github/workflows/Documentation.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Documentation
2+
23
on:
34
push:
45
branches:
@@ -14,10 +15,14 @@ jobs:
1415
- uses: julia-actions/setup-julia@latest
1516
with:
1617
version: '1'
17-
- run: julia --project -e 'using Pkg; Pkg.develop([PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore"))])'
18-
- uses: julia-actions/julia-buildpkg@latest
19-
- run: julia --project=docs/ -e 'using Pkg; Pkg.develop([PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore"))]); Pkg.instantiate()'
20-
- uses: julia-actions/julia-docdeploy@releases/v1
18+
- name: Install dependencies
19+
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
20+
- name: Build and deploy
2121
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23-
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
23+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
24+
run: julia --project=docs/ --code-coverage=user docs/make.jl
25+
- uses: julia-actions/julia-processcoverage@v1
26+
- uses: codecov/codecov-action@v1
27+
with:
28+
file: lcov.info

.github/workflows/Downstream.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
- {user: SciML, repo: OrdinaryDiffEq.jl, group: Core}
3131
- {user: SciML, repo: OrdinaryDiffEq.jl, group: Interface}
3232
- {user: SciML, repo: DelayDiffEq.jl, group: Interface}
33-
- {user: JuliaSIMD, repo: VectorizationBase.jl, group: Interface}
34-
- {user: JuliaSIMD, repo: LoopVectorization.jl, group: Downstream3}
33+
3534
steps:
3635
- uses: actions/checkout@v2
3736
- uses: julia-actions/setup-julia@v1
@@ -45,18 +44,14 @@ jobs:
4544
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
4645
path: downstream
4746
- name: Load this and run the downstream tests
48-
shell: julia --color=yes {0}
47+
shell: julia --color=yes --project=downstream {0}
4948
run: |
5049
using Pkg
5150
try
5251
# force it to use this PR's version of the package
5352
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
54-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore")))
55-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceOffsetArrays")))
56-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceStaticArrays")))
57-
Pkg.activate("downstream")
5853
Pkg.update()
59-
Pkg.test() # resolver may fail with test time deps
54+
Pkg.test(coverage=true) # resolver may fail with test time deps
6055
catch err
6156
err isa Pkg.Resolve.ResolverError || rethrow()
6257
# If we can't resolve that means this is incompatible by SemVer and this is fine
@@ -65,3 +60,7 @@ jobs:
6560
@info "Not compatible with this release. No problem." exception=err
6661
exit(0) # Exit immediately, as a success
6762
end
63+
- uses: julia-actions/julia-processcoverage@v1
64+
- uses: codecov/codecov-action@v1
65+
with:
66+
file: lcov.info

docs/src/index.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,47 +27,47 @@ to the interface, and is likely to be deprecated in the near future as the compi
2727
### Traits
2828

2929
```@docs
30-
ArrayInterfaceCore.can_avx
31-
ArrayInterfaceCore.can_change_size
32-
ArrayInterfaceCore.can_setindex
33-
ArrayInterfaceCore.device
34-
ArrayInterfaceCore.defines_strides
35-
ArrayInterfaceCore.fast_matrix_colors
36-
ArrayInterfaceCore.fast_scalar_indexing
37-
ArrayInterfaceCore.indices_do_not_alias
38-
ArrayInterfaceCore.instances_do_not_alias
39-
ArrayInterfaceCore.is_forwarding_wrapper
40-
ArrayInterfaceCore.ismutable
41-
ArrayInterfaceCore.isstructured
42-
ArrayInterfaceCore.has_sparsestruct
43-
ArrayInterfaceCore.ndims_index
44-
ArrayInterfaceCore.ndims_shape
30+
ArrayInterface.can_avx
31+
ArrayInterface.can_change_size
32+
ArrayInterface.can_setindex
33+
ArrayInterface.device
34+
ArrayInterface.defines_strides
35+
ArrayInterface.fast_matrix_colors
36+
ArrayInterface.fast_scalar_indexing
37+
ArrayInterface.indices_do_not_alias
38+
ArrayInterface.instances_do_not_alias
39+
ArrayInterface.is_forwarding_wrapper
40+
ArrayInterface.ismutable
41+
ArrayInterface.isstructured
42+
ArrayInterface.has_sparsestruct
43+
ArrayInterface.ndims_index
44+
ArrayInterface.ndims_shape
4545
4646
```
4747

4848
### Functions
4949

5050
```@docs
51-
ArrayInterfaceCore.allowed_getindex
52-
ArrayInterfaceCore.allowed_setindex!
53-
ArrayInterfaceCore.aos_to_soa
54-
ArrayInterfaceCore.buffer
55-
ArrayInterfaceCore.findstructralnz
56-
ArrayInterfaceCore.lu_instance
57-
ArrayInterfaceCore.matrix_colors
58-
ArrayInterfaceCore.issingular
59-
ArrayInterfaceCore.parent_type
60-
ArrayInterfaceCore.promote_eltype
61-
ArrayInterfaceCore.restructure
62-
ArrayInterfaceCore.safevec
63-
ArrayInterfaceCore.zeromatrix
64-
ArrayInterfaceCore.undefmatrix
51+
ArrayInterface.allowed_getindex
52+
ArrayInterface.allowed_setindex!
53+
ArrayInterface.aos_to_soa
54+
ArrayInterface.buffer
55+
ArrayInterface.findstructralnz
56+
ArrayInterface.lu_instance
57+
ArrayInterface.matrix_colors
58+
ArrayInterface.issingular
59+
ArrayInterface.parent_type
60+
ArrayInterface.promote_eltype
61+
ArrayInterface.restructure
62+
ArrayInterface.safevec
63+
ArrayInterface.zeromatrix
64+
ArrayInterface.undefmatrix
6565
```
6666

6767
### Types
6868

6969
```@docs
70-
ArrayInterfaceCore.ArrayIndex
71-
ArrayInterfaceCore.GetIndex
72-
ArrayInterfaceCore.SetIndex!
70+
ArrayInterface.ArrayIndex
71+
ArrayInterface.GetIndex
72+
ArrayInterface.SetIndex!
7373
```

src/ArrayInterface.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,6 @@ Base.@propagate_inbounds function Base.getindex(ind::TridiagonalIndex, i::Int)
688688
end
689689
end
690690

691-
_cartesian_index(i::Tuple{Vararg{Int}}) = CartesianIndex(i)
692-
_cartesian_index(::Any) = nothing
693691

694692
"""
695693
ndims_index(::Type{I}) -> Int
@@ -748,12 +746,7 @@ ndims_shape(@nospecialize T::Type{<:AbstractArray{Bool}}) = 1
748746
ndims_shape(@nospecialize T::Type{<:AbstractArray}) = ndims(T)
749747
ndims_shape(x) = ndims_shape(typeof(x))
750748

751-
@assume_effects :total function _find_first_true(isi::Tuple{Vararg{Bool, N}}) where {N}
752-
for i in 1:N
753-
getfield(isi, i) && return i
754-
end
755-
return nothing
756-
end
749+
757750

758751
"""
759752
instances_do_not_alias(::Type{T}) -> Bool

test/core.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using ArrayInterface
22
using ArrayInterface: zeromatrix, undefmatrix
33
import ArrayInterface: has_sparsestruct, findstructralnz, fast_scalar_indexing, lu_instance,
4-
parent_type, zeromatrix, IndicesInfo
4+
parent_type, zeromatrix
55
using LinearAlgebra
66
using Random
77
using SparseArrays

test/offsetarrays.jl

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/staticarrays.jl

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)