Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
6dce72f6
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6dce72f6
编写于
6月 29, 2017
作者:
D
dangqingqing
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of
https://github.com/PaddlePaddle/Paddle
into from_tar
上级
c9865824
39eb94cc
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
39 deletion
+16
-39
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
+1
-1
paddle/platform/CMakeLists.txt
paddle/platform/CMakeLists.txt
+0
-1
paddle/platform/must_check.h
paddle/platform/must_check.h
+0
-26
paddle/platform/must_check_test.cc
paddle/platform/must_check_test.cc
+0
-10
paddle/utils/Error.h
paddle/utils/Error.h
+15
-1
未找到文件。
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
浏览文件 @
6dce72f6
...
@@ -601,7 +601,7 @@ void TrainerThread::backward() {
...
@@ -601,7 +601,7 @@ void TrainerThread::backward() {
void
TrainerThread
::
backwardCallback
(
Parameter
*
para
)
{
void
TrainerThread
::
backwardCallback
(
Parameter
*
para
)
{
// CPU parameters are merged in the end
// CPU parameters are merged in the end
if
(
!
para
->
useGpu
())
return
;
if
(
!
para
->
useGpu
()
||
para
->
isStatic
()
)
return
;
int
paramId
=
para
->
getID
();
int
paramId
=
para
->
getID
();
if
(
multiMachine_
->
getNumThreads
()
==
1
)
{
if
(
multiMachine_
->
getNumThreads
()
==
1
)
{
...
...
paddle/platform/CMakeLists.txt
浏览文件 @
6dce72f6
...
@@ -2,4 +2,3 @@ nv_test(cuda_test SRCS cuda_test.cu)
...
@@ -2,4 +2,3 @@ nv_test(cuda_test SRCS cuda_test.cu)
cc_library
(
place SRCS place.cc
)
cc_library
(
place SRCS place.cc
)
cc_test
(
place_test SRCS place_test.cc DEPS place glog gflags
)
cc_test
(
place_test SRCS place_test.cc DEPS place glog gflags
)
cc_test
(
must_check_test SRCS must_check_test.cc
)
paddle/platform/must_check.h
已删除
100644 → 0
浏览文件 @
c9865824
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
Licensed 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. */
#pragma once
/**
* __must_check macro. It make the function's return value must be used,
* otherwise it will raise a compile warning. And also Paddle treat all compile
* warnings as errors.
*/
#ifdef __GNUC__
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 30400
#define __must_check __attribute__((warn_unused_result))
#else
#define __must_check
#endif
#else
#define __must_check
#endif
paddle/platform/must_check_test.cc
已删除
100644 → 0
浏览文件 @
c9865824
#include <gtest/gtest.h>
#include <paddle/platform/must_check.h>
int
__must_check
SomeFunctionMustCheck
()
{
return
0
;
}
TEST
(
MustCheck
,
all
)
{
// This line should not be compiled, because the
// return value of SomeFunctionMustCheck marked as __must_check
// SomeFunctionMustCheck();
}
\ No newline at end of file
paddle/utils/Error.h
浏览文件 @
6dce72f6
...
@@ -19,7 +19,21 @@ limitations under the License. */
...
@@ -19,7 +19,21 @@ limitations under the License. */
#include <stdio.h>
#include <stdio.h>
#include <memory>
#include <memory>
#include <string>
#include <string>
#include "paddle/platform/must_check.h"
/**
* __must_check macro. It make the function's return value must be used,
* otherwise it will raise a compile warning. And also Paddle treat all compile
* warnings as errors.
*/
#ifdef __GNUC__
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 30400
#define __must_check __attribute__((warn_unused_result))
#else
#define __must_check
#endif
#else
#define __must_check
#endif
namespace
paddle
{
namespace
paddle
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录