Skip to content
This repository has been archived by the owner on Mar 12, 2021. It is now read-only.

5-arg mul! with 3-arg mul! support #641

Merged
merged 5 commits into from
Mar 19, 2020

Conversation

haampie
Copy link
Member

@haampie haampie commented Mar 18, 2020

Turns out I was not right about that static if for julia 1.3.0 (the relevant commit in base was merged before the release of 1.3.1, but only made its way into julia from 1.4.0-rc1).

Otherwise this should work after JuliaGPU/GPUArrays.jl#253 is merged, because GPUArrays is stealing 3-arg mul! from CuArrays at the moment.

@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

Once we merge the GPUArrays one, do an add GPUArrays#master here so that we can run CI.

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

I believe we need the master version of CUDAnative as well because of CUDAapi 4 compat.

bors try

@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

I believe we need the master version of CUDAnative as well because of CUDAapi 4 compat.

The Manifest already listed a specific git sha. I prefer not to use just master because that might hurt reproducibility.

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

Ok, fixed that

@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

bors try

bors bot added a commit that referenced this pull request Mar 19, 2020
@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

bors d+

@bors
Copy link
Contributor

bors bot commented Mar 19, 2020

✌️ haampie can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

bors try-

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

bors try

@bors
Copy link
Contributor

bors bot commented Mar 19, 2020

try

Already running a review

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

bors try-

@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

bors try

bors bot added a commit that referenced this pull request Mar 19, 2020
@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

Oof... there's a Julia 1.4.0-x specific inconsistency / ambiguity for one last single mul! signature... Will work around it here and then make a PR for base

@bors
Copy link
Contributor

bors bot commented Mar 19, 2020

try

Build failed

@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

bors try

bors bot added a commit that referenced this pull request Mar 19, 2020
@bors
Copy link
Contributor

bors bot commented Mar 19, 2020

try

Build succeeded

@maleadt
Copy link
Member

maleadt commented Mar 19, 2020

Light at the end of the tunnel!
bors r+

@bors
Copy link
Contributor

bors bot commented Mar 19, 2020

Build succeeded

@bors bors bot merged commit 10d063c into JuliaGPU:master Mar 19, 2020
@haampie haampie deleted the fix-more-ambiguities branch March 19, 2020 18:08
@haampie
Copy link
Member Author

haampie commented Mar 19, 2020

😌

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants