Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

【OPT】 change name form model_optimize_tool into OPT #2850

Merged
merged 3 commits into from
Feb 13, 2020
Merged

【OPT】 change name form model_optimize_tool into OPT #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab1a5b7
modify opt name test=develop
DannyIsFunny Feb 10, 2020
0ef83a0
fix code style test=develop
DannyIsFunny Feb 11, 2020
cc643a4
test=develop
DannyIsFunny Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lite/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ if (LITE_ON_TINY_PUBLISH)
endif()

if (LITE_ON_MODEL_OPTIMIZE_TOOL)
message(STATUS "Compiling model_optimize_tool")
lite_cc_binary(model_optimize_tool SRCS model_optimize_tool.cc cxx_api_impl.cc paddle_api.cc cxx_api.cc
message(STATUS "Compiling OPT")
lite_cc_binary(OPT SRCS opt.cc cxx_api_impl.cc paddle_api.cc cxx_api.cc
DEPS gflags kernel op optimizer mir_passes utils)
add_dependencies(model_optimize_tool op_list_h kernel_list_h all_kernel_faked_cc supported_kernel_op_info_h)
add_dependencies(OPT op_list_h kernel_list_h all_kernel_faked_cc supported_kernel_op_info_h)
endif(LITE_ON_MODEL_OPTIMIZE_TOOL)

lite_cc_test(test_paddle_api SRCS paddle_api_test.cc DEPS paddle_api_full paddle_api_light
Expand Down
2 changes: 1 addition & 1 deletion lite/api/model_optimize_tool.cc → lite/api/opt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#endif
// "supported_kernel_op_info.h", "all_kernel_faked.cc" and "kernel_src_map.h"
// are created automatically during model_optimize_tool's compiling period
// are created automatically during OPT's compiling period
#include <iomanip>
#include "all_kernel_faked.cc" // NOLINT
#include "kernel_src_map.h" // NOLINT
Expand Down
10 changes: 5 additions & 5 deletions lite/tools/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ function prepare_thirdparty {
fi
}

function build_model_optimize_tool {
function build_opt {
cd $workspace
prepare_thirdparty
mkdir -p build.model_optimize_tool
cd build.model_optimize_tool
mkdir -p build.opt
cd build.opt
cmake .. -DWITH_LITE=ON \
-DLITE_ON_MODEL_OPTIMIZE_TOOL=ON \
-DWITH_TESTING=OFF \
-DLITE_BUILD_EXTRA=ON \
-DWITH_MKL=OFF
make model_optimize_tool -j$NUM_PROC
make OPT -j$NUM_PROC
}

function make_tiny_publish_so {
Expand Down Expand Up @@ -395,7 +395,7 @@ function main {
shift
;;
build_optimize_tool)
build_model_optimize_tool
build_opt
shift
;;
cuda)
Expand Down
2 changes: 1 addition & 1 deletion lite/tools/ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ function test_model_optimize_tool_compile {
cd $workspace
cd build
cmake .. -DWITH_LITE=ON -DLITE_ON_MODEL_OPTIMIZE_TOOL=ON -DWITH_TESTING=OFF -DLITE_BUILD_EXTRA=ON
make model_optimize_tool -j$NUM_CORES_FOR_COMPILE
make OPT -j$NUM_CORES_FOR_COMPILE
}

function _test_paddle_code_generator {
Expand Down