Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
1dafbaba
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
1dafbaba
编写于
5月 04, 2017
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into cmake_protobuf
上级
1ddb9bf7
42d64085
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
14 deletion
+13
-14
paddle/math/MathFunctions.cpp
paddle/math/MathFunctions.cpp
+9
-2
paddle/math/tests/test_matrixCompare.cpp
paddle/math/tests/test_matrixCompare.cpp
+1
-8
paddle/utils/DynamicLoader.cpp
paddle/utils/DynamicLoader.cpp
+1
-1
python/paddle/v2/dataset/imikolov.py
python/paddle/v2/dataset/imikolov.py
+2
-3
未找到文件。
paddle/math/MathFunctions.cpp
浏览文件 @
1dafbaba
...
@@ -29,13 +29,20 @@ void* lapack_dso_handle = nullptr;
...
@@ -29,13 +29,20 @@ void* lapack_dso_handle = nullptr;
*
*
* note: default dynamic linked libs
* note: default dynamic linked libs
*/
*/
// The argument for stringizing operator is not macro-expanded first.
// We have to use two levels of macro to do the expansion.
// See https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
#define STR(x) #x
#define DYNAMIC_LOAD_LAPACK_WRAP(__name) \
#define DYNAMIC_LOAD_LAPACK_WRAP(__name) \
struct DynLoad__##__name { \
struct DynLoad__##__name { \
template <typename... Args> \
template <typename... Args> \
auto operator()(Args... args) -> decltype(__name(args...)) { \
auto operator()(Args... args) -> decltype(__name(args...)) { \
using lapack_func = decltype(__name(args...)) (*)(Args...); \
using lapack_func = decltype(__name(args...)) (*)(Args...); \
std::call_once(lapack_dso_flag, GetLapackDsoHandle, &lapack_dso_handle); \
std::call_once(lapack_dso_flag, GetLapackDsoHandle, &lapack_dso_handle); \
void* p_##__name = dlsym(lapack_dso_handle, #__name); \
void* p_##__name = dlsym(lapack_dso_handle, STR(__name)); \
CHECK(p_##__name) << "Cannot find symbol " << STR(__name) \
<< " in liblapack.so"; \
return reinterpret_cast<lapack_func>(p_##__name)(args...); \
return reinterpret_cast<lapack_func>(p_##__name)(args...); \
} \
} \
} __name; // struct DynLoad__##__name
} __name; // struct DynLoad__##__name
...
@@ -51,7 +58,7 @@ void* lapack_dso_handle = nullptr;
...
@@ -51,7 +58,7 @@ void* lapack_dso_handle = nullptr;
#define PADDLE_DGETRF LAPACKE_dgetrf
#define PADDLE_DGETRF LAPACKE_dgetrf
#define PADDLE_SGETRI LAPACKE_sgetri
#define PADDLE_SGETRI LAPACKE_sgetri
#define PADDLE_DGETRI LAPACKE_dgetri
#define PADDLE_DGETRI LAPACKE_dgetri
#endif
#endif
#define LAPACK_ROUTINE_EACH(__macro) \
#define LAPACK_ROUTINE_EACH(__macro) \
__macro(PADDLE_SGETRF) \
__macro(PADDLE_SGETRF) \
...
...
paddle/math/tests/test_matrixCompare.cpp
浏览文件 @
1dafbaba
...
@@ -237,14 +237,7 @@ TEST(Matrix, unary) {
...
@@ -237,14 +237,7 @@ TEST(Matrix, unary) {
testMatrixRotate
(
height
,
width
);
testMatrixRotate
(
height
,
width
);
}
}
// inverse matrix
// inverse matrix
void
**
dso_handler
=
nullptr
;
testMatrixInverse
(
height
);
GetLapackDsoHandle
(
dso_handler
);
if
(
nullptr
==
*
dso_handler
)
{
LOG
(
WARNING
)
<<
"Failed to find liblapack.so, please specify its path "
"using LD_LIBRARY_PATH."
;
}
else
{
testMatrixInverse
(
height
);
}
}
}
}
}
...
...
paddle/utils/DynamicLoader.cpp
浏览文件 @
1dafbaba
...
@@ -52,7 +52,7 @@ static inline std::string join(const std::string& part1,
...
@@ -52,7 +52,7 @@ static inline std::string join(const std::string& part1,
static
inline
void
GetDsoHandleFromDefaultPath
(
std
::
string
&
dso_path
,
static
inline
void
GetDsoHandleFromDefaultPath
(
std
::
string
&
dso_path
,
void
**
dso_handle
,
void
**
dso_handle
,
int
dynload_flags
)
{
int
dynload_flags
)
{
VLOG
(
3
)
<<
"Try to find
cuda
library: "
<<
dso_path
VLOG
(
3
)
<<
"Try to find library: "
<<
dso_path
<<
" from default system path."
;
<<
" from default system path."
;
// default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH
// default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH
*
dso_handle
=
dlopen
(
dso_path
.
c_str
(),
dynload_flags
);
*
dso_handle
=
dlopen
(
dso_path
.
c_str
(),
dynload_flags
);
...
...
python/paddle/v2/dataset/imikolov.py
浏览文件 @
1dafbaba
...
@@ -41,7 +41,7 @@ def word_count(f, word_freq=None):
...
@@ -41,7 +41,7 @@ def word_count(f, word_freq=None):
return
word_freq
return
word_freq
def
build_dict
():
def
build_dict
(
typo_freq
=
50
):
"""
"""
Build a word dictionary from the corpus, Keys of the dictionary are words,
Build a word dictionary from the corpus, Keys of the dictionary are words,
and values are zero-based IDs of these words.
and values are zero-based IDs of these words.
...
@@ -59,8 +59,7 @@ def build_dict():
...
@@ -59,8 +59,7 @@ def build_dict():
# remove <unk> for now, since we will set it as last index
# remove <unk> for now, since we will set it as last index
del
word_freq
[
'<unk>'
]
del
word_freq
[
'<unk>'
]
TYPO_FREQ
=
50
word_freq
=
filter
(
lambda
x
:
x
[
1
]
>
typo_freq
,
word_freq
.
items
())
word_freq
=
filter
(
lambda
x
:
x
[
1
]
>
TYPO_FREQ
,
word_freq
.
items
())
word_freq_sorted
=
sorted
(
word_freq
,
key
=
lambda
x
:
(
-
x
[
1
],
x
[
0
]))
word_freq_sorted
=
sorted
(
word_freq
,
key
=
lambda
x
:
(
-
x
[
1
],
x
[
0
]))
words
,
_
=
list
(
zip
(
*
word_freq_sorted
))
words
,
_
=
list
(
zip
(
*
word_freq_sorted
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录