Skip to content

Commit 64b4f97

Browse files
andyyehooandyyehoo
committed
[Alpha-Release-1] Lots of Improvement with Docs
1 parent a9ef224 commit 64b4f97

File tree

687 files changed

+193334
-5205
lines changed

Some content is hidden

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

687 files changed

+193334
-5205
lines changed

‎LICENSE.TXT

+1-1
Large diffs are not rendered by default.

‎angel-ps/assembly/dist-assembly.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
<outputDirectory>conf</outputDirectory>
1919
</fileSet>
2020
<fileSet>
21-
<directory>${project.basedir}/../sbin</directory>
22-
<outputDirectory>sbin</outputDirectory>
23-
<fileMode>0755</fileMode>
21+
<directory>${project.basedir}/../data</directory>
22+
<outputDirectory>data</outputDirectory>
23+
</fileSet>
24+
<fileSet>
25+
<directory>${project.basedir}/../bin</directory>
26+
<outputDirectory>bin</outputDirectory>
2427
</fileSet>
2528
</fileSets>
2629
</assembly>

‎angel-ps/bin/angel-example

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/usr/bin/env bash
2+
3+
bin=`which $0`
4+
bin=`dirname ${bin}`
5+
bin=`cd "$bin"; pwd`
6+
7+
lib="$bin"/../lib
8+
9+
echo $lib
10+
export ANGEL_HOME="$bin/../"
11+
12+
13+
for f in "$lib"/*.jar; do
14+
echo $f
15+
if [ "$CLASSPATH" ]; then
16+
export CLASSPATH=$CLASSPATH:$f
17+
else
18+
export CLASSPATH=$f
19+
fi
20+
done
21+
22+
#export CLASS="com.tencent.angel.utils.AngelRunJar"
23+
24+
export CLASSPATH=$CLASSPATH
25+
echo "$ANGEL_HOME"
26+
echo $CLASSPATH
27+
java $1

‎angel-ps/bin/angel-submit

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/usr/bin/env bash
2+
3+
export HADOOP_HOME="/data/tdwadmin/tdwenv/tdwgaia"
4+
5+
if [ "$HADOOP_HOME" = "" ]; then
6+
echo "HADOOP_HOME is not set"
7+
exit 1
8+
fi
9+
10+
bin=`which $0`
11+
bin=`dirname ${bin}`
12+
bin=`cd "$bin"; pwd`
13+
14+
conf="$bin"/../conf
15+
lib="$bin"/../lib
16+
17+
echo $lib
18+
export ANGEL_HOME="$bin/../"
19+
20+
DEFAULT_LIBEXEC_DIR="$HADOOP_HOME"/libexec
21+
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
22+
. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
23+
24+
for f in "$lib"/*.jar; do
25+
echo $f
26+
if [ "$CLASSPATH" ]; then
27+
export CLASSPATH=$CLASSPATH:$f
28+
else
29+
export CLASSPATH=$f
30+
fi
31+
done
32+
33+
export CLASS="com.tencent.angel.utils.AngelRunJar"
34+
35+
export CLASSPATH=$CLASSPATH
36+
echo "$ANGEL_HOME"
37+
echo $CLASSPATH
38+
echo $JAVA $JAVA_HEAP_MAX $HADOOP_OPTS $CLASS "$@"
39+
exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS $CLASS "$@"

‎angel-ps/conf/angel-site.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<configuration>
1919
<property>
2020
<name>angel.job.libjars</name>
21-
<value>${ANGEL_HOME}/lib/scala-library-2.11.8.jar,${ANGEL_HOME}/lib/angel-core-1.1.jar,${ANGEL_HOME}/lib/angel-udf-1.1.jar,${ANGEL_HOME}/lib/angel-mllib-1.1.jar,${ANGEL_HOME}/lib/angel-examples-1.1.jar,${ANGEL_HOME}/lib/fastutil-7.1.0.jar,${ANGEL_HOME}/lib/sizeof-0.3.0.jar,${ANGEL_HOME}/lib/kryo-3.0.3.jar,${ANGEL_HOME}/lib/minlog-1.3.0.jar</value>
21+
<value>${ANGEL_HOME}/lib/scala-library-2.11.8.jar,${ANGEL_HOME}/lib/angel-ps-core-1.1.8.jar,${ANGEL_HOME}/lib/angel-ps-udf-1.1.8.jar,${ANGEL_HOME}/lib/angel-ps-mllib-1.1.8.jar,${ANGEL_HOME}/lib/angel-ps-examples-1.1.8.jar,${ANGEL_HOME}/lib/fastutil-7.1.0.jar,${ANGEL_HOME}/lib/sizeof-0.3.0.jar,${ANGEL_HOME}/lib/kryo-shaded-3.0.3.jar,${ANGEL_HOME}/lib/minlog-1.3.0.jar</value>
2222
</property>
2323
<property>
2424
<name>mapred.mapper.new-api</name>

‎angel-ps/conf/log4j.properties

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#
2+
# Tencent is pleased to support the open source community by making Angel available.
3+
#
4+
# Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
5+
#
6+
# Licensed under the BSD 3-Clause License (the "License"); you may not use this file except in
7+
# compliance with the License. You may obtain a copy of the License at
8+
#
9+
# https://opensource.org/licenses/BSD-3-Clause
10+
#
11+
# Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13+
# either express or implied. See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# Set everything to be loggefile to the console
18+
log4j.rootCategory=INFO, console, file
19+
log4j.appender.console=org.apache.log4j.ConsoleAppender
20+
log4j.appender.console.target=System.out
21+
log4j.appender.console.layout=org.apache.log4j.PatternLayout
22+
log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2} : %m%n
23+
24+
# Set everything to be loggefile to the file
25+
log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
26+
log4j.appender.file.File=log/log
27+
log4j.appender.file.layout=org.apache.log4j.PatternLayout
28+
log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2} : %m%n
29+
log4j.appender.file.Append=false
30+
log4j.logger.com.tencent.ml=DEBUG
31+
32+
# Settings to quiet thirfile party logs that are too verbose
33+
log4j.logger.org.eclipse.jetty=WARN

‎angel-ps/core/log/log

Whitespace-only changes.

‎angel-ps/core/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<name>angel-ps-core</name>
2828
<url>http://maven.apache.org</url>
2929
<properties>
30+
<main.basedir>${project.parent.parent.basedir}</main.basedir>
3031
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3132
</properties>
3233
<build>

‎angel-ps/core/src/main/java/com/tencent/angel/Chore.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/*
2-
* Tencent is pleased to support the open source community by making Angel available.
3-
*
4-
* Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
1+
/**
52
*
6-
* Licensed under the BSD 3-Clause License (the "License"); you may not use this file except in
7-
* compliance with the License. You may obtain a copy of the License at
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
810
*
9-
* https://opensource.org/licenses/BSD-3-Clause
11+
* http://www.apache.org/licenses/LICENSE-2.0
1012
*
11-
* Unless required by applicable law or agreed to in writing, software distributed under the License is
12-
* distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13-
* either express or implied. See the License for the specific language governing permissions and
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
1417
* limitations under the License.
1518
*/
16-
package com.tencent.angel;
1719

20+
package com.tencent.angel;
1821

1922
import com.tencent.angel.utils.HasThread;
2023
import com.tencent.angel.utils.Sleeper;

0 commit comments

Comments
 (0)