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

Revise @simd documentation. #8704

Merged
merged 1 commit into from
Oct 23, 2014
Merged

Conversation

ArchRobison
Copy link
Contributor

Three changes:

nolta added a commit that referenced this pull request Oct 23, 2014
@nolta nolta merged commit 3183601 into JuliaLang:master Oct 23, 2014
@ivarne
Copy link
Member

ivarne commented Oct 23, 2014

@JuliaBackports?

Seems like this is correct for 0.3 users also? (apart from the compile-time error)

@ArchRobison
Copy link
Contributor Author

Yes, it would be good to backport it. I'd be happy to submit a pull request for that if someone will explain how to do so (I should learn this stuff). The compile-time error sentence should be changed to something such as:

A ``break``, ``continue``, or ``goto`` in an @simd loop may cause wrong results.

@staticfloat
Copy link
Member

Submitting a backport PR is pretty simple. First, you'll want to create a new branch based off of release-0.3, rather than master, since if you try to merge something that's based off of master, it will bring a bunch of commits along for the ride.

Probably the easiest way to do this, is to try and cherry-pick the commit here onto a new branch that is based off of release-0.3. E.g.:

$ git checkout release-0.3
$ git checkout -b my_new_branch
$ git cherry-pick a3a0d6c6d

This will attempt to apply the diff represented by a3a0d6c onto the current state of the release-0.3 branch, and you can then create a PR from my_new_branch against the release-0.3 branch on JuliaLang/julia. Note that you need to select release-0.3 in the dropdown box that typically says master when creating your pull request.

@ivarne
Copy link
Member

ivarne commented Oct 24, 2014

I'd also recommend to keep a separate directory for release-0.3, as changing branches takes some time and might discover bugs in our makefiles.

For documentation backports, you can also push them directly into the repository and just link the commit here, instead of creating a branch and a PR.

-e -x is also two nice options to cherry-pick. -e lets you edit the commit message (eg. to add a #link to the pull request), and -x adds the sha of the original commit.

ArchRobison pushed a commit to ArchRobison/julia that referenced this pull request Oct 24, 2014
…esults.

(cherry picked and edited from commit a3a0d6c)
ref: JuliaLang#8704
@ArchRobison
Copy link
Contributor Author

Thanks for the pointers. I ended up creating a pull request and merging it, because I wanted to go through the steps of merging a PR (and I figured practicing on documentation was safer than code.)

@ArchRobison ArchRobison deleted the adr/simddoc branch January 5, 2015 17:03
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.

4 participants