Switch to internals

h2oai · Mar 19, 2020 · 1c4d732 · 1c4d732
1 parent 77d3c4c
commit 1c4d732
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 14 deletions.
diff --git a/core/src/main/scala/ai/h2o/sparkling/backend/H2OChunk.scala b/core/src/main/scala/ai/h2o/sparkling/backend/H2OChunk.scala
@@ -19,7 +19,6 @@ package ai.h2o.sparkling.backend
 
 import java.io.{InputStream, OutputStream}
 
-import ai.h2o.sparkling.backend.NodeDesc
 import ai.h2o.sparkling.backend.utils.{RestApiUtils, RestCommunication}
 import ai.h2o.sparkling.extensions.rest.api.Paths
 import ai.h2o.sparkling.utils.{Base64Encoding, Compression}

diff --git a/core/src/main/scala/ai/h2o/sparkling/backend/H2ODataFrame.scala b/core/src/main/scala/ai/h2o/sparkling/backend/H2ODataFrame.scala
@@ -17,8 +17,8 @@
 
 package ai.h2o.sparkling.backend
 
-import ai.h2o.sparkling.backend.utils.{ConversionUtils, ReflectionUtils}
 import ai.h2o.sparkling.backend.utils.SupportedTypes._
+import ai.h2o.sparkling.backend.utils.{ConversionUtils, ReflectionUtils}
 import ai.h2o.sparkling.{H2OFrame, SparkTimeZone}
 import org.apache.spark.h2o.H2OContext
 import org.apache.spark.sql.catalyst.InternalRow

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OAlgorithm.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OAlgorithm.scala
@@ -19,7 +19,7 @@ package ai.h2o.sparkling.ml.algos
 import ai.h2o.sparkling.H2OFrame
 import ai.h2o.sparkling.backend.exceptions.RestApiCommunicationException
 import ai.h2o.sparkling.backend.utils.RestCommunication
-import ai.h2o.sparkling.ml.backend.H2OModel
+import ai.h2o.sparkling.ml.internals.H2OModel
 import ai.h2o.sparkling.ml.models.{H2OMOJOModel, H2OMOJOSettings}
 import ai.h2o.sparkling.ml.params.H2OAlgoCommonParams
 import hex.Model

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OAutoML.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OAutoML.scala
@@ -18,7 +18,7 @@ package ai.h2o.sparkling.ml.algos
 
 import ai.h2o.sparkling.H2OFrame
 import ai.h2o.sparkling.backend.utils.{RestApiUtils, RestCommunication}
-import ai.h2o.sparkling.ml.backend.H2OModel
+import ai.h2o.sparkling.ml.internals.H2OModel
 import ai.h2o.sparkling.ml.models.{H2OMOJOModel, H2OMOJOSettings}
 import ai.h2o.sparkling.ml.params._
 import ai.h2o.sparkling.ml.utils.H2OParamsReadable

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OGridSearch.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/algos/H2OGridSearch.scala
@@ -21,7 +21,7 @@ import java.util
 import ai.h2o.sparkling.H2OFrame
 import ai.h2o.sparkling.backend.exceptions.RestApiCommunicationException
 import ai.h2o.sparkling.backend.utils.{RestApiUtils, RestCommunication, RestEncodingUtils}
-import ai.h2o.sparkling.ml.backend.{H2OMetric, H2OModel, H2OModelCategory}
+import ai.h2o.sparkling.ml.internals.{H2OMetric, H2OModel, H2OModelCategory}
 import ai.h2o.sparkling.ml.models.{H2OMOJOModel, H2OMOJOSettings}
 import ai.h2o.sparkling.ml.params.H2OGridSearchParams
 import ai.h2o.sparkling.ml.utils.H2OParamsReadable

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/features/H2OTargetEncoder.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/features/H2OTargetEncoder.scala
@@ -18,7 +18,7 @@
 package ai.h2o.sparkling.ml.features
 
 import ai.h2o.sparkling.backend.utils.RestCommunication
-import ai.h2o.sparkling.ml.backend.H2OModel
+import ai.h2o.sparkling.ml.internals.H2OModel
 import ai.h2o.sparkling.ml.models.{H2OTargetEncoderBase, H2OTargetEncoderModel}
 import ai.h2o.sparkling.ml.params.H2OAlgoParamsHelper
 import ai.h2o.sparkling.ml.utils.EstimatorCommonUtils

