Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
溜达小灰鼠
Paddle
提交
be8b1268
P
Paddle
项目概览
溜达小灰鼠
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be8b1268
编写于
1月 05, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move Execepts into arch/osx dir
上级
533652e8
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
31 addition
and
32 deletion
+31
-32
.gitignore
.gitignore
+1
-0
paddle/api/PaddleAPI.h
paddle/api/PaddleAPI.h
+1
-1
paddle/api/Util.cpp
paddle/api/Util.cpp
+1
-2
paddle/gserver/dataproviders/DataProvider.h
paddle/gserver/dataproviders/DataProvider.h
+1
-1
paddle/gserver/dataproviders/PyDataProvider.cpp
paddle/gserver/dataproviders/PyDataProvider.cpp
+1
-2
paddle/gserver/layers/GruCompute.h
paddle/gserver/layers/GruCompute.h
+1
-1
paddle/gserver/layers/LstmCompute.h
paddle/gserver/layers/LstmCompute.h
+1
-1
paddle/gserver/layers/MultinomialSampler.h
paddle/gserver/layers/MultinomialSampler.h
+1
-1
paddle/math/BaseMatrix.h
paddle/math/BaseMatrix.h
+1
-1
paddle/math/Matrix.h
paddle/math/Matrix.h
+1
-1
paddle/math/TensorExpression.h
paddle/math/TensorExpression.h
+1
-1
paddle/math/Vector.h
paddle/math/Vector.h
+1
-1
paddle/math/tests/test_FPException.cpp
paddle/math/tests/test_FPException.cpp
+2
-2
paddle/parameter/ParallelParameter.h
paddle/parameter/ParallelParameter.h
+1
-1
paddle/parameter/Parameter.h
paddle/parameter/Parameter.h
+1
-1
paddle/parameter/ParameterUpdateFunctions.h
paddle/parameter/ParameterUpdateFunctions.h
+1
-1
paddle/pserver/BaseClient.h
paddle/pserver/BaseClient.h
+1
-1
paddle/pserver/ParameterClient2.h
paddle/pserver/ParameterClient2.h
+1
-1
paddle/pserver/ParameterServer2.h
paddle/pserver/ParameterServer2.h
+1
-1
paddle/trainer/Trainer.cpp
paddle/trainer/Trainer.cpp
+1
-2
paddle/trainer/TrainerMain.cpp
paddle/trainer/TrainerMain.cpp
+1
-2
paddle/utils/CpuId.h
paddle/utils/CpuId.h
+1
-1
paddle/utils/Excepts.h
paddle/utils/Excepts.h
+2
-0
paddle/utils/Locks.h
paddle/utils/Locks.h
+1
-1
paddle/utils/Util.h
paddle/utils/Util.h
+1
-1
paddle/utils/Version.h
paddle/utils/Version.h
+1
-1
paddle/utils/arch/osx/Excepts.cpp
paddle/utils/arch/osx/Excepts.cpp
+1
-3
paddle/utils/common.h
paddle/utils/common.h
+2
-0
未找到文件。
.gitignore
浏览文件 @
be8b1268
...
...
@@ -12,3 +12,4 @@ Makefile
*~
bazel-*
third_party/
paddle/api/PaddleAPI.h
浏览文件 @
be8b1268
...
...
@@ -19,8 +19,8 @@ limitations under the License. */
#include <stdexcept>
#include <string>
#include <vector>
#include "paddle/utils/Common.h"
#include "paddle/utils/GlobalConstants.h"
#include "paddle/utils/common.h"
/// Import PaddlePaddle's enumeration into global namespace.
using
namespace
paddle
::
enumeration_wrapper
;
// NOLINT
...
...
paddle/api/Util.cpp
浏览文件 @
be8b1268
...
...
@@ -15,12 +15,11 @@ limitations under the License. */
#include "PaddleAPI.h"
#include "paddle/parameter/Parameter.h"
#include "paddle/utils/
Excepts
.h"
#include "paddle/utils/
Common
.h"
#include "paddle/utils/Flags.h"
#include "paddle/utils/PythonUtil.h"
#include "paddle/utils/Util.h"
#include <fenv.h>
#include <algorithm>
#include <iostream>
#include <iterator>
...
...
paddle/gserver/dataproviders/DataProvider.h
浏览文件 @
be8b1268
...
...
@@ -30,12 +30,12 @@ limitations under the License. */
#include "paddle/math/Vector.h"
#include "paddle/parameter/Argument.h"
#include "paddle/utils/ClassRegistrar.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Locks.h"
#include "paddle/utils/Logging.h"
#include "paddle/utils/Queue.h"
#include "paddle/utils/ThreadLocal.h"
#include "paddle/utils/Util.h"
#include "paddle/utils/common.h"
namespace
paddle
{
/**
...
...
paddle/gserver/dataproviders/PyDataProvider.cpp
浏览文件 @
be8b1268
...
...
@@ -13,8 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. */
#include "PyDataProvider.h"
#include <fenv.h>
#include "paddle/utils/Excepts.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/PythonUtil.h"
#include "paddle/utils/Util.h"
...
...
paddle/gserver/layers/GruCompute.h
浏览文件 @
be8b1268
...
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include "ModelConfig.pb.h"
#include "hl_gpu.h"
#include "paddle/utils/
c
ommon.h"
#include "paddle/utils/
C
ommon.h"
namespace
paddle
{
...
...
paddle/gserver/layers/LstmCompute.h
浏览文件 @
be8b1268
...
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include "ModelConfig.pb.h"
#include "hl_gpu.h"
#include "paddle/utils/
c
ommon.h"
#include "paddle/utils/
C
ommon.h"
namespace
paddle
{
...
...
paddle/gserver/layers/MultinomialSampler.h
浏览文件 @
be8b1268
...
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include <memory>
#include <random>
#include "paddle/utils/
c
ommon.h"
#include "paddle/utils/
C
ommon.h"
namespace
paddle
{
...
...
paddle/math/BaseMatrix.h
浏览文件 @
be8b1268
...
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include <stdint.h>
#include <cstddef>
#include "TensorExpression.h"
#include "paddle/utils/
c
ommon.h"
#include "paddle/utils/
C
ommon.h"
namespace
paddle
{
...
...
paddle/math/Matrix.h
浏览文件 @
be8b1268
...
...
@@ -26,8 +26,8 @@ limitations under the License. */
#include "BaseMatrix.h"
#include "MemoryHandle.h"
#include "Vector.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/ThreadLocal.h"
#include "paddle/utils/common.h"
namespace
paddle
{
...
...
paddle/math/TensorExpression.h
浏览文件 @
be8b1268
...
...
@@ -16,8 +16,8 @@ limitations under the License. */
#include <stdint.h>
#include <cstddef>
#include "hl_tensor_ops.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Logging.h"
#include "paddle/utils/common.h"
namespace
paddle
{
...
...
paddle/math/Vector.h
浏览文件 @
be8b1268
...
...
@@ -21,8 +21,8 @@ limitations under the License. */
#include "BaseMatrix.h"
#include "MemoryHandle.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Thread.h"
#include "paddle/utils/common.h"
namespace
paddle
{
...
...
paddle/math/tests/test_FPException.cpp
浏览文件 @
be8b1268
...
...
@@ -28,10 +28,10 @@ limitations under the License. */
* so we can add some tricks to prevent exp calculate an excessive value.
*
*/
#include <fenv.h>
#include <gtest/gtest.h>
#include "paddle/math/Matrix.h"
#include "paddle/utils/
Excepts
.h"
#include "paddle/utils/
Common
.h"
using
namespace
paddle
;
// NOLINT
...
...
paddle/parameter/ParallelParameter.h
浏览文件 @
be8b1268
...
...
@@ -26,9 +26,9 @@ limitations under the License. */
#include "paddle/math/Vector.h"
#include "paddle/parameter/Parameter.h"
#include "paddle/parameter/ParameterUpdateFunctions.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Flags.h"
#include "paddle/utils/Locks.h"
#include "paddle/utils/common.h"
#include "ParameterConfig.pb.h"
...
...
paddle/parameter/Parameter.h
浏览文件 @
be8b1268
...
...
@@ -26,11 +26,11 @@ limitations under the License. */
#include "ParameterUpdaterHook.h"
#include "paddle/math/Matrix.h"
#include "paddle/math/Vector.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/GlobalConstants.h"
#include "paddle/utils/Locks.h"
#include "paddle/utils/ThreadLocal.h"
#include "paddle/utils/Util.h"
#include "paddle/utils/common.h"
namespace
paddle
{
...
...
paddle/parameter/ParameterUpdateFunctions.h
浏览文件 @
be8b1268
...
...
@@ -15,7 +15,7 @@ limitations under the License. */
#pragma once
#include "paddle/math/Vector.h"
#include "paddle/utils/
c
ommon.h"
#include "paddle/utils/
C
ommon.h"
namespace
paddle
{
...
...
paddle/pserver/BaseClient.h
浏览文件 @
be8b1268
...
...
@@ -17,8 +17,8 @@ limitations under the License. */
#include "ParameterService.pb.h"
#include "paddle/math/Matrix.h"
#include "paddle/pserver/ProtoServer.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Queue.h"
#include "paddle/utils/common.h"
namespace
paddle
{
...
...
paddle/pserver/ParameterClient2.h
浏览文件 @
be8b1268
...
...
@@ -23,11 +23,11 @@ limitations under the License. */
#include "paddle/math/Vector.h"
#include "paddle/parameter/Parameter.h"
#include "paddle/pserver/BaseClient.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Flags.h"
#include "paddle/utils/Locks.h"
#include "paddle/utils/Queue.h"
#include "paddle/utils/Util.h"
#include "paddle/utils/common.h"
#include "ParameterService.pb.h"
...
...
paddle/pserver/ParameterServer2.h
浏览文件 @
be8b1268
...
...
@@ -29,10 +29,10 @@ limitations under the License. */
#include "paddle/math/Vector.h"
#include "paddle/parameter/Parameter.h"
#include "paddle/parameter/ParameterOptimizer.h"
#include "paddle/utils/Common.h"
#include "paddle/utils/Locks.h"
#include "paddle/utils/Stat.h"
#include "paddle/utils/ThreadLocal.h"
#include "paddle/utils/common.h"
#include "ParameterService.pb.h"
...
...
paddle/trainer/Trainer.cpp
浏览文件 @
be8b1268
...
...
@@ -14,7 +14,6 @@ limitations under the License. */
#include "Trainer.h"
#include <fenv.h>
#include <stdio.h>
#include <iomanip>
...
...
@@ -24,7 +23,7 @@ limitations under the License. */
#include <google/protobuf/text_format.h>
#include "paddle/utils/
Excepts
.h"
#include "paddle/utils/
Common
.h"
#include "paddle/utils/GlobalConstants.h"
#include "paddle/utils/PythonUtil.h"
#include "paddle/utils/Stat.h"
...
...
paddle/trainer/TrainerMain.cpp
浏览文件 @
be8b1268
...
...
@@ -12,9 +12,8 @@ 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. */
#include <fenv.h>
#include "paddle/pserver/ParameterServer2.h"
#include "paddle/utils/
Excepts
.h"
#include "paddle/utils/
Common
.h"
#include "paddle/utils/PythonUtil.h"
#include "paddle/utils/StringUtil.h"
...
...
paddle/utils/CpuId.h
浏览文件 @
be8b1268
...
...
@@ -11,7 +11,7 @@ limitations under the License. */
#pragma once
#include "
c
ommon.h"
#include "
C
ommon.h"
namespace
paddle
{
...
...
paddle/utils/Excepts.h
浏览文件 @
be8b1268
...
...
@@ -15,6 +15,8 @@ limitations under the License. */
#ifndef EXCEPTS_H_
#define EXCEPTS_H_
#include <fenv.h>
#if defined(__APPLE__) || defined(__OSX__)
int
fegetexcept
(
void
);
...
...
paddle/utils/Locks.h
浏览文件 @
be8b1268
...
...
@@ -19,7 +19,7 @@ limitations under the License. */
#include <condition_variable>
#include <mutex>
#include "
c
ommon.h"
#include "
C
ommon.h"
namespace
paddle
{
...
...
paddle/utils/Util.h
浏览文件 @
be8b1268
...
...
@@ -26,9 +26,9 @@ limitations under the License. */
#include <unordered_map>
#include <vector>
#include "Common.h"
#include "Logging.h"
#include "TrainerConfig.pb.h"
#include "common.h"
#include "Flags.h"
#include "hl_gpu.h"
...
...
paddle/utils/Version.h
浏览文件 @
be8b1268
...
...
@@ -15,7 +15,7 @@ limitations under the License. */
#pragma once
#include <stddef.h>
#include <iostream>
#include "
c
ommon.h"
#include "
C
ommon.h"
namespace
paddle
{
...
...
paddle/utils/Excepts.cpp
→
paddle/utils/
arch/osx/
Excepts.cpp
浏览文件 @
be8b1268
...
...
@@ -12,12 +12,10 @@ 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. */
#include "Excepts.h"
#include "
paddle/utils/
Excepts.h"
#if defined(__APPLE__) || defined(__OSX__)
#include <fenv.h>
int
fegetexcept
(
void
)
{
static
fenv_t
fenv
;
return
fegetenv
(
&
fenv
)
?
-
1
:
(
fenv
.
__control
&
FE_ALL_EXCEPT
);
...
...
paddle/utils/common.h
浏览文件 @
be8b1268
...
...
@@ -14,6 +14,8 @@ limitations under the License. */
#pragma once
#include "Excepts.h"
/**
* Disable copy macro.
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录