Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix IRTools on Julia 1.6 #83

Merged
merged 2 commits into from
Nov 26, 2020

Conversation

simeonschaub
Copy link
Collaborator

Still needs JuliaLang/julia#38519. This passes all tests for me locally, but coverage is not great, so there might still be cases I missed.

terminator = true
elseif isexpr(ex, GotoNode, :return)
elseif ex isa GotoNode || isreturn(ex)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be &&?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I am pretty sure this is correct: https://github.com/FluxML/MacroTools.jl/blob/a03742057f388899833c9000ebf56dbd9616a6d5/src/utils.jl#L39. ex can only be either a GotoNode or a ReturnNode, not both.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool

@simeonschaub
Copy link
Collaborator Author

Nightly tests pass! 🎉 Could anyone merge this?

@femtomc
Copy link

femtomc commented Nov 26, 2020

@DhairyaLGandhi

@DhairyaLGandhi
Copy link
Member

Thanks, this is great! I will run this with Zygote and Flux on 1.6, and get on it

@simeonschaub
Copy link
Collaborator Author

FYI, this isn't enough for Zygote yet. I have started working on that in this branch and a corresponding one for ZygoteRules, but I don't currently have time to further look into what it would take to get all Zygote tests to pass on 1.6

@DhairyaLGandhi
Copy link
Member

Ah, alright, for now let's merge this, thanks again!

@DhairyaLGandhi DhairyaLGandhi merged commit 47f5627 into FluxML:master Nov 26, 2020
@simeonschaub simeonschaub deleted the sds/fix_on_master branch November 26, 2020 19:50
@simeonschaub
Copy link
Collaborator Author

Would it be possible to also tag a new release?

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

Successfully merging this pull request may close these issues.

None yet

4 participants