Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor changes to setup scripts #395

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions scripts/_setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set -x # Print commands that are executed.
SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
source $SCRIPTDIR/../csrc/velox/velox/scripts/setup-helper-functions.sh

FB_OS_VERSION=v2021.05.10.00
FB_OS_VERSION=v2022.03.14.00
NPROC=$(sysctl -n hw.physicalcpu)
COMPILER_FLAGS=$(get_cxx_flags $CPU_TARGET)
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
Expand Down Expand Up @@ -107,7 +107,7 @@ function install_build_prerequisites {
}

function install_fmt {
github_checkout fmtlib/fmt 7.1.3
github_checkout fmtlib/fmt 8.0.0
cmake_install -DFMT_TEST=OFF
}

Expand All @@ -130,20 +130,19 @@ function install_folly {

function install_ranges_v3 {
github_checkout ericniebler/range-v3 0.12.0
cmake_install -DRANGES_ENABLE_WERROR=OFF
cmake_install -DRANGES_ENABLE_WERROR=OFF -DRANGE_V3_TESTS=OFF -DRANGE_V3_EXAMPLES=OFF
}

function install_re2 {
github_checkout google/re2 2021-04-01
cmake_install
cmake_install -DRE2_BUILD_TESTING=OFF
}

function install_velox_deps {
if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
run_and_time install_build_prerequisites
fi
run_and_time install_ranges_v3
run_and_time install_googletest
run_and_time install_fmt
run_and_time install_double_conversion
run_and_time install_folly
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source $SCRIPTDIR/../csrc/velox/velox/scripts/setup-helper-functions.sh

CPU_TARGET="${CPU_TARGET:-avx}"
export COMPILER_FLAGS=$(get_cxx_flags $CPU_TARGET)
FB_OS_VERSION=v2021.05.10.00
FB_OS_VERSION=v2022.03.14.00
NPROC=$(getconf _NPROCESSORS_ONLN)
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}

Expand Down Expand Up @@ -88,7 +88,7 @@ function cmake_install {
}

function install_fmt {
github_checkout fmtlib/fmt 7.1.3
github_checkout fmtlib/fmt 8.0.0
cmake_install -DFMT_TEST=OFF
}

Expand Down