This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new b36d790f4 [GLUTEN-6610] Update clickhouse.md due to upgrade to
clang-18 (#6654)
b36d790f4 is described below
commit b36d790f47b4df80caffb37ccba60b5b61b5b8c4
Author: Wenzheng Liu <[email protected]>
AuthorDate: Wed Jul 31 22:06:08 2024 +0800
[GLUTEN-6610] Update clickhouse.md due to upgrade to clang-18 (#6654)
---
docs/get-started/ClickHouse.md | 4 ++--
docs/image/ClickHouse/CLion-Configuration-1.png | Bin 162137 -> 165676 bytes
ep/build-clickhouse/src/build_clickhouse.sh | 4 ++--
ep/build-clickhouse/src/install_ubuntu.sh | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/get-started/ClickHouse.md b/docs/get-started/ClickHouse.md
index ab90f2312..12a662270 100644
--- a/docs/get-started/ClickHouse.md
+++ b/docs/get-started/ClickHouse.md
@@ -31,7 +31,7 @@ In general, we use IDEA for Gluten development and CLion for
ClickHouse backend
Install the software required for compilation, run `sudo
./ep/build-clickhouse/src/install_ubuntu.sh`.
Under the hood, it will install the following software:
-- Clang 16.0
+- Clang 18.0
- cmake 3.20 or higher version
- ninja-build 1.8.2
@@ -66,7 +66,7 @@ Otherwise, do:
```shell
export GLUTEN_SOURCE=/path/to/gluten
export CH_SOURCE_DIR=/path/to/ClickHouse
- cmake -G Ninja -S ${GLUTEN_SOURCE}/cpp-ch -B
${GLUTEN_SOURCE}/cpp-ch/build_ch -DCH_SOURCE_DIR=${CH_SOURCE_DIR}
"-DCMAKE_C_COMPILER=$(command -v clang-16)" "-DCMAKE_CXX_COMPILER=$(command -v
clang++-16)" "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+ cmake -G Ninja -S ${GLUTEN_SOURCE}/cpp-ch -B
${GLUTEN_SOURCE}/cpp-ch/build_ch -DCH_SOURCE_DIR=${CH_SOURCE_DIR}
"-DCMAKE_C_COMPILER=$(command -v clang-18)" "-DCMAKE_CXX_COMPILER=$(command -v
clang++-18)" "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
```
Next, you need to compile Kyligence/Clickhouse. There are two options:
diff --git a/docs/image/ClickHouse/CLion-Configuration-1.png
b/docs/image/ClickHouse/CLion-Configuration-1.png
index 14c739d87..a748a27e1 100644
Binary files a/docs/image/ClickHouse/CLion-Configuration-1.png and
b/docs/image/ClickHouse/CLion-Configuration-1.png differ
diff --git a/ep/build-clickhouse/src/build_clickhouse.sh
b/ep/build-clickhouse/src/build_clickhouse.sh
index 1fca38c81..0b016dedb 100644
--- a/ep/build-clickhouse/src/build_clickhouse.sh
+++ b/ep/build-clickhouse/src/build_clickhouse.sh
@@ -38,7 +38,7 @@ done
echo ${GLUTEN_SOURCE}
-export CC=${CC:-clang-16}
-export CXX=${CXX:-clang++-16}
+export CC=${CC:-clang-18}
+export CXX=${CXX:-clang++-18}
cmake -G Ninja -S ${GLUTEN_SOURCE}/cpp-ch -B ${GLUTEN_SOURCE}/cpp-ch/build_ch
-DCH_SOURCE_DIR=${CH_SOURCE_DIR} "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
cmake --build ${GLUTEN_SOURCE}/cpp-ch/build_ch --target build_ch
diff --git a/ep/build-clickhouse/src/install_ubuntu.sh
b/ep/build-clickhouse/src/install_ubuntu.sh
index 5a08bc644..003514194 100644
--- a/ep/build-clickhouse/src/install_ubuntu.sh
+++ b/ep/build-clickhouse/src/install_ubuntu.sh
@@ -23,6 +23,6 @@ echo "Install and Use the Clang compiler"
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
echo "add CC and CXX to .bashrc"
-echo "export CC=clang-16" >> ~/.bashrc
-echo "export CXX=clang++-16" >> ~/.bashrc
+echo "export CC=clang-18" >> ~/.bashrc
+echo "export CXX=clang++-18" >> ~/.bashrc
source ~/.bashrc
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
