Skip to content

Commit

Permalink
Back out "Add Findstemmer.cmake to find lib stemmer" (#10965)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: #10965

Reverting PR #10884 due to it breaking PyVelox builds and Fuzzer .
Fixes issue : #10963

Original commit changeset: dec13d672129

Original Phabricator Diff: D62373662

Reviewed By: xiaoxmeng, amitkdutta, kagamiori

Differential Revision: D62477240
  • Loading branch information
Krishna Pai authored and facebook-github-bot committed Sep 11, 2024
1 parent 7e4d626 commit a12c4ec
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 64 deletions.
1 change: 0 additions & 1 deletion .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 0 additions & 30 deletions CMake/Findstemmer.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 0 additions & 16 deletions scripts/setup-centos9.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
Expand Down Expand Up @@ -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
(
Expand Down Expand Up @@ -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
}

Expand Down
16 changes: 0 additions & 16 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
(
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit a12c4ec

Please sign in to comment.