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

Gradient branch #4

Closed
wants to merge 1 commit into from
Closed

Gradient branch #4

wants to merge 1 commit into from

Conversation

jsalvatier
Copy link
Member

adds gradient calculation interface as well as better syntax for deterministic creation and many numpy-like deterministic factory functions.

@fonnesbeck
Copy link
Member

There seems to only be two small comment changes in the pull request.

@jsalvatier
Copy link
Member Author

There is some issue that I caused by accidentally committing to the master branch and then undoing those changes, so that it thinks the master is fully up to date. My Git foo is not strong enough to know how to fix this. If you look at the actual source, you'll see that there are a lot of changes. Do you have any advice on how to proceed?

@fonnesbeck
Copy link
Member

Let me have a look. Are all the same changes on gradientBranch? If so, it may be easier just to merge branches, rather than do a pull merge.

@jsalvatier
Copy link
Member Author

"all the same"? All the important changes are on gradientBranch if that's what you're asking.

@fonnesbeck
Copy link
Member

Looks like your git foo is strong -- you already merged the changes in commit a4b72f7 so there is nothing for me to do, apart from merge these two minor changes! I assume you can do that yourself ...

Looking forward to testing this. Will be a nice addition to the 2.2 release.

@jsalvatier
Copy link
Member Author

That was a mistake on my part, I tried to undo them in b36cc9f. If you're OK with me merging them myself, I can do that (reopened because I'm not sure you'll get the comment otherwise).

@fonnesbeck
Copy link
Member

Yeah, go for it. The beauty of git is that we can always undo something nasty if we need to.

This pull request was closed.
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.

2 participants