Generalize `Base._cat` to non-`Val`, typed `Base._cat_t` and implement `typed_hcat`, `typed_vcat`, `typed_hvcat`, `typed_hvncat` by mofeing · Pull Request #163 · EnzymeAD/Reactant.jl

mofeing · 2024-10-04T18:59:28Z

It's not yet finished, but this should fix #148

github-actions · 2024-10-04T20:41:07Z

Benchmark Results

	main	`601c867`...	main/601c867cf68ebb...
comptime/basics/2D sum	29.5 ± 1.2 ms	26.6 ± 1.1 ms	1.11
comptime/basics/Basic grad cos	0.0484 ± 0.0016 s	0.0461 ± 0.00095 s	1.05
comptime/basics/cos.(x)	0.0344 ± 0.00095 s	31.2 ± 0.63 ms	1.1
comptime/lux neural networks/ViT base	5.8 s	5.54 s	1.05
comptime/lux neural networks/ViT tiny	6.26 s	5.75 s	1.09
comptime/lux neural networks/vgg11 bn=false	0.39 ± 0.024 s	0.386 ± 0.017 s	1.01
comptime/lux neural networks/vgg13 bn=false	0.502 ± 0.025 s	0.439 ± 0.016 s	1.14
comptime/lux neural networks/vgg16 bn=false	0.582 ± 0.011 s	0.526 ± 0.0072 s	1.11
comptime/lux neural networks/vgg19 bn=false	0.661 ± 0.04 s	0.592 ± 0.016 s	1.12
runtime/lux neural networks/ViT base (compiled)	6.42 s	6.39 s	1
runtime/lux neural networks/ViT tiny (compiled)	1.7 s	1.68 s	1.01
runtime/lux neural networks/vgg11 bn=false (compiled)	2.1 s	2.13 s	0.988
runtime/lux neural networks/vgg13 bn=false (compiled)	3.01 s	2.97 s	1.01
runtime/lux neural networks/vgg16 bn=false (compiled)	3.75 s	3.72 s	1.01
runtime/lux neural networks/vgg19 bn=false (compiled)	4.56 s	4.52 s	1.01
time_to_load	1.54 ± 0.018 s	1.43 ± 0.0063 s	1.07

Benchmark Plots

A plot of the benchmark results have been uploaded as an artifact to the workflow run for this PR.
Go to "Actions"->"Benchmark a pull request"->[the most recent run]->"Artifacts" (at the bottom).

github-actions

Reactant.jl Benchmarks

Details

