Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
六月暴雪飞梨花
Paddle
提交
c1ad52f7
P
Paddle
项目概览
六月暴雪飞梨花
/
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,发现更多精彩内容 >>
提交
c1ad52f7
编写于
8月 24, 2018
作者:
D
dzhwinter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pre-commit
上级
89f95ea2
变更
20
显示空白变更内容
内联
并排
Showing
20 changed file
with
73 addition
and
75 deletion
+73
-75
doc/fluid/dev/contribute_to_paddle_cn.md
doc/fluid/dev/contribute_to_paddle_cn.md
+1
-1
doc/fluid/dev/contribute_to_paddle_en.md
doc/fluid/dev/contribute_to_paddle_en.md
+1
-1
doc/fluid/new_docs/advanced_usage/development/contribute_to_paddle.md
...w_docs/advanced_usage/development/contribute_to_paddle.md
+1
-1
doc/fluid/new_docs/advanced_usage/development/cpu_profiling_cn.md
...d/new_docs/advanced_usage/development/cpu_profiling_cn.md
+1
-1
doc/fluid/new_docs/advanced_usage/development/host_memory_profiling_cn.md
...cs/advanced_usage/development/host_memory_profiling_cn.md
+1
-1
doc/fluid/new_docs/advanced_usage/development/new_op.md
doc/fluid/new_docs/advanced_usage/development/new_op.md
+1
-1
doc/fluid/new_docs/advanced_usage/development/timeline_cn.md
doc/fluid/new_docs/advanced_usage/development/timeline_cn.md
+1
-1
doc/v2/dev/contribute_to_paddle_en.md
doc/v2/dev/contribute_to_paddle_en.md
+1
-1
paddle/fluid/framework/data_type.h
paddle/fluid/framework/data_type.h
+2
-2
paddle/fluid/framework/data_type_transform.cu
paddle/fluid/framework/data_type_transform.cu
+14
-0
paddle/fluid/framework/lod_tensor.cc
paddle/fluid/framework/lod_tensor.cc
+6
-6
paddle/fluid/framework/lod_tensor_test.cc
paddle/fluid/framework/lod_tensor_test.cc
+1
-1
paddle/fluid/framework/rw_lock.h
paddle/fluid/framework/rw_lock.h
+1
-1
paddle/fluid/framework/tensor_util.cu
paddle/fluid/framework/tensor_util.cu
+14
-0
paddle/fluid/memory/detail/system_allocator.cc
paddle/fluid/memory/detail/system_allocator.cc
+6
-6
paddle/fluid/operators/math/math_function.h
paddle/fluid/operators/math/math_function.h
+0
-1
paddle/fluid/platform/cpu_info.cc
paddle/fluid/platform/cpu_info.cc
+8
-7
paddle/fluid/platform/device_tracer.h
paddle/fluid/platform/device_tracer.h
+4
-6
paddle/fluid/platform/enforce.h
paddle/fluid/platform/enforce.h
+9
-8
paddle/fluid/platform/port.h
paddle/fluid/platform/port.h
+0
-29
未找到文件。
doc/fluid/dev/contribute_to_paddle_cn.md
浏览文件 @
c1ad52f7
doc/fluid/dev/contribute_to_paddle_en.md
浏览文件 @
c1ad52f7
doc/fluid/new_docs/advanced_usage/development/contribute_to_paddle.md
浏览文件 @
c1ad52f7
doc/fluid/new_docs/advanced_usage/development/cpu_profiling_cn.md
浏览文件 @
c1ad52f7
doc/fluid/new_docs/advanced_usage/development/host_memory_profiling_cn.md
浏览文件 @
c1ad52f7
doc/fluid/new_docs/advanced_usage/development/new_op.md
浏览文件 @
c1ad52f7
doc/fluid/new_docs/advanced_usage/development/timeline_cn.md
浏览文件 @
c1ad52f7
doc/v2/dev/contribute_to_paddle_en.md
浏览文件 @
c1ad52f7
paddle/fluid/framework/data_type.h
浏览文件 @
c1ad52f7
paddle/fluid/framework/data_type_transform.cu
浏览文件 @
c1ad52f7
// Copyright (c) 2018 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.
data_type_transform
.
cc
\ No newline at end of file
paddle/fluid/framework/lod_tensor.cc
浏览文件 @
c1ad52f7
...
...
@@ -337,13 +337,13 @@ class Writer {};
class
Scanner
{};
void
WriteToRecordIO
(
recordio
::
Writer
*
writer
,
const
std
::
vector
<
LoDTensor
>
&
tensor
,
const
platform
::
DeviceContext
&
dev_ctx
)
{
}
const
platform
::
DeviceContext
&
dev_ctx
)
{}
bool
ReadFromRecordIO
(
recordio
::
Scanner
*
scanner
,
const
platform
::
DeviceContext
&
dev_ctx
,
std
::
vector
<
LoDTensor
>
*
result_ptr
)
{
PADDLE_ENFORCE
(
"windows didn't supported recordio!."
);
return
true
;}
return
true
;
}
#endif // _WIN32
std
::
vector
<
LoDTensor
>
LoDTensor
::
SplitLoDTensor
(
const
std
::
vector
<
platform
::
Place
>
places
)
const
{
...
...
paddle/fluid/framework/lod_tensor_test.cc
浏览文件 @
c1ad52f7
paddle/fluid/framework/rw_lock.h
浏览文件 @
c1ad52f7
paddle/fluid/framework/tensor_util.cu
浏览文件 @
c1ad52f7
// Copyright (c) 2018 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.
tensor_util
.
cc
\ No newline at end of file
paddle/fluid/memory/detail/system_allocator.cc
浏览文件 @
c1ad52f7
...
...
@@ -16,8 +16,8 @@ limitations under the License. */
#include "paddle/fluid/memory/detail/system_allocator.h"
#ifdef _WIN32
#include <windows.h>
#include <malloc.h>
#include <windows.h>
#else
#include <sys/mman.h> // for mlock and munlock
#endif
...
...
@@ -44,11 +44,11 @@ namespace detail {
void
*
AlignedMalloc
(
size_t
size
)
{
void
*
p
=
nullptr
;
size_t
alignment
=
32ul
;
#ifdef PADDLE_WITH_MKLDNN
#ifdef PADDLE_WITH_MKLDNN
// refer to https://github.com/01org/mkl-dnn/blob/master/include/mkldnn.hpp
// memory alignment
alignment
=
4096ul
;
#endif
#endif
#ifdef _WIN32
p
=
_aligned_malloc
(
size
,
alignment
);
#else
...
...
paddle/fluid/operators/math/math_function.h
浏览文件 @
c1ad52f7
...
...
@@ -17,7 +17,6 @@ limitations under the License. */
#include "paddle/fluid/platform/dynload/mklml.h"
#endif
#ifdef PADDLE_USE_OPENBLAS
#include <cblas.h>
#endif
...
...
paddle/fluid/platform/cpu_info.cc
浏览文件 @
c1ad52f7
...
...
@@ -24,8 +24,8 @@ limitations under the License. */
#include <sys/types.h>
#elif defined(_WIN32)
#define NOMINMAX
#include <windows.h>
#include <psapi.h>
#include <windows.h>
#else
#include <unistd.h>
#endif
...
...
@@ -47,7 +47,8 @@ DEFINE_uint64(initial_cpu_memory_in_mb,
#endif
"Initial CPU memory for PaddlePaddle, in MD unit."
);
#else
DEFINE_uint64
(
initial_cpu_memory_in_mb
,
500ul
,
"Initial CPU memory for PaddlePaddle, in MD unit."
);
DEFINE_uint64
(
initial_cpu_memory_in_mb
,
500ul
,
"Initial CPU memory for PaddlePaddle, in MD unit."
);
#endif // !defined(_WIN32)
DEFINE_double
(
...
...
@@ -68,10 +69,10 @@ inline size_t CpuTotalPhysicalMemory() {
if
(
sysctl
(
mib
,
2
,
&
size
,
&
len
,
NULL
,
0
)
==
0
)
return
(
size_t
)
size
;
return
0L
;
#elif defined(_WIN32)
MEMORYSTATUSEX
sMeminfo
;
sMeminfo
.
dwLength
=
sizeof
(
sMeminfo
);
GlobalMemoryStatusEx
(
&
sMeminfo
);
return
sMeminfo
.
ullTotalPhys
;
MEMORYSTATUSEX
sMeminfo
;
sMeminfo
.
dwLength
=
sizeof
(
sMeminfo
);
GlobalMemoryStatusEx
(
&
sMeminfo
);
return
sMeminfo
.
ullTotalPhys
;
#else
int64_t
pages
=
sysconf
(
_SC_PHYS_PAGES
);
int64_t
page_size
=
sysconf
(
_SC_PAGE_SIZE
);
...
...
paddle/fluid/platform/device_tracer.h
浏览文件 @
c1ad52f7
...
...
@@ -39,9 +39,7 @@ inline uint64_t PosixInNsec() {
return
1000
*
(
static_cast
<
uint64_t
>
(
tv
.
tv_sec
)
*
1000000
+
tv
.
tv_usec
);
}
#else
inline
uint64_t
PosixInNsec
()
{
return
static_cast
<
uint64_t
>
(
0
);
}
inline
uint64_t
PosixInNsec
()
{
return
static_cast
<
uint64_t
>
(
0
);
}
#endif // !_WIN32
// DeviceTracer performs the following tasks:
...
...
paddle/fluid/platform/enforce.h
浏览文件 @
c1ad52f7
...
...
@@ -33,9 +33,9 @@ limitations under the License. */
#include <string>
#include "glog/logging.h"
#include "paddle/fluid/platform/port.h"
#include "paddle/fluid/platform/macros.h"
#include "paddle/fluid/platform/port.h"
#include "paddle/fluid/platform/port.h"
#include "paddle/fluid/string/printf.h"
#include "paddle/fluid/string/to_string.h"
...
...
@@ -267,10 +267,11 @@ inline void throw_on_error(T e) {
#endif
#else // !_WIN32
#define GLOG_NO_ABBREVIATED_SEVERITIES
// disable enforce, caused by the varardic macro exception error
// disable enforce, caused by the varardic macro exception error
#define PADDLE_THROW(x) \
do { \
throw std::make_exception_ptr(std::runtime_error("Windows disable the enforce.")); \
throw std::make_exception_ptr( \
std::runtime_error("Windows disable the enforce.")); \
} while (false)
#define PADDLE_ENFORCE(x) x
...
...
paddle/fluid/platform/port.h
浏览文件 @
c1ad52f7
<<<<<<<
HEAD
#pragma once
#include <string>
#include <stdexcept>
#if !defined(_WIN32)
#include <dlfcn.h> // for dladdr
#include <execinfo.h> // for backtrace
#else
#define NOMINMAX // windows min(), max() macro will mess std::min,max
#include <Shlwapi.h>
#include <Windows.h>
namespace
{
static
void
*
dlsym
(
void
*
handle
,
const
char
*
symbol_name
)
{
FARPROC
found_symbol
;
found_symbol
=
GetProcAddress
((
HMODULE
)
handle
,
symbol_name
);
if
(
found_symbol
==
NULL
)
{
throw
std
::
runtime_error
(
std
::
string
(
symbol_name
)
+
" not found."
);
}
return
(
void
*
)
found_symbol
;
}
}
// namespace anoymous
#endif
=======
// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
...
...
@@ -63,4 +35,3 @@ static void* dlsym(void* handle, const char* symbol_name) {
}
#endif
>>>>>>>
origin
/
develop
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录