Skip to content

Commit 815b5cb

Browse files
gdallegdalle
committed
Fixes
1 parent f19b406 commit 815b5cb

10 files changed

Lines changed: 32 additions & 15 deletions

File tree

‎DifferentiationInterface/test/Back/FiniteDiff/Project.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
3+
Chairmarks = "0ca39b1e-fe0b-4e98-acfc-b1656634c4de"
34
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
45
DifferentiationInterfaceTest = "a82114a7-5aa3-49a8-9643-716bb13727a3"
56
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"

‎DifferentiationInterface/test/Back/FiniteDiff/benchmark.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Pkg
22

33
using ADTypes: ADTypes
4+
using DataFrames: DataFrame
45
using DifferentiationInterface, DifferentiationInterfaceTest
56
import DifferentiationInterface as DI
67
import DifferentiationInterfaceTest as DIT
@@ -21,7 +22,7 @@ using Test
2122
benchmark = :prepared,
2223
excluded = SECOND_ORDER,
2324
logging = LOGGING,
24-
)
25+
) |> DataFrame
2526
@testset "Analyzing benchmark results" begin
2627
@testset "$(row[:scenario])" for row in eachrow(data)
2728
@test row[:allocs] == 0

‎DifferentiationInterface/test/Back/ForwardDiff/Project.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[deps]
22
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
3+
Chairmarks = "0ca39b1e-fe0b-4e98-acfc-b1656634c4de"
34
ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
5+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
46
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
57
DifferentiationInterfaceTest = "a82114a7-5aa3-49a8-9643-716bb13727a3"
68
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"

‎DifferentiationInterface/test/Back/ForwardDiff/benchmark.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Pkg
22

33
using ADTypes: ADTypes
4+
using DataFrames: DataFrame
45
using DifferentiationInterface, DifferentiationInterfaceTest
56
import DifferentiationInterface as DI
67
import DifferentiationInterfaceTest as DIT
@@ -18,7 +19,7 @@ using Test
1819
benchmark = :prepared,
1920
excluded = [:hessian, :pullback], # TODO: figure this out
2021
logging = LOGGING,
21-
)
22+
) |> DataFrame
2223
@testset "Analyzing benchmark results" begin
2324
@testset "$(row[:scenario])" for row in eachrow(data)
2425
@test row[:allocs] == 0
@@ -40,7 +41,7 @@ end
4041
benchmark = :prepared,
4142
excluded = SECOND_ORDER,
4243
logging = LOGGING,
43-
)
44+
) |> DataFrame
4445
@testset "Analyzing benchmark results" begin
4546
@testset "$(row[:scenario])" for row in eachrow(data)
4647
@test row[:allocs] == 0

‎DifferentiationInterface/test/Back/GTPSA/test.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include("../../testutils.jl")
33
using DifferentiationInterface, DifferentiationInterfaceTest
44
using GTPSA: GTPSA
55
using Test
6-
import JET, Chairmarks
6+
import JET
77

88
using ExplicitImports
99
check_no_implicit_imports(DifferentiationInterface)

‎DifferentiationInterface/test/Core/ZeroBackends/test.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ using SparseMatrixColorings
88
using StaticArrays: StaticArrays
99
using Test
1010
using JET
11-
import JET, Chairmarks
1211

1312
zero_backends = [AutoZeroForward(), AutoZeroReverse()]
1413

‎DifferentiationInterfaceTest/Project.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ authors = ["Guillaume Dalle", "Adrian Hill"]
66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
88
AllocCheck = "9b6a8646-10ed-4001-bbdc-1d2f46dfbb1a"
9+
DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
910
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
1011
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1112
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -38,6 +39,7 @@ ADTypes = "1.7.0"
3839
AllocCheck = "0.2"
3940
Chairmarks = "1.2.1"
4041
ComponentArrays = "0.15"
42+
DataAPI = "1.16.0"
4143
DifferentiationInterface = "0.7.7"
4244
DocStringExtensions = "0.8,0.9"
4345
ForwardDiff = "0.10.36,1"