diff --git a/...i/h2o/sparkling/ml/backend/H2OMetric.java → ...h2o/sparkling/ml/internals/H2OMetric.java b/...i/h2o/sparkling/ml/backend/H2OMetric.java → ...h2o/sparkling/ml/internals/H2OMetric.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package ai.h2o.sparkling.ml.backend;
+package ai.h2o.sparkling.ml.internals;
 
 public enum H2OMetric {
     AUTO(true),

diff --git a/...arkling/ml/backend/H2OMetricsHolder.scala → ...kling/ml/internals/H2OMetricsHolder.scala b/...arkling/ml/backend/H2OMetricsHolder.scala → ...kling/ml/internals/H2OMetricsHolder.scala
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package ai.h2o.sparkling.ml.backend
+package ai.h2o.sparkling.ml.internals
 
 private[sparkling] case class H2OMetricsHolder(trainingMetrics: Map[H2OMetric, Double],
                                                validationMetrics: Map[H2OMetric, Double],

diff --git a/...i/h2o/sparkling/ml/backend/H2OModel.scala → ...h2o/sparkling/ml/internals/H2OModel.scala b/...i/h2o/sparkling/ml/backend/H2OModel.scala → ...h2o/sparkling/ml/internals/H2OModel.scala
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package ai.h2o.sparkling.ml.backend
+package ai.h2o.sparkling.ml.internals
 
 import java.io.File
 import java.nio.file.Files

diff --git a/...arkling/ml/backend/H2OModelCategory.scala → ...kling/ml/internals/H2OModelCategory.scala b/...arkling/ml/backend/H2OModelCategory.scala → ...kling/ml/internals/H2OModelCategory.scala
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package ai.h2o.sparkling.ml.backend
+package ai.h2o.sparkling.ml.internals
 
 /**
  * Copied from H2O's class ModelCategory

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/models/H2OTargetEncoderModel.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/models/H2OTargetEncoderModel.scala
@@ -19,7 +19,7 @@ package ai.h2o.sparkling.ml.models
 
 import ai.h2o.sparkling.H2OFrame
 import ai.h2o.sparkling.backend.utils.{RestApiUtils, RestCommunication}
-import ai.h2o.sparkling.ml.backend.H2OModel
+import ai.h2o.sparkling.ml.internals.H2OModel
 import ai.h2o.sparkling.ml.features.H2OTargetEncoderModelUtils
 import ai.h2o.sparkling.ml.utils.SchemaUtils
 import org.apache.spark.h2o.H2OContext

diff --git a/ml/src/main/scala/ai/h2o/sparkling/ml/params/H2OGridSearchParams.scala b/ml/src/main/scala/ai/h2o/sparkling/ml/params/H2OGridSearchParams.scala
@@ -19,7 +19,7 @@ package ai.h2o.sparkling.ml.params
 import java.util
 
 import ai.h2o.sparkling.ml.algos.{H2OGridSearch, H2OSupervisedAlgorithm}
-import ai.h2o.sparkling.ml.backend.H2OMetric
+import ai.h2o.sparkling.ml.internals.H2OMetric
 import hex.grid.HyperSpaceSearchCriteria
 import hex.{Model, ScoreKeeper}
 import org.apache.spark.ml.param._

diff --git a/ml/src/test/scala/ai/h2o/sparkling/ml/algos/H2OGLMTestSuite.scala b/ml/src/test/scala/ai/h2o/sparkling/ml/algos/H2OGLMTestSuite.scala
@@ -17,7 +17,7 @@
 
 package ai.h2o.sparkling.ml.algos
 
-import ai.h2o.sparkling.ml.backend.H2OModel
+import ai.h2o.sparkling.ml.internals.H2OModel
 import org.apache.spark.SparkContext
 import org.apache.spark.h2o.utils.SharedH2OTestContext
 import org.apache.spark.ml.{Pipeline, PipelineModel}

diff --git a/py/src/ai/h2o/sparkling/ml/params/H2OGridSearchParams.py b/py/src/ai/h2o/sparkling/ml/params/H2OGridSearchParams.py
@@ -76,7 +76,7 @@ class H2OGridSearchParams(H2OCommonSupervisedParams):
         Params._dummy(),
         "selectBestModelBy",
         "Specifies the metric which is used for comparing and sorting the models returned by the grid.",
-        H2OTypeConverters.toEnumString("ai.h2o.sparkling.ml.backend.H2OMetric"))
+        H2OTypeConverters.toEnumString("ai.h2o.sparkling.ml.internals.H2OMetric"))
 
     parallelism = Param(
         Params._dummy(),