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.

Sign up for GitHub

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

chore: upgrade lightgbm to 3.2.100 #1015

Merged
merged 1 commit into from
Apr 5, 2021
Merged

chore: upgrade lightgbm to 3.2.100 #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ libraryDependencies ++= Seq(
"com.microsoft.cognitiveservices.speech" % "client-sdk" % "1.14.0",
"org.apache.httpcomponents" % "httpclient" % "4.5.6",
"org.apache.httpcomponents" % "httpmime" % "4.5.6",
"com.microsoft.ml.lightgbm" % "lightgbmlib" % "2.3.180",
"com.microsoft.ml.lightgbm" % "lightgbmlib" % "3.2.100",
"com.github.vowpalwabbit" % "vw-jni" % "8.9.1",
"com.linkedin.isolation-forest" %% "isolation-forest_3.0.0" % "1.0.1",
).map(d => d excludeAll (excludes: _*))
Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/microsoft/ml/spark/lightgbm/LightGBMBooster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class LightGBMBooster(val model: String) extends Serializable {
sparseVector.indices, sparseVector.values,
sparseVector.numNonzeros,
boosterHandler.boosterPtr, dataInt32bitType, data64bitType, 2, numCols,
kind, -1, datasetParams,
kind, 0, -1, datasetParams,
dataLengthLongPtr, dataOutPtr), "Booster Predict")
}

Expand All @@ -270,7 +270,7 @@ class LightGBMBooster(val model: String) extends Serializable {
row, boosterHandler.boosterPtr, data64bitType,
numCols,
isRowMajor, kind,
-1, datasetParams, dataLengthLongPtr, dataOutPtr),
0, -1, datasetParams, dataLengthLongPtr, dataOutPtr),
"Booster Predict")
}

Expand All @@ -286,7 +286,7 @@ class LightGBMBooster(val model: String) extends Serializable {
}

