Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SummerGao.
Paddle
提交
98f0171c
P
Paddle
项目概览
SummerGao.
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98f0171c
编写于
7月 20, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of
https://github.com/PaddlePaddle/Paddle
into error
上级
5e8a4f16
ee9ee56d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
3 deletion
+26
-3
cmake/generic.cmake
cmake/generic.cmake
+21
-1
paddle/operators/sgd_op.h
paddle/operators/sgd_op.h
+5
-2
未找到文件。
cmake/generic.cmake
浏览文件 @
98f0171c
...
...
@@ -290,8 +290,22 @@ function(go_library TARGET_NAME)
set
(
${
TARGET_NAME
}
_LIB_NAME
"
${
CMAKE_STATIC_LIBRARY_PREFIX
}${
TARGET_NAME
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
CACHE STRING
"output library name for target
${
TARGET_NAME
}
"
)
endif
()
# Add dummy code to support `make target_name` under Terminal Command
set
(
dummyfile
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
_dummy.c
)
# This custom command will always run since it depends on a not
# existing file.
add_custom_command
(
OUTPUT dummy_rebulid_
${
TARGET_NAME
}
COMMAND cmake -E touch
${
dummyfile
}
)
# Create a custom target that depends on the custom command output
# file, so the custom command can be referenced as a dependency by
# `add_dependencies`.
add_custom_target
(
rebuild_
${
TARGET_NAME
}
DEPENDS dummy_rebulid_
${
TARGET_NAME
}
)
# Add dummy code to support `make target_name` under Terminal Command
file
(
WRITE
${
dummyfile
}
"const char * dummy =
\"
${
dummyfile
}
\"
;"
)
if
(
go_library_SHARED OR go_library_shared
)
add_library
(
${
TARGET_NAME
}
SHARED
${
dummyfile
}
)
...
...
@@ -302,6 +316,12 @@ function(go_library TARGET_NAME)
add_dependencies
(
${
TARGET_NAME
}
${
go_library_DEPS
}
)
endif
(
go_library_DEPS
)
# The "source file" of the library is `${dummyfile}` which never
# change, so the target will never rebuild. Make the target depends
# on the custom command that touches the library "source file", so
# rebuild will always happen.
add_dependencies
(
${
TARGET_NAME
}
rebuild_
${
TARGET_NAME
}
)
set
(
${
TARGET_NAME
}
_LIB_PATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${${
TARGET_NAME
}
_LIB_NAME
}
"
CACHE STRING
"output library path for target
${
TARGET_NAME
}
"
)
file
(
GLOB GO_SOURCE RELATIVE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"*.go"
)
...
...
paddle/operators/sgd_op.h
浏览文件 @
98f0171c
...
...
@@ -14,6 +14,7 @@ limitations under the License. */
#pragma once
#include "glog/logging.h"
#include "paddle/framework/eigen.h"
#include "paddle/framework/operator.h"
namespace
paddle
{
...
...
@@ -30,8 +31,10 @@ public:
param_out
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
param_out
->
flat
<
T
>
().
device
(
*
(
ctx
.
GetEigenDevice
<
Place
>
()))
=
param
.
flat
<
T
>
()
-
lr
*
grad
.
flat
<
T
>
();
framework
::
EigenVector
<
T
>::
Flatten
(
*
param_out
)
.
device
(
*
(
ctx
.
GetEigenDevice
<
Place
>
()))
=
framework
::
EigenVector
<
T
>::
Flatten
(
param
)
-
lr
*
framework
::
EigenVector
<
T
>::
Flatten
(
grad
);
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录