Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
55437b58
P
Paddle
项目概览
wmsofts
/
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,发现更多精彩内容 >>
提交
55437b58
编写于
8月 18, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ENVIRONMENT interface interface
上级
1808f888
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
139 addition
and
2 deletion
+139
-2
paddle/memory/memory.cc
paddle/memory/memory.cc
+10
-0
paddle/memory/memory.h
paddle/memory/memory.h
+0
-1
paddle/platform/CMakeLists.txt
paddle/platform/CMakeLists.txt
+2
-1
paddle/platform/environment.h
paddle/platform/environment.h
+59
-0
paddle/platform/environment_test.cc
paddle/platform/environment_test.cc
+54
-0
paddle/platform/gpu_info.cc
paddle/platform/gpu_info.cc
+10
-0
paddle/platform/gpu_info.h
paddle/platform/gpu_info.h
+4
-0
未找到文件。
paddle/memory/memory.cc
浏览文件 @
55437b58
...
...
@@ -18,8 +18,13 @@ limitations under the License. */
#include <cstring> // for memcpy
#include <mutex> // for call_once
#include "glog/logging.h"
#include "paddle/memory/detail/buddy_allocator.h"
#include "paddle/memory/detail/system_allocator.h"
#include "paddle/platform/gpu_info.h"
DECLARE_double
(
fraction_of_gpu_memory_to_use
);
namespace
paddle
{
namespace
memory
{
...
...
@@ -79,6 +84,11 @@ BuddyAllocator* GetGPUBuddyAllocator(int gpu_id) {
platform
::
GpuMinChunkSize
(),
platform
::
GpuMaxChunkSize
()));
}
VLOG
(
3
)
<<
"
\n\n
NOTE: each GPU device use "
<<
FLAGS_fraction_of_gpu_memory_to_use
*
100
<<
"% of GPU memory.
\n
"
<<
"You can set environment variable '"
<<
platform
::
kEnvFractionGpuMemoryToUse
<<
"' to change the fraction of GPU usage.
\n\n
"
;
});
platform
::
SetDeviceId
(
gpu_id
);
...
...
paddle/memory/memory.h
浏览文件 @
55437b58
...
...
@@ -14,7 +14,6 @@ limitations under the License. */
#pragma once
#include "paddle/platform/gpu_info.h"
#include "paddle/platform/place.h"
namespace
paddle
{
...
...
paddle/platform/CMakeLists.txt
浏览文件 @
55437b58
cc_library
(
cpu_info SRCS cpu_info.cc DEPS gflags glog
)
cc_test
(
cpu_info_test SRCS cpu_info_test.cc DEPS cpu_info
)
nv_library
(
gpu_info SRCS gpu_info.cc DEPS gflags
)
nv_library
(
gpu_info SRCS gpu_info.cc DEPS gflags
glog
)
cc_library
(
place SRCS place.cc
)
cc_test
(
place_test SRCS place_test.cc DEPS place glog gflags
)
...
...
@@ -9,6 +9,7 @@ cc_test(place_test SRCS place_test.cc DEPS place glog gflags)
add_subdirectory
(
dynload
)
cc_test
(
enforce_test SRCS enforce_test.cc DEPS stringpiece
)
cc_test
(
environment_test SRCS environment_test.cc DEPS stringpiece
)
IF
(
WITH_GPU
)
set
(
GPU_CTX_DEPS dynload_cuda dynamic_loader
)
...
...
paddle/platform/environment.h
0 → 100644
浏览文件 @
55437b58
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
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
#include <stdlib.h>
#include <vector>
#include "paddle/platform/enforce.h"
#include "paddle/string/piece.h"
extern
char
**
environ
;
namespace
paddle
{
namespace
platform
{
inline
void
SetEnvVariable
(
const
std
::
string
&
name
,
const
std
::
string
&
value
)
{
PADDLE_ENFORCE_NE
(
setenv
(
name
.
c_str
(),
value
.
c_str
(),
1
),
-
1
,
"Failed to set environment variable %s=%s"
,
name
,
value
);
}
inline
void
UnsetEnvVariable
(
const
std
::
string
&
name
)
{
PADDLE_ENFORCE_NE
(
unsetenv
(
name
.
c_str
()),
-
1
,
"Failed to unset environment variable %s"
,
name
);
}
inline
bool
IsEnvVarDefined
(
const
std
::
string
&
name
)
{
return
std
::
getenv
(
name
.
c_str
())
!=
nullptr
;
}
inline
std
::
string
GetEnvValue
(
const
std
::
string
&
name
)
{
PADDLE_ENFORCE
(
IsEnvVarDefined
(
name
),
"Tried to access undefined environment variable %s"
,
name
);
return
std
::
getenv
(
name
.
c_str
());
}
inline
std
::
vector
<
std
::
string
>
GetAllEnvVariables
()
{
std
::
vector
<
std
::
string
>
vars
;
for
(
auto
var
=
environ
;
*
var
!=
nullptr
;
++
var
)
{
auto
tail
=
string
::
Index
(
*
var
,
"="
);
auto
name
=
string
::
SubStr
(
*
var
,
0
,
tail
).
ToString
();
vars
.
push_back
(
name
);
}
return
vars
;
}
}
// namespace platform
}
// namespace paddle
paddle/platform/environment_test.cc
0 → 100644
浏览文件 @
55437b58
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
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. */
#include "paddle/platform/environment.h"
#include "glog/logging.h"
#include "gtest/gtest.h"
TEST
(
ENVIRONMENT
,
ACCESS
)
{
namespace
platform
=
paddle
::
platform
;
namespace
string
=
paddle
::
string
;
platform
::
SetEnvVariable
(
"PADDLE_USE_ENV"
,
"TRUE"
);
EXPECT_TRUE
(
platform
::
IsEnvVarDefined
(
"PADDLE_USE_ENV"
));
EXPECT_EQ
(
platform
::
GetEnvValue
(
"PADDLE_USE_ENV"
),
"TRUE"
);
platform
::
UnsetEnvVariable
(
"PADDLE_USE_ENV"
);
EXPECT_FALSE
(
platform
::
IsEnvVarDefined
(
"PADDLE_USE_ENV"
));
platform
::
SetEnvVariable
(
"PADDLE_USE_ENV1"
,
"Hello "
);
platform
::
SetEnvVariable
(
"PADDLE_USE_ENV2"
,
"World, "
);
platform
::
SetEnvVariable
(
"PADDLE_USE_ENV3"
,
"PaddlePaddle!"
);
std
::
string
env_info
;
auto
vars
=
platform
::
GetAllEnvVariables
();
for_each
(
vars
.
begin
(),
vars
.
end
(),
[
&
](
const
std
::
string
&
var
)
{
env_info
+=
platform
::
GetEnvValue
(
var
);
});
EXPECT_TRUE
(
string
::
Contains
(
env_info
,
"Hello World, PaddlePaddle!"
));
platform
::
UnsetEnvVariable
(
"PADDLE_USE_ENV1"
);
platform
::
UnsetEnvVariable
(
"PADDLE_USE_ENV2"
);
platform
::
UnsetEnvVariable
(
"PADDLE_USE_ENV3"
);
env_info
.
clear
();
vars
=
platform
::
GetAllEnvVariables
();
for_each
(
vars
.
begin
(),
vars
.
end
(),
[
&
](
const
std
::
string
&
var
)
{
env_info
+=
platform
::
GetEnvValue
(
var
);
});
EXPECT_FALSE
(
string
::
Contains
(
env_info
,
"Hello World, PaddlePaddle!"
));
EXPECT_FALSE
(
platform
::
IsEnvVarDefined
(
"PADDLE_USE_ENV1"
));
EXPECT_FALSE
(
platform
::
IsEnvVarDefined
(
"PADDLE_USE_ENV2"
));
EXPECT_FALSE
(
platform
::
IsEnvVarDefined
(
"PADDLE_USE_ENV3"
));
}
paddle/platform/gpu_info.cc
浏览文件 @
55437b58
...
...
@@ -13,8 +13,11 @@ See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/platform/gpu_info.h"
#include "gflags/gflags.h"
#include "paddle/platform/enforce.h"
#include "paddle/platform/environment.h"
DEFINE_double
(
fraction_of_gpu_memory_to_use
,
0.95
,
"Default use 95% of GPU memory for PaddlePaddle,"
...
...
@@ -70,6 +73,13 @@ size_t GpuMaxChunkSize() {
GpuMemoryUsage
(
available
,
total
);
if
(
IsEnvVarDefined
(
kEnvFractionGpuMemoryToUse
))
{
auto
val
=
std
::
stod
(
GetEnvValue
(
kEnvFractionGpuMemoryToUse
));
PADDLE_ENFORCE_GT
(
val
,
0.0
);
PADDLE_ENFORCE_LE
(
val
,
1.0
);
FLAGS_fraction_of_gpu_memory_to_use
=
val
;
}
// Reserving the rest memory for page tables, etc.
size_t
reserving
=
(
1
-
FLAGS_fraction_of_gpu_memory_to_use
)
*
total
;
...
...
paddle/platform/gpu_info.h
浏览文件 @
55437b58
...
...
@@ -18,10 +18,14 @@ limitations under the License. */
#include <cuda_runtime.h>
#include <stddef.h>
#include <string>
namespace
paddle
{
namespace
platform
{
//! Environment variable: fraction of GPU memory to use on each device.
const
std
::
string
kEnvFractionGpuMemoryToUse
=
"FRACTION_GPU_MEMORY_TO_USE"
;
//! Get the total number of GPU devices in system.
int
GetDeviceCount
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录