Skip to content

Commit

Permalink
Minor changes to setup scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
wenleix committed Jun 28, 2022
1 parent 1ac554c commit 5c9e9b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 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 @@ -130,20 +130,19 @@ function install_folly {

function install_ranges_v3 {
github_checkout ericniebler/range-v3 master
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
2 changes: 1 addition & 1 deletion 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

0 comments on commit 5c9e9b5

Please sign in to comment.