Merge remote-tracking branch 'origin/master' into langjian/DistBroadcast

NervanaSystems · Dec 26, 2018 · a465739 · a465739
2 parents b32b52f + db3e8d8
commit a465739
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 181 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -200,16 +200,21 @@ if(UNIT_TEST_TF_CC_DIR)
 endif()
 
 # Enable build target CPU features
-set(
-    NGRAPH_TARGET_ARCH
-    native
-    CACHE STRING "Target CPU architecture to build for.")
+if (NOT DEFINED NGRAPH_TARGET_ARCH)
+    set(
+        NGRAPH_TARGET_ARCH
+        native
+        CACHE STRING "Target CPU architecture to build for.")
+endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${NGRAPH_TARGET_ARCH}")
 
-set(
-    NGRAPH_TUNE_ARCH
-    native
-    CACHE STRING "Target CPU architecture to tune for")
+if (NOT DEFINED NGRAPH_TUNE_ARCH)
+    set(
+        NGRAPH_TUNE_ARCH
+        native
+        CACHE STRING "Target CPU architecture to build for.")
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=${NGRAPH_TARGET_ARCH}")
 
 message(STATUS "UNIT_TEST_ENABLE:           ${UNIT_TEST_ENABLE}")
 message(STATUS "UNIT_TEST_TF_CC_DIR:        ${TF_PRE_BUILT_LOCATION}")