experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable customization of architecture dependent compiler optimizations via configure, defaulting to -march=native.

Browse Source 
Change: 144470919
This commit is contained in:
Martin Wicke 2017-01-13 12:20:42 -08:00 committed by TensorFlower Gardener
parent 1c5120141b
commit c4e3d4a74e
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -54,6 +54,15 @@ while true; do
# Retry # Retry
done done
## Set up architecture-dependent optimization flags.
if [ -z "$CC_OPT_FLAGS" ]; then
default_cc_opt_flags="-march=native"
read -p "Please specify optimization flags to use during compilation [Default is $default_cc_opt_flags]: " CC_OPT_FLAGS
if [ -z "$CC_OPT_FLAGS" ]; then
CC_OPT_FLAGS=$default_cc_opt_flags
fi
fi
if is_windows; then if is_windows; then
TF_NEED_GCP=0 TF_NEED_GCP=0
TF_NEED_HDFS=0 TF_NEED_HDFS=0
@ -153,6 +162,12 @@ fi
# Invoke python_config and set up symlinks to python includes # Invoke python_config and set up symlinks to python includes
./util/python/python_config.sh --setup "$PYTHON_BIN_PATH" ./util/python/python_config.sh --setup "$PYTHON_BIN_PATH"
# Append CC optimization flags to bazel.rc
echo >> tools/bazel.rc
for opt in $CC_OPT_FLAGS; do
echo "build --cxxopt=$opt --copt=$opt" >> tools/bazel.rc
done
# Run the gen_git_source to create links where bazel can track dependencies for # Run the gen_git_source to create links where bazel can track dependencies for
# git hash propagation # git hash propagation
GEN_GIT_SOURCE=tensorflow/tools/git/gen_git_source.py GEN_GIT_SOURCE=tensorflow/tools/git/gen_git_source.py

11
tensorflow/contrib/cmake/CMakeLists.txt
View File

@ -27,6 +27,7 @@ option(tensorflow_BUILD_ALL_KERNELS "Build all OpKernels" ON)
option(tensorflow_BUILD_CONTRIB_KERNELS "Build OpKernels from tensorflow/contrib/..." ON) option(tensorflow_BUILD_CONTRIB_KERNELS "Build OpKernels from tensorflow/contrib/..." ON)
option(tensorflow_BUILD_CC_TESTS "Build cc unit tests " OFF) option(tensorflow_BUILD_CC_TESTS "Build cc unit tests " OFF)
option(tensorflow_BUILD_PYTHON_TESTS "Build python unit tests " OFF) option(tensorflow_BUILD_PYTHON_TESTS "Build python unit tests " OFF)
option(tensorflow_OPTIMIZE_FOR_NATIVE_ARCH "Enable compiler optimizations for the native processor architecture (if available)" ON)
if (NOT WIN32) if (NOT WIN32)
# Threads: defines CMAKE_THREAD_LIBS_INIT and adds -pthread compile option # Threads: defines CMAKE_THREAD_LIBS_INIT and adds -pthread compile option
@ -67,7 +68,15 @@ if(WIN32)
endif() endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fno-exceptions -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -std=c++11")
endif()
if (tensorflow_OPTIMIZE_FOR_NATIVE_ARCH)
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_OPT_ARCH_NATIVE_SUPPORTED)
if (COMPILER_OPT_ARCH_NATIVE_SUPPORTED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
endif()
endif() endif()
# External dependencies # External dependencies

2
tensorflow/contrib/makefile/Makefile
View File

@ -137,7 +137,7 @@ $(shell mkdir -p $(DEPDIR) >/dev/null)
# Settings for the target compiler. # Settings for the target compiler.
CXX := $(CC_PREFIX) gcc CXX := $(CC_PREFIX) gcc
OPTFLAGS := -O2 OPTFLAGS := -O2 -march=native
CXXFLAGS := --std=c++11 -DIS_SLIM_BUILD -fno-exceptions -DNDEBUG $(OPTFLAGS) CXXFLAGS := --std=c++11 -DIS_SLIM_BUILD -fno-exceptions -DNDEBUG $(OPTFLAGS)
LDFLAGS := \ LDFLAGS := \
-L/usr/local/lib -L/usr/local/lib