‎DifferentiationInterfaceTest/src/DifferentiationInterfaceTest.jl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ using ADTypes:
1616
SymbolicMode,
1717
mode
1818
using AllocCheck: check_allocs
19+
using DataAPI: DataAPI
1920
import DifferentiationInterface as DI
2021
using DifferentiationInterface:
2122
prepare_pushforward,
@@ -96,7 +97,7 @@ using ProgressMeter: ProgressUnknown, next!
9697
using Random: AbstractRNG, default_rng, rand!
9798
using SparseArrays:
9899
SparseArrays, AbstractSparseMatrix, SparseMatrixCSC, nnz, sparse, spdiagm
99-
using Tables: Tables, AbstractRow
100+
using Tables: Tables, AbstractRow, AbstractColumns
100101
using Test: @testset, @test, @test_throws
101102

102103
"""
@@ -148,8 +149,8 @@ export Scenario, compute_results
148149
export test_differentiation, benchmark_differentiation
149150
export DifferentiationBenchmarkDataRow
150151

151-
@compile_workload begin
152-
default_scenarios(; include_constantified = true, include_cachified = true)
153-
end
152+
# @compile_workload begin
153+
# default_scenarios(; include_constantified = true, include_cachified = true)
154+
# end
154155

155156
end

‎DifferentiationInterfaceTest/src/tests/benchmark.jl‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $(TYPEDFIELDS)
4040
4141
See the documentation of [Chairmarks.jl](https://github.com/LilithHafner/Chairmarks.jl) for more details on the measurement fields.
4242
"""
43-
Base.@kwdef struct DifferentiationBenchmarkDataRow{T} <: AbstractRow
43+
Base.@kwdef struct DifferentiationBenchmarkDataRow{T}
4444
"backend used for benchmarking"
4545
backend::AbstractADType
4646
"scenario used for benchmarking"
@@ -67,10 +67,6 @@ Base.@kwdef struct DifferentiationBenchmarkDataRow{T} <: AbstractRow
6767
compile_fraction::T
6868
end
6969

70-
Tables.getcolumn(row::DifferentiationBenchmarkDataRow, i::Int) = getfield(row, i)
71-
Tables.getcolumn(row::DifferentiationBenchmarkDataRow, nm::Symbol) = getfield(row, nm)
72-
Tables.columnnames(row::DifferentiationBenchmarkDataRow) = fieldnames(typeof(row))
73-
7470
"""
7571
DifferentiationBenchmark
7672
@@ -87,10 +83,23 @@ function DifferentiationBenchmark()
8783
end
8884

8985
Tables.istable(::Type{DifferentiationBenchmark}) = true
86+
DataAPI.nrow(data::DifferentiationBenchmark) = length(data.rows)
87+
DataAPI.ncol(data::DifferentiationBenchmark) = 12
88+
9089
Tables.rowaccess(::Type{DifferentiationBenchmark}) = true
91-
Tables.columnaccess(::Type{DifferentiationBenchmark}) = false
9290
Tables.rows(data::DifferentiationBenchmark) = data.rows
9391

92+
Tables.getcolumn(row::DifferentiationBenchmarkDataRow, i::Int) = getfield(row, i)
93+
Tables.getcolumn(row::DifferentiationBenchmarkDataRow, nm::Symbol) = getproperty(row, nm)
94+
Tables.columnnames(row::DifferentiationBenchmarkDataRow) = fieldnames(typeof(row))
95+
96+
Tables.columnaccess(::Type{DifferentiationBenchmark}) = true
97+
Tables.columns(data::DifferentiationBenchmark) = data
98+
99+
Tables.getcolumn(cols::DifferentiationBenchmark, i::Int) = getfield.(cols.rows, i)
100+
Tables.getcolumn(cols::DifferentiationBenchmark, nm::Symbol) = getproperty.(cols.rows, nm)
101+
Tables.columnnames(cols::DifferentiationBenchmark) = fieldnames(eltype(cols.rows))
102+
94103
"""
95104
run_benchmark!(...)
96105

‎DifferentiationInterfaceTest/test/zero_backends.jl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using ADTypes
2+
import Chairmarks, JET
23
using DifferentiationInterface
34
using DifferentiationInterface: AutoZeroForward, AutoZeroReverse
45
using DifferentiationInterfaceTest

0 commit comments

Comments
 (0)