Update default value of AUC to 200 (#238)

* update * typo
intel · May 22, 2018 · a95b938 · a95b938
1 parent 8240713
commit a95b938
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/pyzoo/zoo/examples/nnframes/imageInference/ImageInferenceExample.py b/pyzoo/zoo/examples/nnframes/imageInference/ImageInferenceExample.py
@@ -44,7 +44,7 @@ def inference(image_path, model_path, sc):
         print("Need parameters: <modelPath> <imagePath>")
         exit(-1)
 
-    sc = get_nncontext()
+    sc = get_nncontext("image_inference")
 
     model_path = sys.argv[1]
     image_path = sys.argv[2]

diff --git a/pyzoo/zoo/pipeline/api/keras/metrics/auc.py b/pyzoo/zoo/pipeline/api/keras/metrics/auc.py
@@ -32,5 +32,5 @@ class AUC(JavaValue):
     >>> meter = AUC(20)
     creating: createAUC
     """
-    def __init__(self, threshold_num, bigdl_type="float"):
+    def __init__(self, threshold_num=200, bigdl_type="float"):
         JavaValue.__init__(self, None, bigdl_type, threshold_num)
diff --git a/pyzoo/zoo/pipeline/api/keras/utils.py b/pyzoo/zoo/pipeline/api/keras/utils.py
@@ -74,7 +74,7 @@ def to_bigdl_metric(metric):
     elif metric == "mae":
         return MAE()
     elif metric == "auc":
-        return AUC(1000)
+        return AUC()
     elif metric == "loss":
         return Loss()
     elif metric == "treennaccuracy":

diff --git a/zoo/src/main/scala/com/intel/analytics/zoo/examples/imageclassification/Predict.scala b/zoo/src/main/scala/com/intel/analytics/zoo/examples/imageclassification/Predict.scala
@@ -58,7 +58,7 @@ object Predict {
 
   def main(args: Array[String]): Unit = {
     parser.parse(args, TopNClassificationParam()).foreach { params =>
-      val sc = NNContext.getNNContext()
+      val sc = NNContext.getNNContext("Image Classification")
       val model = ImageClassifier.loadModel[Float](params.model)
       val data = ImageSet.read(params.imageFolder, sc, params.nPartition)
       val output = model.predictImageSet(data)

diff --git a/...cala/com/intel/analytics/zoo/examples/nnframes/imageInference/ImageInferenceExample.scala b/...cala/com/intel/analytics/zoo/examples/nnframes/imageInference/ImageInferenceExample.scala
@@ -32,7 +32,7 @@ object ImageInferenceExample {
 
     val defaultParams = Utils.LocalParams()
     Utils.parser.parse(args, defaultParams).foreach { params =>
-      val sc = NNContext.getNNContext()
+      val sc = NNContext.getNNContext("ImageInference")
 
       val getImageName = udf { row: Row => row.getString(0)}
       val imageDF = NNImageReader.readImages(params.folder, sc)

diff --git a/zoo/src/main/scala/com/intel/analytics/zoo/pipeline/api/keras/layers/utils/KerasUtils.scala b/zoo/src/main/scala/com/intel/analytics/zoo/pipeline/api/keras/layers/utils/KerasUtils.scala
@@ -175,7 +175,7 @@ object KerasUtils {
         metric.toLowerCase() match {
           case "accuracy" => new Top1Accuracy[T]()
           case "mae" => new MAE[T]()
-          case "auc" => new AUC[T](1000)
+          case "auc" => new AUC[T]()
           case "loss" => new Loss[T]()
           case "treennaccuracy" => new TreeNNAccuracy[T]()
           case _ => throw new IllegalArgumentException(s"Unsupported metric: ${metric}")

diff --git a/zoo/src/main/scala/com/intel/analytics/zoo/pipeline/api/keras/metrics/AUC.scala b/zoo/src/main/scala/com/intel/analytics/zoo/pipeline/api/keras/metrics/AUC.scala
@@ -125,7 +125,7 @@ class AucScore(private val tp: Tensor[Float], private val fp: Tensor[Float],
  * @param thresholdNum The number of thresholds. The quality of approximation
  *                     may vary depending on thresholdNum.
  */
-class AUC[T](thresholdNum: Int)(implicit ev: TensorNumeric[T])
+class AUC[T](thresholdNum: Int = 200)(implicit ev: TensorNumeric[T])
   extends ValidationMethod[T] {
 
   override def apply(output: Activity, target: Activity):