Skip to content

[SPARK-2550][MLLIB][APACHE SPARK] Support regularization and intercept in pyspark's linear methods#1613

Closed
miccagiann wants to merge 11 commits intoapache:masterfrom
miccagiann:master
Closed

[SPARK-2550][MLLIB][APACHE SPARK] Support regularization and intercept in pyspark's linear methods#1613
miccagiann wants to merge 11 commits intoapache:masterfrom
miccagiann:master

Conversation

@miccagiann
Copy link
Contributor

SPARK-2550
Python API doesn't provide options to set regularization parameter and intercept in linear methods, which should be fixed in v1.1.

@miccagiann miccagiann closed this Jul 28, 2014
@miccagiann miccagiann reopened this Jul 28, 2014
@miccagiann miccagiann changed the title [SPARK-2550](https://issues.apache.org/jira/browse/SPARK-2550?jql=project%20%3D%20SPARK%20AND%20resolution%20%3D%20Unresolved%20AND%20priority%20%3D%20Major%20ORDER%20BY%20key%20DESC) [MLLIB] [APACHE SPARK] Support regularization and intercept in pyspark's linear methods [SPARK-2550][MLLIB][APACHE SPARK] Support regularization and intercept in pyspark's linear methods Jul 28, 2014
@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@miccagiann
Copy link
Contributor Author

Hi AmplabJenkins,

I would like to ask you something technical. How is it possible to hide all my previous commits related to a previously closed pull request and only include to this pull request my last commit? Any suggestions?

@miccagiann miccagiann closed this Jul 28, 2014
@miccagiann miccagiann reopened this Jul 28, 2014
@JoshRosen
Copy link
Contributor

Hi @miccagiann,

Until it's merged, this pull request will be automatically updated to contain any commits added to the branch that you opened it from. It looks like you've opened this PR from the master branch of your repository and accidentally included some unwanted commits. I'd recommend closing this pull request, creating a new topic branch in your repository that contains only the commits that you want to be included in the pull request, and opening a new pull request based off that branch (you might find GitHub's "Using pull requests" guide to be helpful).

I like to keep my master branch in sync with the apache/spark repository and do my work in topic branches based off of it. To migrate from your current repository state to this workflow, I'd try doing something like this:

git fetch apache  # Fetch the latest commits from the upstream Spark repo
                  # (might be named something other than 'apache')
git checkout master
git checkout -b old-master  # Create a new branch pointing to the current master, so we don't lose those commits.
git checkout master  # Switch back to your master branch
git reset --hard apache/master  # Force-reset your master branch to match the apache master branch
git checkout -b my-feature-branch  # Create a new branch to develop your pull request in

Now you should be on my-feature-branch. Normally, you'd make commits against this feature branch, but in this case we want to grab some of the commits from your old master branch and apply them here. You can do that with cherry-pick:

git log old-master  # List the commits in your old branch
git cherry-pick sha-of-commit-you-want

Now, my-feature-branch should be in a good state, containing only the commits you want, and you should be able to push it to GitHub and open a new PR.

@srowen
Copy link
Member

srowen commented Jul 28, 2014

(PS AmplabJenkins is not a person, it's the Jenkins bot. It would blow my mind if he answered!)

Josh gives everything you need to know there to fix your setup. By the way, the command to update your miccagiann/master to match apache/master is git pull --rebase apache master (replace apache with what you've called the upstream remote) and git push origin master. That's all that should happen in your master. You would always begin working on a new change in a new branch from a freshly-synced master: it's the git checkout -b my-new-branch part.

@miccagiann
Copy link
Contributor Author

Thank you guys, I am going to resolve this issue.

@miccagiann
Copy link
Contributor Author

I am closing this pull request and I am going to create a new one that is going to include the new commit only. Thank you so much for your help!

@miccagiann miccagiann closed this Jul 28, 2014
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