From 2ebd275090b73980f9fff0e0a87d3db16eb1acd7 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Thu, 18 Jul 2019 15:33:48 -0700 Subject: [PATCH 1/2] deprecate USE_PROFILER --- CMakeLists.txt | 1 - benchmark/opperf/README.md | 2 -- docs/faq/env_var.md | 2 +- docs/faq/perf.md | 4 +--- docs/install/osx_setup.md | 1 - docs/tutorials/mkldnn/MKLDNN_README.md | 2 +- example/profiler/README.md | 3 +-- make/maven/maven_darwin_mkl.mk | 2 -- make/maven/maven_linux_cu90mkl.mk | 3 --- make/maven/maven_linux_cu92mkl.mk | 3 --- make/maven/maven_linux_mkl.mk | 3 --- make/pip/pip_darwin_cpu.mk | 3 --- make/pip/pip_darwin_mkl.mk | 3 --- make/pip/pip_linux_cpu.mk | 3 --- make/pip/pip_linux_cu100.mk | 3 --- make/pip/pip_linux_cu100mkl.mk | 3 --- make/pip/pip_linux_cu101.mk | 3 --- make/pip/pip_linux_cu101mkl.mk | 3 --- make/pip/pip_linux_cu75.mk | 3 --- make/pip/pip_linux_cu75mkl.mk | 3 --- make/pip/pip_linux_cu80.mk | 3 --- make/pip/pip_linux_cu80mkl.mk | 3 --- make/pip/pip_linux_cu90.mk | 3 --- make/pip/pip_linux_cu90mkl.mk | 3 --- make/pip/pip_linux_cu91.mk | 3 --- make/pip/pip_linux_cu91mkl.mk | 3 --- make/pip/pip_linux_cu92.mk | 3 --- make/pip/pip_linux_cu92mkl.mk | 3 --- make/pip/pip_linux_mkl.mk | 3 --- tests/jenkins/run_test.sh | 1 - tests/jenkins/run_test_ubuntu.sh | 1 - 31 files changed, 4 insertions(+), 78 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0148ac302d54..19a93c731e00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ mxnet_option(USE_MKLDNN "Use MKLDNN variant of MKL (if MKL found)" ON mxnet_option(USE_OPERATOR_TUNING "Enable auto-tuning of operators" ON IF NOT MSVC) mxnet_option(USE_GPERFTOOLS "Build with GPerfTools support" OFF) mxnet_option(USE_JEMALLOC "Build with Jemalloc support" ON) -mxnet_option(USE_PROFILER "Build with Profiler support" ON) mxnet_option(USE_DIST_KVSTORE "Build with DIST_KVSTORE support" OFF) mxnet_option(USE_PLUGINS_WARPCTC "Use WARPCTC Plugins" OFF) mxnet_option(USE_PLUGIN_CAFFE "Use Caffe Plugin" OFF) diff --git a/benchmark/opperf/README.md b/benchmark/opperf/README.md index 132eb84bf650..e6a367d38f28 100644 --- a/benchmark/opperf/README.md +++ b/benchmark/opperf/README.md @@ -47,8 +47,6 @@ Hence, in this utility, we will build the functionality to allow users and devel ## Prerequisites -This utility uses MXNet profiler under the hood to fetch compute and memory metrics. Hence, you need to build MXNet with `USE_PROFILER=1` flag. - Make sure to build the flavor of MXNet, for example - with/without MKL, with CUDA 9 or 10.1 etc., on which you would like to measure operator performance. Finally, you need to add path to your cloned MXNet repository to the PYTHONPATH. ``` diff --git a/docs/faq/env_var.md b/docs/faq/env_var.md index f6d48af70089..05f70b01a69b 100644 --- a/docs/faq/env_var.md +++ b/docs/faq/env_var.md @@ -188,7 +188,7 @@ $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 ## Control the profiler -When USE_PROFILER is enabled in Makefile or CMake, the following environments can be used to profile the application without changing code. Execution options may affect the granularity of profiling result. If you need profiling result of every operator, please set `MXNET_EXEC_BULK_EXEC_INFERENCE`, `MXNET_EXEC_BULK_EXEC_MAX_NODE_TRAIN` and `MXNET_EXEC_BULK_EXEC_TRAIN` to 0. +The following environments can be used to profile the application without changing code. Execution options may affect the granularity of profiling result. If you need profiling result of every operator, please set `MXNET_EXEC_BULK_EXEC_INFERENCE`, `MXNET_EXEC_BULK_EXEC_MAX_NODE_TRAIN` and `MXNET_EXEC_BULK_EXEC_TRAIN` to 0. * MXNET_PROFILER_AUTOSTART - Values: 0(false) or 1(true) ```(default=0)``` diff --git a/docs/faq/perf.md b/docs/faq/perf.md index 62b40247081c..03a8dbbb20a1 100644 --- a/docs/faq/perf.md +++ b/docs/faq/perf.md @@ -276,9 +276,7 @@ that gives detailed information about execution time at the symbol level. This feature complements general profiling tools like _nvprof_ and _gprof_ by summarizing at the operator level, instead of a function, kernel, or instruction level. -In order to be able to use the profiler, you must compile _MXNet_ with the `USE_PROFILER=1` flag in `config.mk`. - -The profiler can then be turned on with an [environment variable](http://mxnet.io/faq/env_var.html#control-the-profiler) +The profiler can be turned on with an [environment variable](http://mxnet.io/faq/env_var.html#control-the-profiler) for an entire program run, or programmatically for just part of a run. See [example/profiler](https://github.com/dmlc/mxnet/tree/master/example/profiler) for complete examples of how to use the profiler in code, but briefly, the Python code looks like: diff --git a/docs/install/osx_setup.md b/docs/install/osx_setup.md index 6d38c466001b..525b61bc2488 100644 --- a/docs/install/osx_setup.md +++ b/docs/install/osx_setup.md @@ -119,7 +119,6 @@ echo "USE_OPENCV=1" >> ./config.mk echo "USE_OPENMP=1" >> ./config.mk echo "USE_MKLDNN=1" >> ./config.mk echo "USE_BLAS=apple" >> ./config.mk -echo "USE_PROFILER=1" >> ./config.mk LIBRARY_PATH=$(brew --prefix llvm)/lib/ make -j $(sysctl -n hw.ncpu) ``` diff --git a/docs/tutorials/mkldnn/MKLDNN_README.md b/docs/tutorials/mkldnn/MKLDNN_README.md index c9e940fdeb3e..0b8c6b04517b 100644 --- a/docs/tutorials/mkldnn/MKLDNN_README.md +++ b/docs/tutorials/mkldnn/MKLDNN_README.md @@ -97,7 +97,7 @@ cd incubator-mxnet ### Build MXNet with MKL-DNN ``` -LIBRARY_PATH=$(brew --prefix llvm)/lib/ make -j $(sysctl -n hw.ncpu) CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ USE_OPENCV=1 USE_OPENMP=1 USE_MKLDNN=1 USE_BLAS=apple USE_PROFILER=1 +LIBRARY_PATH=$(brew --prefix llvm)/lib/ make -j $(sysctl -n hw.ncpu) CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ USE_OPENCV=1 USE_OPENMP=1 USE_MKLDNN=1 USE_BLAS=apple ```

Windows

diff --git a/example/profiler/README.md b/example/profiler/README.md index 255ad8f65579..933e04db67d3 100644 --- a/example/profiler/README.md +++ b/example/profiler/README.md @@ -19,8 +19,7 @@ This folder contains examples of using MXNet profiler to generate profiling results in json files. Please refer to [this link](http://mxnet.incubator.apache.org/faq/perf.html?highlight=profiler#profiler) -for visualizing profiling results and make sure that you have installed a version of MXNet compiled -with `USE_PROFILER=1`. +for visualizing profiling results. - profiler_executor.py. To run this example, - clone mxnet-memonger (git clone https://github.com/dmlc/mxnet-memonger.git). diff --git a/make/maven/maven_darwin_mkl.mk b/make/maven/maven_darwin_mkl.mk index f68f1565f990..a7f2bdb027d4 100644 --- a/make/maven/maven_darwin_mkl.mk +++ b/make/maven/maven_darwin_mkl.mk @@ -33,8 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/maven/maven_linux_cu90mkl.mk b/make/maven/maven_linux_cu90mkl.mk index 3d3b2c48c58b..8da56d803973 100644 --- a/make/maven/maven_linux_cu90mkl.mk +++ b/make/maven/maven_linux_cu90mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/maven/maven_linux_cu92mkl.mk b/make/maven/maven_linux_cu92mkl.mk index ab93801b0b56..dd3e86b8a64f 100644 --- a/make/maven/maven_linux_cu92mkl.mk +++ b/make/maven/maven_linux_cu92mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/maven/maven_linux_mkl.mk b/make/maven/maven_linux_mkl.mk index dfe5065b9a9c..3c8534a7e2aa 100644 --- a/make/maven/maven_linux_mkl.mk +++ b/make/maven/maven_linux_mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_darwin_cpu.mk b/make/pip/pip_darwin_cpu.mk index 2c80c42387ad..2497aadc9d3d 100644 --- a/make/pip/pip_darwin_cpu.mk +++ b/make/pip/pip_darwin_cpu.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_darwin_mkl.mk b/make/pip/pip_darwin_mkl.mk index 2fac512140d0..1859936f180e 100644 --- a/make/pip/pip_darwin_mkl.mk +++ b/make/pip/pip_darwin_mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cpu.mk b/make/pip/pip_linux_cpu.mk index 9ed88bb5bd1b..4d3b95f4dbd8 100644 --- a/make/pip/pip_linux_cpu.mk +++ b/make/pip/pip_linux_cpu.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu100.mk b/make/pip/pip_linux_cu100.mk index f3bea65a7260..a972c538e512 100644 --- a/make/pip/pip_linux_cu100.mk +++ b/make/pip/pip_linux_cu100.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu100mkl.mk b/make/pip/pip_linux_cu100mkl.mk index 4dfcb213feb1..1f5d99642f91 100644 --- a/make/pip/pip_linux_cu100mkl.mk +++ b/make/pip/pip_linux_cu100mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu101.mk b/make/pip/pip_linux_cu101.mk index 6aef44237f29..b180d048557f 100644 --- a/make/pip/pip_linux_cu101.mk +++ b/make/pip/pip_linux_cu101.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu101mkl.mk b/make/pip/pip_linux_cu101mkl.mk index 1bb939d0a04c..d893fd611bad 100644 --- a/make/pip/pip_linux_cu101mkl.mk +++ b/make/pip/pip_linux_cu101mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu75.mk b/make/pip/pip_linux_cu75.mk index c686c20db456..3070a907825a 100644 --- a/make/pip/pip_linux_cu75.mk +++ b/make/pip/pip_linux_cu75.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu75mkl.mk b/make/pip/pip_linux_cu75mkl.mk index ec87676c6c96..e263794600df 100644 --- a/make/pip/pip_linux_cu75mkl.mk +++ b/make/pip/pip_linux_cu75mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu80.mk b/make/pip/pip_linux_cu80.mk index 72a04deeb400..969229e22608 100644 --- a/make/pip/pip_linux_cu80.mk +++ b/make/pip/pip_linux_cu80.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu80mkl.mk b/make/pip/pip_linux_cu80mkl.mk index 1bd295138936..a42220d3d467 100644 --- a/make/pip/pip_linux_cu80mkl.mk +++ b/make/pip/pip_linux_cu80mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu90.mk b/make/pip/pip_linux_cu90.mk index b831d6586795..1bca27b2b80c 100644 --- a/make/pip/pip_linux_cu90.mk +++ b/make/pip/pip_linux_cu90.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu90mkl.mk b/make/pip/pip_linux_cu90mkl.mk index 8ab13075b3d0..8a8c273f3a09 100644 --- a/make/pip/pip_linux_cu90mkl.mk +++ b/make/pip/pip_linux_cu90mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu91.mk b/make/pip/pip_linux_cu91.mk index cb66394683a9..fb6be493cf15 100644 --- a/make/pip/pip_linux_cu91.mk +++ b/make/pip/pip_linux_cu91.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu91mkl.mk b/make/pip/pip_linux_cu91mkl.mk index a94874503c92..c29fcef0ce0b 100644 --- a/make/pip/pip_linux_cu91mkl.mk +++ b/make/pip/pip_linux_cu91mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu92.mk b/make/pip/pip_linux_cu92.mk index 8796a3bbdaa7..616ee14ccf9c 100644 --- a/make/pip/pip_linux_cu92.mk +++ b/make/pip/pip_linux_cu92.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_cu92mkl.mk b/make/pip/pip_linux_cu92mkl.mk index b9766ec36dc8..b36f97d67fe7 100644 --- a/make/pip/pip_linux_cu92mkl.mk +++ b/make/pip/pip_linux_cu92mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/make/pip/pip_linux_mkl.mk b/make/pip/pip_linux_mkl.mk index 95146ee225ba..1cf389ae4a57 100644 --- a/make/pip/pip_linux_mkl.mk +++ b/make/pip/pip_linux_mkl.mk @@ -33,9 +33,6 @@ DEV = 0 # whether compile with debug DEBUG = 0 -# whether compiler with profiler -USE_PROFILER = 1 - # whether to turn on signal handler (e.g. segfault logger) USE_SIGNAL_HANDLER = 1 diff --git a/tests/jenkins/run_test.sh b/tests/jenkins/run_test.sh index 5ef8c1ac01ef..5ded74291f25 100755 --- a/tests/jenkins/run_test.sh +++ b/tests/jenkins/run_test.sh @@ -25,7 +25,6 @@ cp make/config.mk . echo "USE_CUDA=1" >> config.mk echo "USE_CUDA_PATH=/usr/local/cuda" >> config.mk echo "USE_CUDNN=1" >> config.mk -echo "USE_PROFILER=1" >> config.mk echo "DEV=1" >> config.mk echo "EXTRA_OPERATORS=example/ssd/operator" >> config.mk echo "USE_CPP_PACKAGE=1" >> config.mk diff --git a/tests/jenkins/run_test_ubuntu.sh b/tests/jenkins/run_test_ubuntu.sh index 28e00331b47e..0459d2cc8ec5 100755 --- a/tests/jenkins/run_test_ubuntu.sh +++ b/tests/jenkins/run_test_ubuntu.sh @@ -38,7 +38,6 @@ cp make/config.mk . echo "USE_CUDA=1" >> config.mk echo "USE_CUDA_PATH=/usr/local/cuda" >> config.mk echo "USE_CUDNN=1" >> config.mk -echo "USE_PROFILER=1" >> config.mk echo "DEV=1" >> config.mk echo "EXTRA_OPERATORS=example/ssd/operator" >> config.mk echo "USE_CPP_PACKAGE=1" >> config.mk From ab6c5f6f42cac911decc22169876603c2e392164 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Thu, 18 Jul 2019 21:55:40 -0700 Subject: [PATCH 2/2] Trigger notification