Skip to content

Commit 8fa9818

Browse files
ouyangwen-itouyangwen-it
committed
reformat code.
1 parent c83fca6 commit 8fa9818

File tree

305 files changed

+604
-2761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+604
-2761
lines changed

‎assembly/dist-assembly.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
<include>*.jar</include>
2727
</includes>
2828
</fileSet>
29+
<fileSet>
30+
<directory>${project.basedir}/../spark-on-angel/graph/target</directory>
31+
<outputDirectory>lib</outputDirectory>
32+
<includes>
33+
<include>*.jar</include>
34+
</includes>
35+
</fileSet>
2936
<fileSet>
3037
<directory>${project.basedir}/../spark-on-angel/core/target</directory>
3138
<outputDirectory>lib</outputDirectory>

‎dist/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
<artifactId>spark-on-angel-mllib</artifactId>
7777
<version>${project.version}</version>
7878
</dependency>
79+
<dependency>
80+
<groupId>${project.groupId}</groupId>
81+
<artifactId>spark-on-angel-graph</artifactId>
82+
<version>${project.version}</version>
83+
</dependency>
7984
</dependencies>
8085

8186
<build>

‎spark-on-angel/core/src/main/scala/com/tencent/angel/spark/context/AngelPSContext.scala

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
package com.tencent.angel.spark.context
2020

21-
import java.security.PrivilegedExceptionAction
22-
import java.util
2321
import java.util.UUID
2422
import java.util.concurrent.ConcurrentHashMap
2523

@@ -38,19 +36,17 @@ import org.apache.hadoop.conf.Configuration
3836
import org.apache.hadoop.fs.{FileSystem, Path}
3937
import org.apache.hadoop.util.ShutdownHookManager
4038
import org.apache.spark.deploy.SparkHadoopUtil
41-
import org.apache.spark.{SparkConf, SparkContext, SparkEnv, TaskContext}
39+
import org.apache.spark.{SparkConf, SparkEnv, TaskContext}
4240

4341
import scala.collection.JavaConverters._
4442
import scala.collection.mutable.ArrayBuffer
4543
import scala.collection.{Map, mutable}
46-
import org.apache.commons.httpclient.URI
4744
import com.tencent.angel.ps.storage.partitioner.Partitioner
48-
import org.apache.hadoop.security.UserGroupInformation
4945

