You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by ou...@apache.org on 2019/08/29 02:18:37 UTC
[hawq] branch sugon created (now 7af96aa)
This is an automated email from the ASF dual-hosted git repository.
oushu1wangziming1 pushed a change to branch sugon
in repository https://gitbox.apache.org/repos/asf/hawq.git.
at 7af96aa sugon
This branch includes the following new commits:
new 7af96aa sugon
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[hawq] 01/01: sugon
Posted by ou...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
oushu1wangziming1 pushed a commit to branch sugon
in repository https://gitbox.apache.org/repos/asf/hawq.git
commit 7af96aabf93bbc21d80f69dfd7773c686e8f947e
Author: root <ro...@localhost.localdomain>
AuthorDate: Wed Aug 28 17:06:37 2019 +0800
sugon
---
depends/dbcommon/CMake/Options.cmake | 6 +++---
depends/dbcommon/src/dbcommon/function/array-function.cc | 2 +-
depends/libhdfs3/CMake/FindGoogleTest.cmake | 2 +-
depends/libhdfs3/CMake/Options.cmake | 2 +-
depends/libyarn/CMake/FindGoogleTest.cmake | 2 +-
depends/libyarn/CMake/Options.cmake | 2 +-
depends/storage/CMake/Options.cmake | 6 +++---
depends/univplan/CMake/Options.cmake | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/depends/dbcommon/CMake/Options.cmake b/depends/dbcommon/CMake/Options.cmake
index 8ef0749..e71b222 100644
--- a/depends/dbcommon/CMake/Options.cmake
+++ b/depends/dbcommon/CMake/Options.cmake
@@ -30,10 +30,10 @@ ENDIF()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer -fno-strict-aliasing")
IF(ENABLE_AVX STREQUAL ON)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
ELSE()
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
ENDIF()
#c++11 is needed to provide thread saft singleton implementation.
diff --git a/depends/dbcommon/src/dbcommon/function/array-function.cc b/depends/dbcommon/src/dbcommon/function/array-function.cc
index e8fc2f2..3cbe8fa 100644
--- a/depends/dbcommon/src/dbcommon/function/array-function.cc
+++ b/depends/dbcommon/src/dbcommon/function/array-function.cc
@@ -19,7 +19,7 @@
#include "dbcommon/function/array-function.h"
-#include <x86intrin.h>
+#include <ace/os_include/os_intrin.h>
#include <cmath>
#include <memory>
diff --git a/depends/libhdfs3/CMake/FindGoogleTest.cmake b/depends/libhdfs3/CMake/FindGoogleTest.cmake
index fd57c1e..50f93f2 100644
--- a/depends/libhdfs3/CMake/FindGoogleTest.cmake
+++ b/depends/libhdfs3/CMake/FindGoogleTest.cmake
@@ -56,7 +56,7 @@ find_package_handle_standard_args(
GMock_INCLUDE_DIR
Gtest_LIBRARY
Gmock_LIBRARY
- GoogleTest_CHECK_FINE)
+ )
set(GoogleTest_INCLUDE_DIR ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR})
set(GoogleTest_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY})
diff --git a/depends/libhdfs3/CMake/Options.cmake b/depends/libhdfs3/CMake/Options.cmake
index 8141cab..8e7e27d 100644
--- a/depends/libhdfs3/CMake/Options.cmake
+++ b/depends/libhdfs3/CMake/Options.cmake
@@ -31,7 +31,7 @@ IF(ENABLE_FRAME_POINTER STREQUAL ON)
ENDIF(ENABLE_FRAME_POINTER STREQUAL ON)
IF(ENABLE_SSE STREQUAL ON)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
ENDIF(ENABLE_SSE STREQUAL ON)
IF(NOT TEST_HDFS_PREFIX)
diff --git a/depends/libyarn/CMake/FindGoogleTest.cmake b/depends/libyarn/CMake/FindGoogleTest.cmake
index fd57c1e..50f93f2 100644
--- a/depends/libyarn/CMake/FindGoogleTest.cmake
+++ b/depends/libyarn/CMake/FindGoogleTest.cmake
@@ -56,7 +56,7 @@ find_package_handle_standard_args(
GMock_INCLUDE_DIR
Gtest_LIBRARY
Gmock_LIBRARY
- GoogleTest_CHECK_FINE)
+ )
set(GoogleTest_INCLUDE_DIR ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR})
set(GoogleTest_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY})
diff --git a/depends/libyarn/CMake/Options.cmake b/depends/libyarn/CMake/Options.cmake
index 6fe1ca8..68aca27 100644
--- a/depends/libyarn/CMake/Options.cmake
+++ b/depends/libyarn/CMake/Options.cmake
@@ -29,7 +29,7 @@ IF(ENABLE_FRAME_POINTER STREQUAL ON)
ENDIF(ENABLE_FRAME_POINTER STREQUAL ON)
IF(ENABLE_SSE STREQUAL ON)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
ENDIF(ENABLE_SSE STREQUAL ON)
IF(NOT TEST_HDFS_PREFIX)
diff --git a/depends/storage/CMake/Options.cmake b/depends/storage/CMake/Options.cmake
index 8ef0749..e26b5e6 100644
--- a/depends/storage/CMake/Options.cmake
+++ b/depends/storage/CMake/Options.cmake
@@ -30,10 +30,10 @@ ENDIF()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer -fno-strict-aliasing")
IF(ENABLE_AVX STREQUAL ON)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
ELSE()
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
ENDIF()
#c++11 is needed to provide thread saft singleton implementation.
diff --git a/depends/univplan/CMake/Options.cmake b/depends/univplan/CMake/Options.cmake
index 8ef0749..e26b5e6 100644
--- a/depends/univplan/CMake/Options.cmake
+++ b/depends/univplan/CMake/Options.cmake
@@ -30,10 +30,10 @@ ENDIF()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer -fno-strict-aliasing")
IF(ENABLE_AVX STREQUAL ON)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DAVX_OPT")
ELSE()
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-avx -mno-avx2")
ENDIF()
#c++11 is needed to provide thread saft singleton implementation.