[SPARK-10266][Documentation, ML] Fixed @Since annotation for ml.tunning #8729

ehsanmok · 2015-09-12T00:59:03Z

No description provided.

yu-iskw · 2015-10-20T23:01:09Z

mllib/src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala

Fix the indentations for the parameters. There is no problem about the @Since tag.

ehsanmok · 2015-10-20T23:32:13Z

I suspected that might be an issue, but the indentations were automatic in intelliJ!

mengxr · 2015-10-20T23:50:09Z

@ehsanmok Could you fix it manually and resolve conflicts with master? The default IntelliJ code style doesn't follow the Spark code style guide. It is important to keep the code style consistent across the codebase.

mengxr · 2015-10-20T23:50:33Z

ok to test

SparkQA · 2015-10-21T00:00:25Z

Test build #44020 has finished for PR 8729 at commit 40dc4f2.

This patch fails Scala style tests.
This patch does not merge cleanly.
This patch adds the following public classes (experimental):
- final class DecisionTreeRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressionModel @Since("1.4.0") (
- class IsotonicRegression @Since("1.5.0") (@Since("1.5.0") override val uid: String)
- class LinearRegression @Since("1.3.0") (@Since("1.3.0") override val uid: String)
- final class RandomForestRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- class CrossValidator @Since("1.2.0") (@Since("1.2.0") override val uid: String)
- class TrainValidationSplit @Since("1.5.0") (@Since("1.5.0") override val uid: String)

ehsanmok · 2015-10-21T00:40:50Z

@mengxr Sure! should be ok now.

SparkQA · 2015-10-21T00:54:47Z

Test build #44023 has finished for PR 8729 at commit eb4f580.

This patch fails Scala style tests.
This patch does not merge cleanly.
This patch adds the following public classes (experimental):
- final class DecisionTreeRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressionModel @Since("1.4.0") (
- class IsotonicRegression @Since("1.5.0") (@Since("1.5.0") override val uid: String)
- class LinearRegression @Since("1.3.0") (@Since("1.3.0") override val uid: String)
- final class RandomForestRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- class CrossValidator @Since("1.2.0") (@Since("1.2.0") override val uid: String)
- class TrainValidationSplit @Since("1.5.0") (@Since("1.5.0") override val uid: String)

ehsanmok · 2015-10-21T01:29:55Z

@mengxr @yu-iskw Which line in DecisionTreeRegressor.scala it's referring to? the log is not very helpful. I've looked at the coding style as well as the code base, but cannot find what that is!

mengxr · 2015-10-21T01:42:00Z

Ignore the comment from @SparkQA . You need to first merge current master and resolve conflicts, and then run dev/lint-scala to check code style on your local computer.

SparkQA · 2015-10-21T20:17:21Z

Test build #44085 has finished for PR 8729 at commit 338bbf8.

This patch fails Scala style tests.
This patch does not merge cleanly.
This patch adds the following public classes (experimental):
- final class DecisionTreeRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- final class GBTRegressionModel @Since("1.4.0") (
- class IsotonicRegression @Since("1.5.0") (@Since("1.5.0") override val uid: String)
- class LinearRegression @Since("1.3.0") (@Since("1.3.0") override val uid: String)
- final class RandomForestRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
- class CrossValidator @Since("1.2.0") (@Since("1.2.0") override val uid: String)
- class TrainValidationSplit @Since("1.5.0") (@Since("1.5.0") override val uid: String)

ehsanmok · 2015-10-21T21:52:24Z

@mengxr sorry for taking your time, but what's the issue now? everything is updated and all dev/lint-scala tests have passed locally!

SparkQA · 2015-10-21T22:51:58Z

Test build #44097 has finished for PR 8729 at commit 45472f0.

This patch fails Scala style tests.
This patch merges cleanly.
This patch adds the following public classes (experimental):\n * final class DecisionTreeRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * final class GBTRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * final class GBTRegressionModel @Since(\"1.4.0\") (\n * class IsotonicRegression @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n * class LinearRegression @Since(\"1.3.0\") (@Since(\"1.3.0\") override val uid: String)\n * final class RandomForestRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class CrossValidator @Since(\"1.2.0\") (@Since(\"1.2.0\") override val uid: String)\n * class TrainValidationSplit @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n

SparkQA · 2015-10-21T23:37:24Z

Test build #44099 has finished for PR 8729 at commit 353f23a.

This patch fails Scala style tests.
This patch merges cleanly.
This patch adds the following public classes (experimental):\n * final class DecisionTreeRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * final class GBTRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class IsotonicRegression @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n * class LinearRegression @Since(\"1.3.0\") (@Since(\"1.3.0\") override val uid: String)\n * final class RandomForestRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class CrossValidator @Since(\"1.2.0\") (@Since(\"1.2.0\") override val uid: String)\n * class TrainValidationSplit @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n * case class First(child: Expression, ignoreNullsExpr: Expression) extends DeclarativeAggregate\n * case class Last(child: Expression, ignoreNullsExpr: Expression) extends DeclarativeAggregate\n * case class First(\n * case class FirstFunction(\n * case class Last(\n * case class LastFunction(\n

ehsanmok · 2015-10-23T18:49:58Z

After dev/lint-scala should I include the build/sbt-launch-0.13.7.jar.part as well?

yu-iskw · 2015-10-23T19:35:16Z

mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala

Resolve this conflict.

yu-iskw · 2015-10-23T19:49:14Z

You don't need to include it. You should fix style errors which are pointed out by dev/lint-scala. According to the Jenkins result, there are some White space at end of line errors.

This is a result of grep in your branch, checking out it to my local computer.

> grep -n -iRe "\s\s*$" mllib/ | grep "\.scala"
mllib//src/main/scala/org/apache/spark/ml/regression/DecisionTreeRegressor.scala:59:  @Since("1.4.0")
mllib//src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala:184:
mllib//src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala:201:
mllib//src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala:206:

SparkQA · 2015-10-23T21:04:20Z

Test build #44256 has finished for PR 8729 at commit 4cbb69f.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

ehsanmok · 2015-10-23T21:08:25Z

@yu-iskw Thank you very much! I don't know why I missed those in git diff. Btw that was a good learning experience indeed.

yu-iskw · 2015-10-23T22:00:03Z

@ehsanmok thank you for the update. Did you update the branch with git merge? If so, I think you should use git rebase to commit to the updated upstream head. Because you should separate your patchs and master updates. The last your commit seems to involve the master update. Could you revert the last commit and then git rebase master?

ehsanmok · 2015-10-23T23:54:03Z

@yu-iskw I did 'git merge' but couldn't rebase for some reason! It took me very long time to understand where the issue was! didn't want to make all these commits. Don't know why this simple thing has become a headache to me!

SparkQA · 2015-10-23T23:57:25Z

Test build #44271 has finished for PR 8729 at commit 0fc6619.

This patch fails Scala style tests.
This patch merges cleanly.
This patch adds the following public classes (experimental):\n * final class DecisionTreeRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * final class GBTRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class IsotonicRegression @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n * class LinearRegression @Since(\"1.3.0\") (@Since(\"1.3.0\") override val uid: String)\n * final class RandomForestRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class CrossValidator @Since(\"1.2.0\") (@Since(\"1.2.0\") override val uid: String)\n * class TrainValidationSplit @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n

SparkQA · 2015-10-24T03:25:00Z

Test build #44273 has finished for PR 8729 at commit a9ed325.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

yu-iskw · 2015-10-24T03:52:35Z

@ehsanmok thank you for the update. I'm afraid your repo still includes the master updates. As you can see at https://github.com/apache/spark/pull/8729/files, there are many files that are not related this issue.

I think making a new branch is a easy way to solve this problem. First, make a new branch whose name is same as JIRA-10266 based on the master. And then, cherry pick your patchs related to only this issue to the new branch. Instead of, It would be also great to patch what you changed manually. After that, push the new repo to JIRA-10266 on GitHub, that is, replace it. Otherwise, I could also send a PR to you.

ehsanmok · 2015-10-26T17:17:46Z

@yu-iskw Thanks for your kind suggestions. Sure, I am going to do that asap.

ehsanmok · 2015-10-27T17:32:53Z

@yu-iskw The problem I kept having is my master was polluted with unwanted commits and so I reset hard and pulled from upstream/master and pushed master updates as "update master", then I checked out on JIRA-10266 branch and reset that as well and pulled updates from master and resolved conflicts and pushed as the last commit. What do you think about this if I don't want to have master updates here?

SparkQA · 2015-10-27T18:19:16Z

Test build #44449 has finished for PR 8729 at commit 27c9cc8.

This patch passes all tests.
This patch merges cleanly.
This patch adds the following public classes (experimental):\n * final class DecisionTreeRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * final class GBTRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class IsotonicRegression @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n * class LinearRegression @Since(\"1.3.0\") (@Since(\"1.3.0\") override val uid: String)\n * final class RandomForestRegressor @Since(\"1.4.0\") (@Since(\"1.4.0\") override val uid: String)\n * class CrossValidator @Since(\"1.2.0\") (@Since(\"1.2.0\") override val uid: String)\n * class TrainValidationSplit @Since(\"1.5.0\") (@Since(\"1.5.0\") override val uid: String)\n

yu-iskw · 2015-10-28T18:27:39Z

@ehsanmok it would be great not to have the master update commits in your branch. Personally, I think you should use git rebase instead of git pull.

Could you please close this PR? I'll send a new one about this issue. Since I couldn't send a PR to improve your branch. I'd like to separate resolving this issue and explaining git operations. It would be great to do that on #8728.

ehsanmok · 2015-10-28T18:35:44Z

@yu-iskw Sure, I'll close it. But do you mean, first test #8728 then do this one?

yu-iskw · 2015-10-28T18:47:34Z

@ehnalis could you wait for the first test on #8728. We should know if there are any conflicts with the master or not. If there are any ones, we need to update your #8728 PR with git rebase. Anyway, let me expnain how to update your branch again on #8728.

Just to be sure, I'll work on SPARK-10266. So you shouldn't resend a new PR about SPARK-10266.
Thank you for your contribution!

cc mengxr noel-smith I worked on this issues based on #8729. ehsanmok thank you for your contricution! Author: Yu ISHIKAWA <[email protected]> Author: Ehsan M.Kermani <[email protected]> Closes #9338 from yu-iskw/JIRA-10266. (cherry picked from commit de07d06) Signed-off-by: Xiangrui Meng <[email protected]>

cc mengxr noel-smith I worked on this issues based on #8729. ehsanmok thank you for your contricution! Author: Yu ISHIKAWA <[email protected]> Author: Ehsan M.Kermani <[email protected]> Closes #9338 from yu-iskw/JIRA-10266.

ehsanmok added 2 commits September 11, 2015 16:49

Since annotation for ml.regression

1063243

Since annotation for ml.tuning

40dc4f2

yu-iskw reviewed Oct 20, 2015
View reviewed changes

indentations fixed

eb4f580

coding style fixed

338bbf8

yu-iskw reviewed Oct 23, 2015
View reviewed changes

mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala Outdated

Copy link

Contributor

yu-iskw Oct 23, 2015

Choose a reason for hiding this comment

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

Resolve this conflict.

update master

a35ec08

renewed commits for JIRA-10266

27c9cc8

ehsanmok closed this Oct 28, 2015

yu-iskw mentioned this pull request Oct 28, 2015

[SPARK-10266][Documentation, ML] Fixed @Since annotation for ml.tunning #9338

Closed

ehsanmok deleted the JIRA-10266 branch November 8, 2015 17:43

[SPARK-10266][Documentation, ML] Fixed @Since annotation for ml.tunning #8729

[SPARK-10266][Documentation, ML] Fixed @Since annotation for ml.tunning #8729

Uh oh!

Conversation

ehsanmok commented Sep 12, 2015

Uh oh!

yu-iskw Oct 20, 2015

Choose a reason for hiding this comment

Uh oh!

ehsanmok commented Oct 20, 2015

Uh oh!

mengxr commented Oct 20, 2015

Uh oh!

mengxr commented Oct 20, 2015

Uh oh!

SparkQA commented Oct 21, 2015

Uh oh!

ehsanmok commented Oct 21, 2015

Uh oh!

SparkQA commented Oct 21, 2015

Uh oh!

ehsanmok commented Oct 21, 2015

Uh oh!

mengxr commented Oct 21, 2015

Uh oh!

SparkQA commented Oct 21, 2015

Uh oh!

ehsanmok commented Oct 21, 2015

Uh oh!

SparkQA commented Oct 21, 2015

Uh oh!

SparkQA commented Oct 21, 2015

Uh oh!

ehsanmok commented Oct 23, 2015

Uh oh!

yu-iskw Oct 23, 2015

Choose a reason for hiding this comment

Uh oh!

yu-iskw commented Oct 23, 2015

Uh oh!

SparkQA commented Oct 23, 2015

Uh oh!

ehsanmok commented Oct 23, 2015

Uh oh!

yu-iskw commented Oct 23, 2015

Uh oh!

ehsanmok commented Oct 23, 2015

Uh oh!

SparkQA commented Oct 23, 2015

Uh oh!

SparkQA commented Oct 24, 2015

Uh oh!

yu-iskw commented Oct 24, 2015

Uh oh!

ehsanmok commented Oct 26, 2015

Uh oh!

ehsanmok commented Oct 27, 2015

Uh oh!

SparkQA commented Oct 27, 2015

Uh oh!

yu-iskw commented Oct 28, 2015

Uh oh!

ehsanmok commented Oct 28, 2015

Uh oh!

yu-iskw commented Oct 28, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants