diff --git a/CMakeLists.txt b/CMakeLists.txt index 37cce8746ab636bb1c163acd40173e4634687f77..cefee607adeb6943d680274c473058bec6cb46d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,13 +54,10 @@ option(WITH_NGRAPH "Compile PaddlePaddle with nGraph support." OFF) option(WITH_DSO "Compile PaddlePaddle with dynamic linked CUDA" ON) option(WITH_TESTING "Compile PaddlePaddle with unit testing" OFF) option(WITH_PYTHON "Compile PaddlePaddle with python interpreter" ON) -option(WITH_TIMER "Compile PaddlePaddle with stats timer" OFF) option(WITH_PROFILER "Compile PaddlePaddle with GPU profiler and gperftools" OFF) option(WITH_JEMALLOC "Compile PaddlePaddle with jemalloc" OFF) -option(WITH_DOC "Compile PaddlePaddle with documentation" OFF) option(WITH_COVERAGE "Compile PaddlePaddle with code coverage" OFF) option(COVERALLS_UPLOAD "Package code coverage data to coveralls" OFF) -option(ON_TRAVIS "Exclude special unit test on Travis CI" OFF) option(WITH_FLUID_ONLY "Compile PaddlePaddle fluid only" OFF) option(WITH_GOLANG "Compile PaddlePaddle with GOLANG" OFF) option(GLIDE_INSTALL "Download and install go dependencies " ON) diff --git a/cmake/configure.cmake b/cmake/configure.cmake index cc5ee3f6549bc77e83d3d947daf241fd70082329..498ff019c53e72335e788fee1dcdb34861a590cb 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -29,10 +29,6 @@ if(WITH_TESTING) add_definitions(-DPADDLE_WITH_TESTING) endif(WITH_TESTING) -if(NOT WITH_TIMER) - add_definitions(-DPADDLE_DISABLE_TIMER) -endif(NOT WITH_TIMER) - if(EIGEN_USE_THREADS) add_definitions(-DEIGEN_USE_THREADS) endif(EIGEN_USE_THREADS) diff --git a/paddle/contrib/float16/run_float16_demo.sh b/paddle/contrib/float16/run_float16_demo.sh index 031225a85dabb26e5d9ea06f58909c049e7f0c08..9701588d8f3ecc1ce04e2fe60cb60efc34825228 100755 --- a/paddle/contrib/float16/run_float16_demo.sh +++ b/paddle/contrib/float16/run_float16_demo.sh @@ -14,7 +14,6 @@ cmake .. -DWITH_AVX=OFF \ -DWITH_MKL=OFF \ -DWITH_GPU=ON \ -DWITH_TESTING=ON \ - -DWITH_TIMER=ON \ -DWITH_PROFILER=ON \ -DWITH_FLUID_ONLY=ON make -j `nproc` diff --git a/paddle/scripts/README.md b/paddle/scripts/README.md index 6c608fce3cdad38f3109e563be3ffbe2f73e5390..0d6921bdf805a8be32b15c6bca23c399e0f9fc59 100644 --- a/paddle/scripts/README.md +++ b/paddle/scripts/README.md @@ -71,7 +71,6 @@ Users can specify the following Docker build arguments with either "ON" or "OFF" | `WITH_STYLE_CHECK` | ON | Check the code style when building. | | `PYTHON_ABI` | "" | Build for different python ABI support, can be cp27-cp27m or cp27-cp27mu | | `RUN_TEST` | OFF | Run unit test immediently after the build. | -| `WITH_DOC` | OFF | Build docs after build binaries. | | `WOBOQ` | OFF | Generate WOBOQ code viewer under `build/woboq_out` | ## Docker Images diff --git a/paddle/scripts/submit_local.sh.in b/paddle/scripts/submit_local.sh.in index 9d07bba81ea2c8db4b28693269b29e0d3f5d362f..be8bc294149216583cb75cd70f02a70c05a66ded 100755 --- a/paddle/scripts/submit_local.sh.in +++ b/paddle/scripts/submit_local.sh.in @@ -7,7 +7,6 @@ function version(){ echo " with_mkl: @WITH_MKL@" echo " with_mkldnn: @WITH_MKLDNN@" echo " with_python: @WITH_PYTHON@" - echo " with_timer: @WITH_TIMER@" } function ver2num() {