[incubator-mxnet] branch master updated: Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (#14127)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

marcoabreu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new cf46ca4  Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (#14127)
cf46ca4 is described below

commit cf46ca459875bd2a3844fe8ec6bc68b744e7f141
Author: perdasilva <pe...@gmail.com>
AuthorDate: Fri Feb 15 00:58:49 2019 +0100

    Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (#14127)
    
    * Fixes libjepgturbo dependency install on ubuntu
    
    * Enables libjpeg turbo on cpu build for testing
---
 ci/docker/install/ubuntu_core.sh | 6 ++++++
 ci/docker/runtime_functions.sh   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ci/docker/install/ubuntu_core.sh b/ci/docker/install/ubuntu_core.sh
index 3f8ffb7..61a4637 100755
--- a/ci/docker/install/ubuntu_core.sh
+++ b/ci/docker/install/ubuntu_core.sh
@@ -39,6 +39,7 @@ apt-get install -y \
     liblapack-dev \
     libopenblas-dev \
     libopencv-dev \
+    libturbojpeg \
     libzmq3-dev \
     ninja-build \
     software-properties-common \
@@ -46,6 +47,11 @@ apt-get install -y \
     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
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 93f2d8c..4d9b256 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -365,6 +365,7 @@ build_ubuntu_cpu_openblas() {
         USE_BLAS=openblas             \
         USE_MKLDNN=0                  \
         USE_DIST_KVSTORE=1            \
+        USE_LIBJPEG_TURBO=1           \
         -j$(nproc)
 }