Benchmark suite	Current: `601c867`	Previous: `9904590`	Ratio
`ViT base (256 x 256 x 3 x 32)/forward/CUDA/Reactant`	`1322553433` ns	`1349734013` ns	`0.98`
`ViT base (256 x 256 x 3 x 32)/forward/CUDA/Lux`	`228722429` ns	`206256598` ns	`1.11`
`ViT base (256 x 256 x 3 x 32)/forward/CPU/Reactant`	`5172361198` ns	`5640616179` ns	`0.92`
`ViT base (256 x 256 x 3 x 32)/forward/CPU/Lux`	`13577737011` ns	`21088566845` ns	`0.64`
`ViT small (256 x 256 x 3 x 4)/forward/CUDA/Reactant`	`1282941637.5` ns	`1271785039.5` ns	`1.01`
`ViT small (256 x 256 x 3 x 4)/forward/CUDA/Lux`	`8852342` ns	`8622303` ns	`1.03`
`ViT small (256 x 256 x 3 x 4)/forward/CPU/Reactant`	`1620252176` ns	`1620712407` ns	`1.00`
`ViT small (256 x 256 x 3 x 4)/forward/CPU/Lux`	`2243369927` ns	`2515728657` ns	`0.89`
`ViT tiny (256 x 256 x 3 x 32)/forward/CUDA/Reactant`	`1326488266` ns	`1309552971.5` ns	`1.01`
`ViT tiny (256 x 256 x 3 x 32)/forward/CUDA/Lux`	`91954474` ns	`88993975` ns	`1.03`
`ViT tiny (256 x 256 x 3 x 32)/forward/CPU/Reactant`	`2172923706` ns	`2241028351` ns	`0.97`
`ViT tiny (256 x 256 x 3 x 32)/forward/CPU/Lux`	`5386117875.5` ns	`5778081364` ns	`0.93`
`ViT tiny (256 x 256 x 3 x 4)/forward/CUDA/Reactant`	`1343810206.5` ns	`1267184417.5` ns	`1.06`
`ViT tiny (256 x 256 x 3 x 4)/forward/CUDA/Lux`	`7564674.5` ns	`7556327.5` ns	`1.00`
`ViT tiny (256 x 256 x 3 x 4)/forward/CPU/Reactant`	`1467526138.5` ns	`1485636377.5` ns	`0.99`
`ViT tiny (256 x 256 x 3 x 4)/forward/CPU/Lux`	`1579589341` ns	`1618719051` ns	`0.98`
`ViT tiny (256 x 256 x 3 x 16)/forward/CUDA/Reactant`	`1305271383.5` ns	`1277921381` ns	`1.02`
`ViT tiny (256 x 256 x 3 x 16)/forward/CUDA/Lux`	`11605366` ns	`11579756` ns	`1.00`
`ViT tiny (256 x 256 x 3 x 16)/forward/CPU/Reactant`	`1751549749.5` ns	`1771132012` ns	`0.99`
`ViT tiny (256 x 256 x 3 x 16)/forward/CPU/Lux`	`2633901708.5` ns	`2573621234.5` ns	`1.02`
`ViT small (256 x 256 x 3 x 16)/forward/CUDA/Reactant`	`1304055953.5` ns	`1308609555` ns	`1.00`
`ViT small (256 x 256 x 3 x 16)/forward/CUDA/Lux`	`89974859` ns	`86522099` ns	`1.04`
`ViT small (256 x 256 x 3 x 16)/forward/CPU/Reactant`	`2204867166` ns	`2232948717` ns	`0.99`
`ViT small (256 x 256 x 3 x 16)/forward/CPU/Lux`	`3598317281` ns	`4522528342` ns	`0.80`
`ViT small (256 x 256 x 3 x 32)/forward/CUDA/Reactant`	`1322428054.5` ns	`1299910120.5` ns	`1.02`
`ViT small (256 x 256 x 3 x 32)/forward/CUDA/Lux`	`122634765` ns	`107942560` ns	`1.14`
`ViT small (256 x 256 x 3 x 32)/forward/CPU/Reactant`	`3087499412` ns	`3089121407` ns	`1.00`
`ViT small (256 x 256 x 3 x 32)/forward/CPU/Lux`	`10528143013` ns	`12146634131` ns	`0.87`
`ViT base (256 x 256 x 3 x 16)/forward/CUDA/Reactant`	`1287379469` ns	`1317150051` ns	`0.98`
`ViT base (256 x 256 x 3 x 16)/forward/CUDA/Lux`	`128362123` ns	`121564537` ns	`1.06`
`ViT base (256 x 256 x 3 x 16)/forward/CPU/Reactant`	`3212420542` ns	`3268410602` ns	`0.98`
`ViT base (256 x 256 x 3 x 16)/forward/CPU/Lux`	`10296045155` ns	`10888829737` ns	`0.95`
`ViT base (256 x 256 x 3 x 4)/forward/CUDA/Reactant`	`1353433771.5` ns	`1345840157` ns	`1.01`
`ViT base (256 x 256 x 3 x 4)/forward/CUDA/Lux`	`87599937.5` ns	`78626182` ns	`1.11`
`ViT base (256 x 256 x 3 x 4)/forward/CPU/Reactant`	`1885686384.5` ns	`2037797510.5` ns	`0.93`
`ViT base (256 x 256 x 3 x 4)/forward/CPU/Lux`	`2450179426` ns	`2617867593` ns	`0.94`

This comment was automatically generated by workflow using github-action-benchmark.

…e._cat_t`

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

mofeing · 2024-10-04T21:54:00Z

I was thinking to add some tests, but I'll wait to #161 to land.

@jofrevalles this should fix your problem. can you test it please?

wsmoses

Maybe add a test?

mofeing · 2024-10-05T03:49:36Z

Maybe add a test?

I found that 0-dim arrays have a similar behavior to numbers when using *cat methods, so I added some tests that should be passed by 0-dim arrays even after #161

mofeing · 2024-10-05T12:55:38Z

@avik-pal I don't know why the shapes are wrong. It seems like it's always doing a concatenation of the first direction... but did some print debugging and shape is correct in _cat_t.

It's failing on hcat and hvcat.

avik-pal · 2024-10-05T15:44:26Z

julia> x = fill(true)
0-dimensional Array{Bool, 0}:
1

julia> x_concrete = Reactant.to_rarray(x)
0-dimensional Array{Bool, 0}:
1

I don't think it is hitting the dispatches at all

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

mofeing · 2024-10-05T18:08:09Z

julia> x = fill(true)
0-dimensional Array{Bool, 0}:
1

julia> x_concrete = Reactant.to_rarray(x)
0-dimensional Array{Bool, 0}:
1

I don't think it is hitting the dispatches at all

Fixed! But probably you want to change this Union at this line

Reactant.jl/src/Tracing.jl

Line 383 in 0520fb7

if mode == ArrayToConcrete && eltype(RT) <: Union{AbstractFloat, Integer}

for the PrimitiveTypes in your PR.

avik-pal · 2024-10-05T18:25:31Z

Yes that PR has the patch

mofeing · 2024-10-05T18:30:29Z

hcat and vcat are working now; hvcat is the only one that fails because it doesn't call _cat_t.

mofeing · 2024-10-06T00:15:54Z

@avik-pal it's ready now

Remove Val constraint on Base._cat signature

2cdbb83

mofeing requested a review from avik-pal October 4, 2024 18:59

avik-pal reviewed Oct 4, 2024

View reviewed changes

Comment thread src/TracedRArray.jl Outdated

Remove Val constraint on maybe_expand_dims

9daca04

avik-pal reviewed Oct 4, 2024

View reviewed changes

Comment thread src/TracedRArray.jl Outdated

fix: update src/TracedRArray.jl

1ea20e0

github-actions Bot reviewed Oct 4, 2024

View reviewed changes

mofeing and others added 2 commits October 4, 2024 17:02

Merge branch 'main' into fix/cat-tracedrarray

a9fb926

Generalize Base._cat implementation on TracedRArray to typed `Bas…

