Skip to content

Commit c436b71

Browse files
committed
new attempt: install both fmt and spdlog with versions that are compatible)
1 parent d44faee commit c436b71

2 files changed

Lines changed: 44 additions & 1 deletion

File tree

velox-docker-image/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ RUN apt-get install curl wget git build-essential sudo cmake -y
55
RUN apt-get install lldb clang -y
66
RUN cd /usr/local && git clone --recursive https://github.com/facebookincubator/velox.git \
77
&& cd velox && git checkout 3020196b001130a9027b09d6b3b95385b90bc2cb && git submodule sync --recursive && git submodule update --init --recursive
8-
RUN cd /usr/local/velox && ./scripts/setup-ubuntu.sh install_folly install_fizz install_wangle install_mvfst install_fbthrift install_conda
8+
RUN cd /usr/local/velox && ./scripts/setup-ubuntu.sh
99
RUN cd /usr/local/velox && make VELOX_BUILD_TESTING=OFF
1010
RUN apt-get install openssh-server -y
1111
RUN apt install nano emacs-nox -y
1212
ADD ./velox.patch /usr/local/velox/
13+
ADD ./velox-install-compatible-spdlog.sh /usr/local/velox/scripts/install-compatible-spdlog.sh
1314
WORKDIR /usr/local/velox
1415
RUN git apply velox.patch
16+
RUN chmod u+x ./scripts/install-compatible-spdlog.sh
17+
RUN ./scripts/install-compatible-spdlog.sh
1518
RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -yy uuid-dev libopenblas-dev libfftw3-dev liblapacke-dev
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
# Copyright (c) Facebook, Inc. and its affiliates.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Minimal setup for Ubuntu 20.04.
17+
set -eufx -o pipefail
18+
SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
19+
source $SCRIPTDIR/setup-helper-functions.sh
20+
21+
# Folly must be built with the same compiler flags so that some low level types
22+
# are the same size.
23+
CPU_TARGET="${CPU_TARGET:-avx}"
24+
COMPILER_FLAGS=$(get_cxx_flags "$CPU_TARGET")
25+
export COMPILER_FLAGS
26+
SPDLOG_VERSION=v1.12.0
27+
NPROC=$(getconf _NPROCESSORS_ONLN)
28+
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
29+
export CMAKE_BUILD_TYPE=Release
30+
31+
function install_spdlog {
32+
github_checkout gabime/spdlog "${SPDLOG_VERSION}"
33+
cmake_install
34+
}
35+
36+
(return 2> /dev/null) && return # If script was sourced, don't run commands.
37+
38+
(
39+
install_spdlog
40+
)

0 commit comments

Comments
 (0)