def dumpModel(session: SparkSession, filename: String, overwrite: Boolean): Unit = {
val json = lightgbmlib.LGBM_BoosterDumpModelSWIG(boosterHandler.boosterPtr, 0, 0, 1,
val json = lightgbmlib.LGBM_BoosterDumpModelSWIG(boosterHandler.boosterPtr, 0, -1, 0, 1,
boosterHandler.dumpModelOutPtr.get().ptr)
val rdd = session.sparkContext.parallelize(Seq(json))
import session.sqlContext.implicits._
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/microsoft/ml/spark/lightgbm/TrainUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ private object TrainUtils extends Serializable {
def saveBoosterToString(boosterPtr: Option[SWIGTYPE_p_void], log: Logger): String = {
val bufferLength = LightGBMConstants.DefaultBufferLength
val bufferOutLengthPtr = lightgbmlib.new_int64_tp()
lightgbmlib.LGBM_BoosterSaveModelToStringSWIG(boosterPtr.get, 0, -1, bufferLength, bufferOutLengthPtr)
lightgbmlib.LGBM_BoosterSaveModelToStringSWIG(boosterPtr.get, 0, -1, 0, bufferLength, bufferOutLengthPtr)
}

def getEvalNames(boosterPtr: Option[SWIGTYPE_p_void]): Array[String] = {
Expand Down
26 changes: 13 additions & 13 deletions src/test/resources/benchmarks/benchmarks_VerifyLightGBMClassifier.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name,value,precision,higherIsBetter
LightGBMClassifier_BreastTissue.csv_gbdt,0.7924528301886793,0.07,true
LightGBMClassifier_BreastTissue.csv_gbdt,0.8773584905660378,0.07,true
LightGBMClassifier_BreastTissue.csv_rf,0.7547169811320755,0.07,true
LightGBMClassifier_BreastTissue.csv_dart,0.8301886792452831,0.07,true
LightGBMClassifier_BreastTissue.csv_goss,0.839622641509434,0.07,true
LightGBMClassifier_BreastTissue.csv_dart,0.8584905660377359,0.07,true
LightGBMClassifier_BreastTissue.csv_goss,0.8773584905660378,0.07,true
LightGBMClassifier_CarEvaluation.csv_gbdt,0.7528935185185185,0.01,true
LightGBMClassifier_CarEvaluation.csv_rf,0.7453703703703703,0.01,true
LightGBMClassifier_CarEvaluation.csv_dart,0.7002314814814815,0.01,true
LightGBMClassifier_CarEvaluation.csv_rf,0.6666666666666666,0.01,true
LightGBMClassifier_CarEvaluation.csv_dart,0.7528935185185185,0.01,true
LightGBMClassifier_CarEvaluation.csv_goss,0.7528935185185185,0.01,true
LightGBMClassifier_PimaIndian.csv_gbdt,0.8676753731343283,0.1,true
LightGBMClassifier_PimaIndian.csv_gbdt,0.8682723880597015,0.1,true
LightGBMClassifier_PimaIndian.csv_rf,0.8449402985074626,0.1,true
LightGBMClassifier_PimaIndian.csv_dart,0.8665149253731343,0.1,true
LightGBMClassifier_PimaIndian.csv_goss,0.8682723880597015,0.1,true
LightGBMClassifier_PimaIndian.csv_dart,0.8682798507462689,0.1,true
LightGBMClassifier_PimaIndian.csv_goss,0.8676753731343283,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_gbdt,0.9842261520588615,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_rf,0.945937136956241,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_dart,0.9819962566154641,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_rf,0.945234714513145,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_dart,0.9817079729787875,0.1,true
LightGBMClassifier_data_banknote_authentication.csv_goss,0.9845542360483628,0.1,true
LightGBMClassifier_task.train.csv_gbdt,0.8947718416855595,0.1,true
LightGBMClassifier_task.train.csv_rf,0.8846443439598345,0.1,true
Expand All @@ -23,11 +23,11 @@ LightGBMClassifier_breast-cancer.train.csv_gbdt,0.9919775679936218,0.1,true
LightGBMClassifier_breast-cancer.train.csv_rf,0.9873797314682273,0.1,true
LightGBMClassifier_breast-cancer.train.csv_dart,0.989821341209299,0.1,true
LightGBMClassifier_breast-cancer.train.csv_goss,0.9919775679936218,0.1,true
LightGBMClassifier_random.forest.train.csv_gbdt,0.9945531305363942,0.1,true
LightGBMClassifier_random.forest.train.csv_gbdt,0.994477741339666,0.1,true
LightGBMClassifier_random.forest.train.csv_rf,0.9913019714274944,0.1,true
LightGBMClassifier_random.forest.train.csv_dart,0.9941196426552075,0.1,true
LightGBMClassifier_random.forest.train.csv_goss,0.9945531305363942,0.1,true
LightGBMClassifier_transfusion.csv_gbdt,0.7858170707668046,0.1,true
LightGBMClassifier_transfusion.csv_gbdt,0.7824315000985611,0.1,true
LightGBMClassifier_transfusion.csv_rf,0.7596441947565543,0.1,true
LightGBMClassifier_transfusion.csv_dart,0.7794795978710821,0.1,true
LightGBMClassifier_transfusion.csv_dart,0.7791494184900454,0.1,true
LightGBMClassifier_transfusion.csv_goss,0.7858170707668046,0.1,true
20 changes: 10 additions & 10 deletions src/test/resources/benchmarks/benchmarks_VerifyLightGBMRegressor.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name,value,precision,higherIsBetter
LightGBMRegressor_energyefficiency2012_data.train.csv_gbdt,4.060810868085499,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_rf,2.3689403192923617,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_dart,4.60773612916636,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_goss,4.0563924179814554,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_gbdt,4.056513300776592,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_rf,2.4550970643111536,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_dart,4.607301076597617,1.0,false
LightGBMRegressor_energyefficiency2012_data.train.csv_goss,4.056513300776592,1.0,false
LightGBMRegressor_airfoil_self_noise.train.csv_gbdt,5.060603042317274,0.1,false
LightGBMRegressor_airfoil_self_noise.train.csv_rf,5.038870130188365,0.1,false
LightGBMRegressor_airfoil_self_noise.train.csv_rf,5.004385296648078,0.1,false
LightGBMRegressor_airfoil_self_noise.train.csv_dart,5.227845751825481,0.1,false
LightGBMRegressor_airfoil_self_noise.train.csv_goss,5.060603042317274,0.1,false
LightGBMRegressor_Buzz.TomsHardware.train.csv_gbdt,5596.462219593434,1000.0,false
LightGBMRegressor_Buzz.TomsHardware.train.csv_rf,4055.531495698473,1000.0,false
LightGBMRegressor_Buzz.TomsHardware.train.csv_rf,3985.180875011436,1000.0,false
LightGBMRegressor_Buzz.TomsHardware.train.csv_dart,6226.68849116051,1000.0,false
LightGBMRegressor_Buzz.TomsHardware.train.csv_goss,5560.4593450730345,1000.0,false
LightGBMRegressor_machine.train.csv_gbdt,101.33455012081083,100.0,false
LightGBMRegressor_machine.train.csv_rf,97.02342678370792,100.0,false
LightGBMRegressor_machine.train.csv_rf,94.92657581608803,100.0,false
LightGBMRegressor_machine.train.csv_dart,104.82166047781314,100.0,false
LightGBMRegressor_machine.train.csv_goss,100.77960482949103,100.0,false
LightGBMRegressor_machine.train.csv_goss,101.33455012081083,100.0,false
LightGBMRegressor_Concrete_Data.train.csv_gbdt,10.74708157454394,1.0,false
LightGBMRegressor_Concrete_Data.train.csv_rf,11.16402892446869,1.0,false
LightGBMRegressor_Concrete_Data.train.csv_rf,11.073837461910365,1.0,false
LightGBMRegressor_Concrete_Data.train.csv_dart,11.293857554640548,1.0,false
LightGBMRegressor_Concrete_Data.train.csv_goss,10.74708157454394,1.0,false
LightGBMRegressor_Concrete_Data.train.csv_goss,10.724926727333045,1.0,false