Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
630943c7
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看板
未验证
提交
630943c7
编写于
4月 13, 2018
作者:
Y
Yi Wang
提交者:
GitHub
4月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update documentation (#9918)
上级
2f382640
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
19 addition
and
22 deletion
+19
-22
paddle/fluid/platform/cuda_profiler.h
paddle/fluid/platform/cuda_profiler.h
+5
-4
paddle/fluid/platform/variant.h
paddle/fluid/platform/variant.h
+14
-18
未找到文件。
paddle/fluid/platform/cuda_profiler.h
浏览文件 @
630943c7
...
@@ -11,12 +11,13 @@ distributed under the License is distributed on an "AS IS" BASIS,
...
@@ -11,12 +11,13 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#pragma once
#pragma once
#include <cuda_profiler_api.h>
#include <cuda_profiler_api.h>
#include <stdio.h>
#include <stdlib.h>
#include <string>
#include <string.h>
#include "paddle/fluid/platform/enforce.h"
namespace
paddle
{
namespace
paddle
{
namespace
platform
{
namespace
platform
{
...
...
paddle/fluid/platform/variant.h
浏览文件 @
630943c7
...
@@ -14,29 +14,25 @@ limitations under the License. */
...
@@ -14,29 +14,25 @@ limitations under the License. */
#pragma once
#pragma once
#ifdef __CUDACC__
// Boost 1.41.0 requires __CUDACC_VER__, but in CUDA 9 __CUDACC_VER__
#ifdef __CUDACC_VER_MAJOR__
// is removed, so we have to manually define __CUDACC_VER__ instead.
// CUDA 9 define `__CUDACC_VER__` as a warning message, manually define
// For details, please refer to
// __CUDACC_VER__ instead.
// https://github.com/PaddlePaddle/Paddle/issues/6626
#if defined(__CUDACC__) && defined(__CUDACC_VER_MAJOR__)
#undef __CUDACC_VER__
#undef __CUDACC_VER__
#define __CUDACC_VER__ \
#define __CUDACC_VER__ \
(__CUDACC_VER_MAJOR__ * 10000 + __CUDACC_VER_MINOR__ * 100 + \
__CUDACC_VER_BUILD__ + __CUDACC_VER_MAJOR__ * 10000 + \
__CUDACC_VER_BUILD__)
__CUDACC_VER_MINOR__ * 100
#endif
#endif
#endif
#include
<boost/config.hpp>
#include
"boost/config.hpp"
#ifdef PADDLE_WITH_CUDA
// Because Boost 1.41.0's variadic templates has bug on nvcc, boost
// will disable variadic template support in NVCC mode. Define
// Because boost's variadic templates has bug on nvcc, boost will disable
// BOOST_NO_CXX11_VARIADIC_TEMPLATES on gcc/clang to generate same
// variadic template support when GPU enabled on nvcc.
// function symbols. For details,
// Define BOOST_NO_CXX11_VARIADIC_TEMPLATES on gcc/clang to generate same
// function symbols.
//
// https://github.com/PaddlePaddle/Paddle/issues/3386
// https://github.com/PaddlePaddle/Paddle/issues/3386
#ifdef PADDLE_WITH_CUDA
#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录