diff --git a/doc/configure.md b/doc/configure.md index 7ed1a6f..67c4331 100644 --- a/doc/configure.md +++ b/doc/configure.md @@ -45,8 +45,8 @@ xlearning.tf.board.history.dir | /tmp/XLearning/eventLog | specify the HDFS path xlearning.tf.board.reload.interval | 1 | how often the backend should load more data of event log (in seconds) for tensorboard xlearning.board.modelpb | "" | model proto in ONNX format for VisualDL xlearning.board.cache.timeout | 20 | memory cache timeout duration in seconds for VisualDL -xlearning.tf.board.path | /bin/tensorboard | the path of the tensorboard -xlearning.board.path | /bin/visualDL | the path of the visualDL +xlearning.tf.board.path | tensorboard | the path of the tensorboard +xlearning.board.path | visualDL | the path of the visualDL ### System Configuration @@ -71,7 +71,7 @@ xlearning.container.heartbeat.retry | 3 | Maximum number of retries for the cont xlearning.container.update.appstatus.interval | 3 * 1000 | how often the containers get the state of the application process (in milliseconds) xlearning.container.auto.create.output.dir | true | If set to true, the containers create the local output path automatically xlearning.log.pull.interval | 10000 | interval between the client get the log output of the AM (in milliseconds) -xlearning.user.classpath.first | true | whether user's job jar should be the first one on class path or not. +xlearning.user.classpath.first | true | whether user job jar should be the first one on class path or not. xlearning.worker.mem.autoscale | 0.5 | automatic memory scale ratio of worker when application retry after failed. xlearning.ps.mem.autoscale | 0.2 | automatic memory scale ratio of ps when application retry after failed. xlearning.app.max.attempts | 1 | the number of application attempts, default not retry after failed. diff --git a/doc/configure_cn.md b/doc/configure_cn.md index ec7673d..a1f598f 100644 --- a/doc/configure_cn.md +++ b/doc/configure_cn.md @@ -45,8 +45,8 @@ xlearning.tf.board.history.dir | /tmp/XLearning/eventLog | 指定Board日志上 xlearning.tf.board.reload.interval | 1 | 指定TensorBoard数据加载时间间隔,单位为秒 xlearning.board.modelpb | "" | 指定VisualDL加载的模型文件 xlearning.board.cache.timeout | 20 | 指定VisualDL缓存加载间隔,单位为秒 -xlearning.tf.board.path | /bin/tensorboard | 指定TensorBoard服务路径 -xlearning.board.path | /bin/visualDL | 指定VisualDL服务路径 +xlearning.tf.board.path | tensorboard | 指定TensorBoard服务路径 +xlearning.board.path | visualDL | 指定VisualDL服务路径 diff --git a/doc/submit.md b/doc/submit.md index d21419c..60bc02d 100644 --- a/doc/submit.md +++ b/doc/submit.md @@ -16,7 +16,7 @@ cacheFile | the required files in the HDFS path launch-cmd | execute command user-path | the append for the environment variable $PATH jars | the required jar files -user-classpath-first | whether user's job jar should be the first one on class path or not, default as the configure of xlearning.user.classpath.first +user-classpath-first | whether user job jar should be the first one on class path or not, default as the configure of xlearning.user.classpath.first conf | set the configuration am-cores | number of cores to use for the AM process, default as the configure of xlearning.am.cores am-memory | amount of memory to use for the AM process (in MB),default as the configure of xlearning.am.memory diff --git a/src/main/java/net/qihoo/xlearning/conf/XLearningConfiguration.java b/src/main/java/net/qihoo/xlearning/conf/XLearningConfiguration.java index 35b4de9..e0238c3 100644 --- a/src/main/java/net/qihoo/xlearning/conf/XLearningConfiguration.java +++ b/src/main/java/net/qihoo/xlearning/conf/XLearningConfiguration.java @@ -168,7 +168,7 @@ public XLearningConfiguration(Configuration conf) { }; public static final String XLEARNING_TF_BOARD_PATH = "xlearning.tf.board.path"; - public static final String DEFAULT_XLEARNING_TF_BOARD_PATH = "/bin/nvidia"; + public static final String DEFAULT_XLEARNING_TF_BOARD_PATH = "tensorboard"; public static final String XLEARNING_TF_BOARD_WORKER_INDEX = "xlearning.tf.board.worker.index"; public static final int DEFAULT_XLEARNING_TF_BOARD_WORKER_INDEX = 0; public static final String XLEARNING_TF_BOARD_RELOAD_INTERVAL = "xlearning.tf.board.reload.interval"; @@ -180,7 +180,7 @@ public XLearningConfiguration(Configuration conf) { public static final String XLEARNING_TF_BOARD_HISTORY_DIR = "xlearning.tf.board.history.dir"; public static final String DEFAULT_XLEARNING_TF_BOARD_HISTORY_DIR = "/tmp/XLearning/eventLog"; public static final String XLEARNING_BOARD_PATH = "xlearning.board.path"; - public static final String DEFAULT_XLEARNING_BOARD_PATH = "/bin/visualDL"; + public static final String DEFAULT_XLEARNING_BOARD_PATH = "visualDL"; public static final String XLEARNING_BOARD_MODELPB = "xlearning.board.modelpb"; public static final String DEFAULT_XLEARNING_BOARD_MODELPB = ""; public static final String XLEARNING_BOARD_CACHE_TIMEOUT = "xlearning.board.cache.timeout";