From a12c4ec3f7d73d46100d623e5aceaed96b7fc762 Mon Sep 17 00:00:00 2001 From: Krishna Pai Date: Tue, 10 Sep 2024 21:10:21 -0700 Subject: [PATCH] Back out "Add Findstemmer.cmake to find lib stemmer" (#10965) Summary: Pull Request resolved: https://github.com/facebookincubator/velox/pull/10965 Reverting PR https://github.com/facebookincubator/velox/pull/10884 due to it breaking PyVelox builds and Fuzzer . Fixes issue : https://github.com/facebookincubator/velox/issues/10963 Original commit changeset: dec13d672129 Original Phabricator Diff: D62373662 Reviewed By: xiaoxmeng, amitkdutta, kagamiori Differential Revision: D62477240 --- .github/workflows/linux-build.yml | 1 - CMake/Findstemmer.cmake | 30 ------------------------------ CMakeLists.txt | 2 +- scripts/setup-centos9.sh | 16 ---------------- scripts/setup-ubuntu.sh | 16 ---------------- 5 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 CMake/Findstemmer.cmake diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 4a2595238092..f2db425f37e1 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -63,7 +63,6 @@ jobs: simdjson_SOURCE: BUNDLED xsimd_SOURCE: BUNDLED Arrow_SOURCE: AUTO - stemmer_SOURCE: AUTO CUDA_VERSION: "12.4" steps: - uses: actions/checkout@v4 diff --git a/CMake/Findstemmer.cmake b/CMake/Findstemmer.cmake deleted file mode 100644 index 8796ce461ac5..000000000000 --- a/CMake/Findstemmer.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -find_library(STEMMER_LIB libstemmer.a) -if("${STEMMER_LIB}" STREQUAL "STEMMER_LIB-NOTFOUND") - set(stemmer_FOUND false) - return() -endif() - -set(stemmer_FOUND true) -if(NOT TARGET stemmer::stemmer) - add_library(stemmer::stemmer STATIC IMPORTED GLOBAL) - - find_path(STEMMER_INCLUDE_PATH libstemmer.h) - set_target_properties( - stemmer::stemmer - PROPERTIES IMPORTED_LOCATION ${STEMMER_LIB} INTERFACE_INCLUDE_DIRECTORIES - ${STEMMER_INCLUDE_PATH}) -endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 421de103f9ad..7f7cbc92f250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,7 +569,7 @@ endif() set_source(xsimd) resolve_dependency(xsimd 10.0.0) -set_source(stemmer) +set(stemmer_SOURCE BUNDLED) resolve_dependency(stemmer) if(VELOX_BUILD_TESTING) diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh index 1583334cd860..825d2d29e32a 100755 --- a/scripts/setup-centos9.sh +++ b/scripts/setup-centos9.sh @@ -41,7 +41,6 @@ FB_OS_VERSION="v2024.05.20.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0" -STEMMER_VERSION="2.2.0" function dnf_install { dnf install -y -q --setopt=install_weak_deps=False "$@" @@ -176,20 +175,6 @@ function install_duckdb { fi } -function install_stemmer { - wget_and_untar https://snowballstem.org/dist/libstemmer_c-${STEMMER_VERSION}.tar.gz stemmer - pushd $SCRIPTDIR/../CMake/resolve_dependency_modules/libstemmer - PATCH_DIR=$(pwd) - popd - ( - cd stemmer - git apply ${PATCH_DIR}/Makefile.patch - make clean && make "-j${NPROC}" - ${SUDO} cp libstemmer.a /usr/local/lib/ - ${SUDO} cp include/libstemmer.h /usr/local/include/ - ) -} - function install_arrow { wget_and_untar https://archive.apache.org/dist/arrow/arrow-${ARROW_VERSION}/apache-arrow-${ARROW_VERSION}.tar.gz arrow ( @@ -239,7 +224,6 @@ function install_velox_deps { run_and_time install_mvfst run_and_time install_fbthrift run_and_time install_duckdb - run_and_time install_stemmer run_and_time install_arrow } diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 2d26bbf707a1..e40bba1d9923 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -57,7 +57,6 @@ FB_OS_VERSION="v2024.05.20.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0" -STEMMER_VERSION="2.2.0" # Install packages required for build. function install_build_prerequisites { @@ -185,20 +184,6 @@ function install_duckdb { fi } -function install_stemmer { - wget_and_untar https://snowballstem.org/dist/libstemmer_c-${STEMMER_VERSION}.tar.gz stemmer - pushd $SCRIPTDIR/../CMake/resolve_dependency_modules/libstemmer - PATCH_DIR=$(pwd) - popd - ( - cd stemmer - git apply ${PATCH_DIR}/Makefile.patch - make clean && make "-j${NPROC}" - ${SUDO} cp libstemmer.a /usr/local/lib/ - ${SUDO} cp include/libstemmer.h /usr/local/include/ - ) -} - function install_arrow { wget_and_untar https://archive.apache.org/dist/arrow/arrow-${ARROW_VERSION}/apache-arrow-${ARROW_VERSION}.tar.gz arrow ( @@ -248,7 +233,6 @@ function install_velox_deps { run_and_time install_fbthrift run_and_time install_conda run_and_time install_duckdb - run_and_time install_stemmer run_and_time install_arrow }