forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-14653][ML] Remove json4s from mllib-local
## What changes were proposed in this pull request? This PR moves Vector.toJson/fromJson to ml.linalg.VectorEncoder under mllib/ to keep mllib-local's dependency minimal. The json encoding is used by Params. So we still need this feature in SPARK-14615, where we will switch to ml.linalg in spark.ml APIs. ## How was this patch tested? Copied existing unit tests over. cc; dbtsai Author: Xiangrui Meng <[email protected]> Closes apache#12802 from mengxr/SPARK-14653.
- Loading branch information
Showing
5 changed files
with
103 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
mllib/src/main/scala/org/apache/spark/ml/linalg/JsonVectorConverter.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.ml.linalg | ||
|
|
||
| import org.json4s.DefaultFormats | ||
| import org.json4s.JsonDSL._ | ||
| import org.json4s.jackson.JsonMethods.{compact, parse => parseJson, render} | ||
|
|
||
| private[ml] object JsonVectorConverter { | ||
|
|
||
| /** | ||
| * Parses the JSON representation of a vector into a [[Vector]]. | ||
| */ | ||
| def fromJson(json: String): Vector = { | ||
| implicit val formats = DefaultFormats | ||
| val jValue = parseJson(json) | ||
| (jValue \ "type").extract[Int] match { | ||
| case 0 => // sparse | ||
| val size = (jValue \ "size").extract[Int] | ||
| val indices = (jValue \ "indices").extract[Seq[Int]].toArray | ||
| val values = (jValue \ "values").extract[Seq[Double]].toArray | ||
| Vectors.sparse(size, indices, values) | ||
| case 1 => // dense | ||
| val values = (jValue \ "values").extract[Seq[Double]].toArray | ||
| Vectors.dense(values) | ||
| case _ => | ||
| throw new IllegalArgumentException(s"Cannot parse $json into a vector.") | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Coverts the vector to a JSON string. | ||
| */ | ||
| def toJson(v: Vector): String = { | ||
| v match { | ||
| case SparseVector(size, indices, values) => | ||
| val jValue = ("type" -> 0) ~ | ||
| ("size" -> size) ~ | ||
| ("indices" -> indices.toSeq) ~ | ||
| ("values" -> values.toSeq) | ||
| compact(render(jValue)) | ||
| case DenseVector(values) => | ||
| val jValue = ("type" -> 1) ~ ("values" -> values.toSeq) | ||
| compact(render(jValue)) | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
mllib/src/test/scala/org/apache/spark/ml/linalg/JsonVectorConverterSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.ml.linalg | ||
|
|
||
| import org.json4s.jackson.JsonMethods.parse | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
|
|
||
| class JsonVectorConverterSuite extends SparkFunSuite { | ||
|
|
||
| test("toJson/fromJson") { | ||
| val sv0 = Vectors.sparse(0, Array.empty, Array.empty) | ||
| val sv1 = Vectors.sparse(1, Array.empty, Array.empty) | ||
| val sv2 = Vectors.sparse(2, Array(1), Array(2.0)) | ||
| val dv0 = Vectors.dense(Array.empty[Double]) | ||
| val dv1 = Vectors.dense(1.0) | ||
| val dv2 = Vectors.dense(0.0, 2.0) | ||
| for (v <- Seq(sv0, sv1, sv2, dv0, dv1, dv2)) { | ||
| val json = JsonVectorConverter.toJson(v) | ||
| parse(json) // `json` should be a valid JSON string | ||
| val u = JsonVectorConverter.fromJson(json) | ||
| assert(u.getClass === v.getClass, "toJson/fromJson should preserve vector types.") | ||
| assert(u === v, "toJson/fromJson should preserve vector values.") | ||
| } | ||
| } | ||
| } |