5046
/**
5147
* AngelPSContext for driver and executor, it is an implement of `PSContext`
5248
*/
53-
private[spark] class AngelPSContext(contextId: Int, angelCtx: AngelContext) extends PSContext {
49+
class AngelPSContext(contextId: Int, angelCtx: AngelContext) extends PSContext {
5450

5551
import AngelPSContext._
5652

@@ -268,7 +264,7 @@ private[spark] class AngelPSContext(contextId: Int, angelCtx: AngelContext) exte
268264
override def recover(checkpointId:Int, ctx: ModelLoadContext): Unit = AngelPSContext.recover(checkpointId, ctx)
269265
}
270266

271-
private[spark] object AngelPSContext {
267+
object AngelPSContext {
272268

273269
private val MASTER_IP = "angel.master.ip"
274270
private val MASTER_PORT = "angel.master.port"

‎spark-on-angel/examples/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
<version>${project.version}</version>
4848
<scope>${dist.deps.scope}</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>com.tencent.angel</groupId>
52+
<artifactId>spark-on-angel-graph</artifactId>
53+
<version>${project.version}</version>
54+
<scope>${dist.deps.scope}</scope>
55+
</dependency>
5056
<dependency>
5157
<groupId>com.tencent.angel</groupId>
5258
<artifactId>angel-ps-mllib</artifactId>

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/CCExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package com.tencent.angel.spark.examples.cluster
1818

1919
import com.tencent.angel.spark.context.PSContext
2020
import com.tencent.angel.spark.ml.core.ArgsUtil
21-
import com.tencent.angel.spark.ml.graph.connectedcomponent.wcc.WCC
22-
import com.tencent.angel.spark.ml.graph.utils.GraphIO
21+
import com.tencent.angel.graph.connectedcomponent.wcc.WCC
22+
import com.tencent.angel.graph.utils.GraphIO
2323
import org.apache.spark.{SparkConf, SparkContext}
2424
import org.apache.spark.storage.StorageLevel
2525

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/ClosenessExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package com.tencent.angel.spark.examples.cluster
1919
import com.tencent.angel.conf.AngelConf
2020
import com.tencent.angel.spark.context.PSContext
2121
import com.tencent.angel.spark.ml.core.ArgsUtil
22-
import com.tencent.angel.spark.ml.graph.hyperanf.Closeness
23-
import com.tencent.angel.spark.ml.graph.utils.GraphIO
22+
import com.tencent.angel.graph.hyperanf.Closeness
23+
import com.tencent.angel.graph.utils.GraphIO
2424
import org.apache.spark.storage.StorageLevel
2525
import org.apache.spark.{SparkConf, SparkContext}
2626

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/CommonFriendsExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import com.tencent.angel.conf.AngelConf
2121
import com.tencent.angel.ps.storage.matrix.PartitionSourceArray
2222
import com.tencent.angel.spark.context.PSContext
2323
import com.tencent.angel.spark.ml.core.ArgsUtil
24-
import com.tencent.angel.spark.ml.graph.commonfriends._
25-
import com.tencent.angel.spark.ml.graph.utils.{Delimiter, GraphIO}
24+
import com.tencent.angel.graph.commonfriends._
25+
import com.tencent.angel.graph.utils.{Delimiter, GraphIO}
2626
import org.apache.spark.storage.StorageLevel
2727
import org.apache.spark.{SparkConf, SparkContext}
2828

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/HIndexExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package com.tencent.angel.spark.examples.cluster
1919
import com.tencent.angel.conf.AngelConf
2020
import com.tencent.angel.spark.context.PSContext
2121
import com.tencent.angel.spark.ml.core.ArgsUtil
22-
import com.tencent.angel.spark.ml.graph.rank.HIndex
23-
import com.tencent.angel.spark.ml.graph.utils.GraphIO
22+
import com.tencent.angel.graph.rank.HIndex
23+
import com.tencent.angel.graph.utils.GraphIO
2424
import org.apache.spark.{SparkConf, SparkContext}
2525
import org.apache.spark.storage.StorageLevel
2626

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/KCoreExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package com.tencent.angel.spark.examples.cluster
1818

1919
import com.tencent.angel.spark.context.PSContext
2020
import com.tencent.angel.spark.ml.core.ArgsUtil
21-
import com.tencent.angel.spark.ml.graph.kcore.KCore
22-
import com.tencent.angel.spark.ml.graph.utils.GraphIO
21+
import com.tencent.angel.graph.kcore.KCore
22+
import com.tencent.angel.graph.utils.GraphIO
2323
import org.apache.spark.storage.StorageLevel
2424
import org.apache.spark.{SparkConf, SparkContext}
2525

‎spark-on-angel/examples/src/main/scala/com/tencent/angel/spark/examples/cluster/LINEExample.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import com.tencent.angel.conf.AngelConf
2121
import com.tencent.angel.ps.storage.matrix.PartitionSourceArray
2222
import com.tencent.angel.spark.context.PSContext
2323
import com.tencent.angel.spark.ml.core.ArgsUtil
24-
import com.tencent.angel.spark.ml.embedding.line.LINE
25-
import com.tencent.angel.spark.ml.graph.utils.GraphIO
24+
import com.tencent.angel.graph.embedding.line.LINE
25+
import com.tencent.angel.graph.utils.GraphIO
2626
import com.tencent.angel.spark.ml.util.SparkUtils
2727
import org.apache.spark.sql.DataFrame
2828
import org.apache.spark.{SparkConf, SparkContext}

0 commit comments

Comments
 (0)