Change the default release build optimization level of gcc to O2 (int…

…el#231)

* The default release build optimization level of gcc is O3. IPEX explicitly appends the O2 to the CXX flags which results in optimization level conflict. This patch explicitly changes the default release build optimization level to O2.

* Add abi flags to the c++ extension library

* Refine code style

CMakeLists.txt

@@ -13,6 +13,9 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_INSTALL_RPATH "${RPATH_VALUE}/lib/:${RPATH_VALUE}/")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IPEX_INSTALL_LIBDIR})
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+SET(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
 
 set(DPCPP_ROOT "${PROJECT_SOURCE_DIR}/torch_ipex/csrc")
 set(DPCPP_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party")

cmake/CPU.cmake

@@ -31,13 +31,13 @@ ENDIF()
 # Define build type
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
   message("Debug build.")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -D_DEBUG")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_DEBUG")
 ELSEIF(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   message("RelWithDebInfo build")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g -DNDEBUG")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
 ELSE()
   message("Release build.")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
 ENDIF()
 
 IF("${IPEX_DISP_OP}" STREQUAL "1")
@@ -156,8 +156,6 @@ include_directories(${DPCPP_THIRD_PARTY_ROOT}/llga/third_party/oneDNN/include)
 # include_directories(${PROJECT_SOURCE_DIR}/build/third_party/mkl-dnn/include)
 # include_directories(${DPCPP_THIRD_PARTY_ROOT}/mkl-dnn/include)
 
-
-
 # Set installed PyTorch dir
 if(DEFINED PYTORCH_INSTALL_DIR)
   include_directories(${PYTORCH_INSTALL_DIR}/include)

setup.py

@@ -269,14 +269,15 @@ def run(self):
             Path(output_lib_path).mkdir(parents=True, exist_ok=True)
 
         cmake_args = [
+            '-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=' + str(int(torch._C._GLIBCXX_USE_CXX11_ABI)),
             '-DCMAKE_BUILD_TYPE=' + get_build_type(),
-            '-DPYTORCH_INSTALL_DIR=' + pytorch_install_dir,
-            '-DPYTHON_EXECUTABLE=' + sys.executable,
-            '-DIPEX_INSTALL_LIBDIR=' + os.path.abspath(output_lib_path),
             '-DCMAKE_INSTALL_PREFIX=' + os.path.abspath(output_lib_path),
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + os.path.abspath(output_lib_path),
             '-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=' + os.path.abspath(output_lib_path),
+            '-DIPEX_INSTALL_LIBDIR=' + os.path.abspath(output_lib_path),
             '-DPYTHON_INCLUDE_DIR=' + python_include_dir,
+            '-DPYTHON_EXECUTABLE=' + sys.executable,
+            '-DPYTORCH_INSTALL_DIR=' + pytorch_install_dir,
             '-DPYTORCH_INCLUDE_DIRS=' + pytorch_install_dir + "/include",
             '-DPYTORCH_LIBRARY_DIRS=' + pytorch_install_dir + "/lib"]