Time measurement support on build. (#319)

-Extra optional option added to blueoil.sh.
-Added timing as a default for lm_* targets .
-CXXFLAGS now specified via make argument, rather than environment.
-Timing can now optionally be built-in for lib_* targets as well.

Author: ed728

blueoil.sh

@@ -5,7 +5,7 @@ function usage_exit(){
 	echo "Usage"
 	echo "${NAME} init"
 	echo "${NAME} train <YML_CONFIG_FILE> <OUTPUT_DIRECTORY(optional)> <EXPERIMENT_ID(optional)>"
-	echo "${NAME} convert <YML_CONFIG_FILE> <EXPERIMENT_DIRECTORY> <CHECKPOINT_NO(optional)>"
+	echo "${NAME} convert <YML_CONFIG_FILE> <EXPERIMENT_DIRECTORY> <CHECKPOINT_NO(optional)> <TIMING_ENABLE(optional)>"
 	echo "${NAME} predict <YML_CONFIG_FILE> <INPUT_DIRECTORY> <OUTPUT_DIRECTORY> <EXPERIMENT_DIRECTORY> <CHECKPOINT_NO(optional)>"
 	echo "${NAME} tensorboard <EXPERIMENT_DIRECTORY> <PORT(optional)>"
 	echo ""
@@ -170,6 +170,7 @@ function set_variables_for_restore(){
 	OUTPUT_DIR=$(dirname ${EXPERIMENT_DIR})
 	EXPERIMENT_ID=$(basename ${EXPERIMENT_DIR})
 	CHECKPOINT_NO=${3:-0}
+	TIME_FLAG=${4:-0}
 	set_lmnet_docker_options
 
 	if [ ${CHECKPOINT_NO} -gt 0 ]; then
@@ -178,15 +179,18 @@ function set_variables_for_restore(){
 			error_exit 1 "Invalid number of checkpoint, there is no checkpoints ${OUTPUT_DIR}/${EXPERIMENT_ID}/checkpoints/save.ckpt-${CHECKPOINT_NO}"
 		fi
 	fi
+	if [ ${TIME_FLAG} -gt 0 ]; then
+		TIMING_ENABLE="--timing"
+	fi
 }
 
 function blueoil_convert(){
-	set_variables_for_restore $1 $2 $3
+	set_variables_for_restore $1 $2 $3 $4
 
 	echo "#### Generate output files ####"
 
 	docker run ${LMNET_DOCKER_OPTIONS} ${DOCKER_IMAGE} \
-		python blueoil/blueoil_convert.py -i ${EXPERIMENT_ID} ${RESTORE_OPTION}
+		python blueoil/blueoil_convert.py -i ${EXPERIMENT_ID} ${RESTORE_OPTION} ${TIMING_ENABLE}
 	error_exit $? "Failed to generate output files"
 
 	# Set path for DLK
@@ -253,9 +257,9 @@ case "$1" in
 		exit 0;;
 	"convert" )
 		check_num_args $# -lt 3
-		check_num_args $# -gt 4
+		check_num_args $# -gt 5
 		check_files_and_directories $2 $3
-		blueoil_convert $2 $3 $4
+		blueoil_convert $2 $3 $4 $5
 		exit 0;;
 	"predict" )
 		check_num_args $# -lt 5

blueoil/blueoil_convert.py

@@ -92,21 +92,20 @@ def make_all(project_dir, output_dir):
 
     # Make each target and move output files
     for target, output in make_list:
-        if target in ["lm_x86", "lm_arm", "lm_fpga", "lm_aarch64"]:
-            os.environ["CXXFLAGS"] = cxxflags_cache + " -DFUNC_TIME_MEASUREMENT"
-        else:
-            os.environ["CXXFLAGS"] = cxxflags_cache
+        if target in ["lib_x86", "lib_arm", "lib_fpga", "lib_aarch64"] and timing:
+            cxxflags_cache += " -DFUNC_TIME_MEASUREMENT"
 
+        cxxflags = "CXXFLAGS=\"{}\"".format(cxxflags_cache)
         subprocess.run(("make", "clean", "--quiet"))
-        subprocess.run(("make",  target, "-j4", "--quiet"))
+        subprocess.run(("make",  target, cxxflags, "-j4", "--quiet"))
         strip_binary(output)
         output_file_path = os.path.join(output_dir, output)
         os.rename(output, output_file_path)
     # Return running directory
     os.chdir(running_dir)
 
 
-def run(experiment_id, restore_path, output_template_dir=None):
+def run(experiment_id, restore_path, timing, output_template_dir=None):
     """Convert from trained model.
 
     Returns:
@@ -148,7 +147,7 @@ def run(experiment_id, restore_path, output_template_dir=None):
     # Make
     project_dir_name = "{}.prj".format(project_name)
     project_dir = os.path.join(dest_dir_path, project_dir_name)
-    make_all(project_dir, output_directories.get("library_dir"))
+    make_all(project_dir, output_directories.get("library_dir"), timing)
 
     return output_root_dir
 
@@ -165,8 +164,14 @@ def run(experiment_id, restore_path, output_template_dir=None):
     help="restore ckpt file base path. e.g. saved/experiment/checkpoints/save.ckpt-10001",
     default=None,
 )
-def main(experiment_id, restore_path):
-    run(experiment_id, restore_path)
+@click.option(
+    "-t",
+    "--timing",
+    help="enable operation time measurements",
+    is_flag=True,
+)
+def main(experiment_id, restore_path, timing):
+    run(experiment_id, restore_path, timing)
 
 
 if __name__ == '__main__':

dlk/python/dlk/templates/Makefile.tpl

@@ -129,15 +129,15 @@ clean:
 	-$(RM) $(OBJ)
 
 lm_x86:           CXX = g++
-lm_x86:           FLAGS += $(INCLUDES) -O3 -std=c++14 -DUSE_PNG -pthread -g
+lm_x86:           FLAGS += $(INCLUDES) -O3 -std=c++14 -DUSE_PNG -pthread -g -DFUNC_TIME_MEASUREMENT
 lm_x86:           CXXFLAGS +=
 
 lm_aarch64:       CXX = aarch64-linux-gnu-g++
-lm_aarch64:       FLAGS += $(INCLUDES) -std=c++14 -O3 -DUSE_PNG -pthread -g -fopenmp
+lm_aarch64:       FLAGS += $(INCLUDES) -std=c++14 -O3 -DUSE_PNG -pthread -g -fopenmp -DFUNC_TIME_MEASUREMENT
 lm_aarch64:       CXXFLAGS +=
 
 lm_arm:           CXX = arm-linux-gnueabihf-g++
-lm_arm:           FLAGS += $(INCLUDES) -std=c++14 -O3 -DUSE_NEON -DUSE_PNG -mcpu=cortex-a9 -mfpu=neon -mthumb -s -pthread -g -fopenmp
+lm_arm:           FLAGS += $(INCLUDES) -std=c++14 -O3 -DUSE_NEON -DUSE_PNG -mcpu=cortex-a9 -mfpu=neon -mthumb -s -pthread -g -fopenmp -DFUNC_TIME_MEASUREMENT
 lm_arm:           CXXFLAGS +=
 
 lm_fpga:          CXX = arm-linux-gnueabihf-g++