Skip to content

Commit

Permalink
Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (apache#14127)
Browse files Browse the repository at this point in the history
* Fixes libjepgturbo dependency install on ubuntu

* Enables libjpeg turbo on cpu build for testing
  • Loading branch information
perdasilva authored and haohuw committed Jun 23, 2019
1 parent d761b14 commit cf614a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ci/docker/install/ubuntu_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ apt-get install -y \
liblapack-dev \
libopenblas-dev \
libopencv-dev \
libturbojpeg \
libzmq3-dev \
ninja-build \
software-properties-common \
sudo \
unzip \
wget

# Use libturbojpeg package as it is correctly compiled with -fPIC flag
# https://github.com/HaxeFoundation/hashlink/issues/147
ln -s /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.1.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so


# Note: we specify an exact cmake version to work around a cmake 3.10 CUDA 10 issue.
# Reference: https://github.com/clab/dynet/issues/1457
mkdir /opt/cmake && cd /opt/cmake
Expand Down
1 change: 1 addition & 0 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ build_ubuntu_cpu_openblas() {
USE_BLAS=openblas \
USE_MKLDNN=0 \
USE_DIST_KVSTORE=1 \
USE_LIBJPEG_TURBO=1 \
-j$(nproc)
}

Expand Down

0 comments on commit cf614a4

Please sign in to comment.