Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
0e6a18be
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看板
提交
0e6a18be
编写于
7年前
作者:
G
gangliao
提交者:
GitHub
7年前
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2339 from wangkuiyi/move_majel_tests
Move majel/test/* to majel/; Update generic.cmake
上级
3070dd56
8a2cf0fb
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
66 addition
and
56 deletion
+66
-56
cmake/generic.cmake
cmake/generic.cmake
+61
-53
paddle/majel/CMakeLists.txt
paddle/majel/CMakeLists.txt
+5
-3
paddle/majel/cuda_test.cu
paddle/majel/cuda_test.cu
+0
-0
paddle/majel/ddim_test.cc
paddle/majel/ddim_test.cc
+0
-0
paddle/majel/dim_test.cu
paddle/majel/dim_test.cu
+0
-0
paddle/majel/place_test.cc
paddle/majel/place_test.cc
+0
-0
未找到文件。
cmake/generic.cmake
浏览文件 @
0e6a18be
# 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.
...
...
@@ -16,7 +16,7 @@
# To simplify the build process of PaddlePaddle, we defined couple of
# fundamental abstractions, e.g., how to build library, binary and
# test in C++, CUDA and Go.
#
#
# -------------------------------------------
# C++ CUDA C++ Go
# -------------------------------------------
...
...
@@ -47,7 +47,7 @@ function(link_gtest TARGET_NAME)
add_dependencies
(
${
TARGET_NAME
}
gtest
)
endfunction
()
# cc_library parses tensor.cc and figures out that target also depend on tensor.h.
# cc_library(tensor
# SRCS
...
...
@@ -79,7 +79,7 @@ function(cc_binary TARGET_NAME)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_binary
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
cc_binary_SRCS
}
)
if
(
cc_binary_DEPS
)
if
(
cc_binary_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
endif
()
...
...
@@ -94,18 +94,20 @@ endfunction(cc_binary)
# DEPS
# tensor)
function
(
cc_test TARGET_NAME
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
cc_test_SRCS
}
)
if
(
cc_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
if
(
WITH_TESTING
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
cc_test_SRCS
}
)
if
(
cc_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
cc_test
)
# Suppose that ops.cu includes global functions that take Tensor as
...
...
@@ -117,31 +119,35 @@ endfunction(cc_test)
# DEPS
# tensor)
function
(
nv_library TARGET_NAME
)
set
(
options OPTIONAL
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
if
(
${
nv_library_OPTIONAL
}
STREQUAL
"SHARED"
)
cuda_add_library
(
${
TARGET_NAME
}
SHARED
${
nv_library_SRCS
}
)
else
()
cuda_add_library
(
${
TARGET_NAME
}
STATIC
${
nv_library_SRCS
}
)
endif
()
if
(
nv_library_DEPS
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_library_DEPS
}
)
if
(
WITH_GPU
)
set
(
options OPTIONAL
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
if
(
${
nv_library_OPTIONAL
}
STREQUAL
"SHARED"
)
cuda_add_library
(
${
TARGET_NAME
}
SHARED
${
nv_library_SRCS
}
)
else
()
cuda_add_library
(
${
TARGET_NAME
}
STATIC
${
nv_library_SRCS
}
)
endif
()
if
(
nv_library_DEPS
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_library_DEPS
}
)
endif
()
endif
()
endfunction
(
nv_library
)
function
(
nv_binary TARGET_NAME
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_binary
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_binary_SRCS
}
)
if
(
nv_binary_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
if
(
WITH_GPU
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_binary
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_binary_SRCS
}
)
if
(
nv_binary_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endfunction
(
nv_binary
)
# The dependency to target tensor implies that if any of
...
...
@@ -152,18 +158,20 @@ endfunction(nv_binary)
# DEPS
# ops)
function
(
nv_test TARGET_NAME
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_test_SRCS
}
)
if
(
nv_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
if
(
WITH_GPU AND WITH_TESTING
)
set
(
options
""
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_test_SRCS
}
)
if
(
nv_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
nv_test
)
set
(
GOPATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/go"
)
...
...
@@ -189,7 +197,7 @@ function(go_library TARGET_NAME)
set
(
LIB_NAME
"lib
${
TARGET_NAME
}
.dylib"
)
else
()
set
(
LIB_NAME
"lib
${
TARGET_NAME
}
.so"
)
endif
()
endif
()
else
()
set
(
BUILD_MODE
"-buildmode=c-archive"
)
set
(
LIB_NAME
"lib
${
TARGET_NAME
}
.a"
)
...
...
@@ -215,8 +223,8 @@ function(go_binary TARGET_NAME)
COMMAND env GOPATH=
${
GOPATH
}
${
CMAKE_Go_COMPILER
}
build
-o
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
"
${
go_library_SRCS
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_LIST_DIR
}
)
add_custom_target
(
${
TARGET_NAME
}
ALL DEPENDS
${
TARGET_NAME
}
_timestamp
${
go_binary_DEPS
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_LIST_DIR
}
)
add_custom_target
(
${
TARGET_NAME
}
ALL DEPENDS
${
TARGET_NAME
}
_timestamp
${
go_binary_DEPS
}
)
install
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
DESTINATION bin
)
endfunction
(
go_binary
)
...
...
@@ -229,8 +237,8 @@ function(go_test TARGET_NAME)
COMMAND env GOPATH=
${
GOPATH
}
${
CMAKE_Go_COMPILER
}
test
-c -o
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
"
${
go_test_SRCS
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_LIST_DIR
}
)
add_custom_target
(
${
TARGET_NAME
}
ALL DEPENDS
${
TARGET_NAME
}
_timestamp
${
go_test_DEPS
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_LIST_DIR
}
)
add_custom_target
(
${
TARGET_NAME
}
ALL DEPENDS
${
TARGET_NAME
}
_timestamp
${
go_test_DEPS
}
)
add_test
(
${
TARGET_NAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
)
endfunction
(
go_test
)
...
...
This diff is collapsed.
Click to expand it.
paddle/majel/CMakeLists.txt
浏览文件 @
0e6a18be
cc_library
(
place SRCS place.cc
)
cc_test
(
place_test SRCS place_test.cc DEPS place
)
cc_library
(
ddim SRCS ddim.cc
)
cc_test
(
ddim_test SRCS ddim_test.cc DEPS ddim
)
if
(
WITH_TESTING
)
add_subdirectory
(
test
)
endif
()
nv_test
(
cuda_test SRCS cuda_test.cu
)
nv_test
(
dim_test SRCS dim_test.cu DEPS ddim
)
This diff is collapsed.
Click to expand it.
paddle/majel/
test/
cuda_test.cu
→
paddle/majel/cuda_test.cu
浏览文件 @
0e6a18be
文件已移动
This diff is collapsed.
Click to expand it.
paddle/majel/
test/
ddim_test.cc
→
paddle/majel/ddim_test.cc
浏览文件 @
0e6a18be
文件已移动
This diff is collapsed.
Click to expand it.
paddle/majel/
test/
dim_test.cu
→
paddle/majel/dim_test.cu
浏览文件 @
0e6a18be
文件已移动
This diff is collapsed.
Click to expand it.
paddle/majel/
test/
place_test.cc
→
paddle/majel/place_test.cc
浏览文件 @
0e6a18be
文件已移动
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部