From 0f45a95122e7f3394d3b53e95d4540f1d7e88094 Mon Sep 17 00:00:00 2001 From: songhappy Date: Mon, 29 Aug 2022 16:38:14 -0700 Subject: [PATCH 1/2] fix dllib pom scope and typo in examples --- scala/dllib/pom.xml | 2 -- .../bigdl/dllib/example/localEstimator/Cifar10DataLoader.scala | 2 +- .../bigdl/dllib/example/localEstimator/ImageProcessing.scala | 2 +- .../dllib/example/localEstimator/LenetLocalEstimator.scala | 2 +- .../bigdl/dllib/example/localEstimator/MnistDataLoader.scala | 2 +- .../dllib/example/localEstimator/ResnetLocalEstimator.scala | 2 +- .../example/nnframes/imageInference/ImageInferenceExample.scala | 2 +- .../nnframes/imageTransferLearning/ImageTransferLearning.scala | 2 +- .../example/nnframes/xgboost/xgbClassifierPredictExample.scala | 2 +- .../example/nnframes/xgboost/xgbClassifierTrainingExample.scala | 2 +- .../xgbClassifierTrainingExampleOnCriteoClickLogsDataset.scala | 2 +- 11 files changed, 10 insertions(+), 12 deletions(-) diff --git a/scala/dllib/pom.xml b/scala/dllib/pom.xml index 5f3b6f97163..f653a7ce321 100644 --- a/scala/dllib/pom.xml +++ b/scala/dllib/pom.xml @@ -324,13 +324,11 @@ log4j log4j 1.2.17 - test org.slf4j slf4j-log4j12 1.7.16 - test diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/Cifar10DataLoader.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/Cifar10DataLoader.scala index 39397784c60..dead9e3c14d 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/Cifar10DataLoader.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/Cifar10DataLoader.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.localEstimator +package com.intel.analytics.bigdl.dllib.example.localEstimator import java.nio.ByteBuffer import java.nio.file.{Files, Paths} diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ImageProcessing.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ImageProcessing.scala index d57376b08fa..7a4c46b448c 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ImageProcessing.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ImageProcessing.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.localEstimator +package com.intel.analytics.bigdl.dllib.example.localEstimator import java.awt.image.{BufferedImage, DataBufferByte} import java.nio.ByteBuffer diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/LenetLocalEstimator.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/LenetLocalEstimator.scala index d454f12c69f..dd0017fe699 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/LenetLocalEstimator.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/LenetLocalEstimator.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.localEstimator +package com.intel.analytics.bigdl.dllib.example.localEstimator import com.intel.analytics.bigdl.Module import com.intel.analytics.bigdl.dllib.models.lenet.LeNet5 diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/MnistDataLoader.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/MnistDataLoader.scala index cff3519f8c5..174ef0ef659 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/MnistDataLoader.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/MnistDataLoader.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.localEstimator +package com.intel.analytics.bigdl.dllib.example.localEstimator import java.io.ByteArrayOutputStream import java.net.URI diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ResnetLocalEstimator.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ResnetLocalEstimator.scala index f3578c1be5d..18fd688f445 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ResnetLocalEstimator.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/localEstimator/ResnetLocalEstimator.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.localEstimator +package com.intel.analytics.bigdl.dllib.example.localEstimator import com.intel.analytics.bigdl.Module import com.intel.analytics.bigdl.dllib.models.resnet.ResNet diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageInference/ImageInferenceExample.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageInference/ImageInferenceExample.scala index 47ae046ee72..2d2d0021d7b 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageInference/ImageInferenceExample.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageInference/ImageInferenceExample.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.nnframes.imageInference +package com.intel.analytics.bigdl.dllib.example.nnframes.imageInference import com.intel.analytics.bigdl.dllib.nn.Module import com.intel.analytics.bigdl.dllib.tensor.TensorNumericMath.TensorNumeric.NumericFloat diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageTransferLearning/ImageTransferLearning.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageTransferLearning/ImageTransferLearning.scala index 03116209f54..b05f7da9090 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageTransferLearning/ImageTransferLearning.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/imageTransferLearning/ImageTransferLearning.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.nnframes.imageTransferLearning +package com.intel.analytics.bigdl.dllib.example.nnframes.imageTransferLearning import com.intel.analytics.bigdl.dllib.nn._ import com.intel.analytics.bigdl.dllib.optim.Adam diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierPredictExample.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierPredictExample.scala index 8c931123a2b..8580c3514b2 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierPredictExample.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierPredictExample.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.nnframes.xgboost +package com.intel.analytics.bigdl.dllib.example.nnframes.xgboost import com.intel.analytics.bigdl.dllib.NNContext import com.intel.analytics.bigdl.dllib.nnframes.XGBClassifierModel diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExample.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExample.scala index d911035bacb..56a9644d57d 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExample.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExample.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.nnframes.xgboost +package com.intel.analytics.bigdl.dllib.example.nnframes.xgboost import ml.dmlc.xgboost4j.scala.spark.TrackerConf diff --git a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExampleOnCriteoClickLogsDataset.scala b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExampleOnCriteoClickLogsDataset.scala index 912cba17bb5..8c3ccf67f00 100644 --- a/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExampleOnCriteoClickLogsDataset.scala +++ b/scala/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/example/nnframes/xgboost/xgbClassifierTrainingExampleOnCriteoClickLogsDataset.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.analytics.bigdl.dllib.examples.nnframes.xgboost +package com.intel.analytics.bigdl.dllib.example.nnframes.xgboost import com.intel.analytics.bigdl.dllib.NNContext import com.intel.analytics.bigdl.dllib.nnframes.XGBClassifier From 3908387006bc5b451b412d8f4a19ffa5538afb4d Mon Sep 17 00:00:00 2001 From: songhappy Date: Tue, 6 Sep 2022 17:06:47 -0700 Subject: [PATCH 2/2] comments --- scala/dllib/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scala/dllib/pom.xml b/scala/dllib/pom.xml index f653a7ce321..5f3b6f97163 100644 --- a/scala/dllib/pom.xml +++ b/scala/dllib/pom.xml @@ -324,11 +324,13 @@ log4j log4j 1.2.17 + test org.slf4j slf4j-log4j12 1.7.16 + test