b4c3127

…e._cat_t`

mofeing changed the title ~~Remove Val constraint on Base._cat signature~~ Generalize Base._cat to non-Val, typed Base._cat_t implementation Oct 4, 2024

Update src/TracedRArray.jl

296b0ca

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

mofeing marked this pull request as ready for review October 4, 2024 21:53

wsmoses reviewed Oct 5, 2024

View reviewed changes

Sergio Sánchez Ramírez added 2 commits October 4, 2024 23:30

Fix collection type passed to stablehlo.concatenate

f442b35

Test cat methods

5102a7f

mofeing mentioned this pull request Oct 5, 2024

feat: implement a separate TracedRNumber #161

Merged

Test result eltype on *cat methods

2f2c3bb

Fix conversion of integer arrays to ConcreteRArrays

0520fb7

github-actions Bot reviewed Oct 5, 2024

View reviewed changes

Comment thread src/Tracing.jl Outdated

Format code

a1efacc

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Sergio Sánchez Ramírez added 2 commits October 5, 2024 18:38

Fix _typed_cat, _typed_hcat, typed_hvcat dispatches

d572c76

Fix hvcat

4729f15

Sergio Sánchez Ramírez added 7 commits October 5, 2024 19:42

Convert to target eltype before cat

d85e1c4

Fix typed_hcat tests

7d28fa0

Test typed_hvncat on vectors

0975d43

Refactor tests

882ace0

Add more test cases

91a7560

Refactor tests

40734c0

Fix typo

601c867

mofeing requested a review from avik-pal October 6, 2024 00:15

mofeing linked an issue Oct 6, 2024 that may be closed by this pull request

Error with vcat #139

Closed

mofeing changed the title ~~Generalize Base._cat to non-Val, typed Base._cat_t implementation~~ Generalize Base._cat to non-Val, typed Base._cat_t and implement typed_hcat, typed_vcat, typed_hvcat, typed_hvncat Oct 6, 2024

avik-pal approved these changes Oct 6, 2024

View reviewed changes

mofeing merged commit f2c0e8a into main Oct 6, 2024

mofeing deleted the fix/cat-tracedrarray branch October 6, 2024 01:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generalize `Base._cat` to non-`Val`, typed `Base._cat_t` and implement `typed_hcat`, `typed_vcat`, `typed_hvcat`, `typed_hvncat`#163

Generalize `Base._cat` to non-`Val`, typed `Base._cat_t` and implement `typed_hcat`, `typed_vcat`, `typed_hvcat`, `typed_hvncat`#163
mofeing merged 20 commits intomainfrom
fix/cat-tracedrarray

mofeing commented Oct 4, 2024

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 4, 2024 •

edited

Loading

Uh oh!

github-actions Bot left a comment •

edited

Loading

Uh oh!

mofeing commented Oct 4, 2024 •

edited

Loading

Uh oh!

wsmoses left a comment

Uh oh!

mofeing commented Oct 5, 2024 •

edited

Loading

Uh oh!

mofeing commented Oct 5, 2024 •

edited

Loading

Uh oh!

avik-pal commented Oct 5, 2024

Uh oh!

Uh oh!

mofeing commented Oct 5, 2024

Uh oh!

avik-pal commented Oct 5, 2024

Uh oh!

mofeing commented Oct 5, 2024

Uh oh!

mofeing commented Oct 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mofeing commented Oct 4, 2024

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Benchmark Results

Benchmark Plots

Uh oh!

github-actions Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Reactant.jl Benchmarks

Uh oh!

mofeing commented Oct 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wsmoses left a comment

Choose a reason for hiding this comment

Uh oh!

mofeing commented Oct 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mofeing commented Oct 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

avik-pal commented Oct 5, 2024

Uh oh!

Uh oh!

mofeing commented Oct 5, 2024

Uh oh!

avik-pal commented Oct 5, 2024

Uh oh!

mofeing commented Oct 5, 2024

Uh oh!

mofeing commented Oct 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Oct 4, 2024 •

edited

Loading

github-actions Bot left a comment •

edited

Loading

mofeing commented Oct 4, 2024 •

edited

Loading

mofeing commented Oct 5, 2024 •

edited

Loading

mofeing commented Oct 5, 2024 •

edited

Loading