[incubator-mxnet] branch master updated: [MXNET-286] Removed OpenMP from armv6 builds (#10469)

[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 a8f6d64  [MXNET-286] Removed OpenMP from armv6 builds (#10469)
a8f6d64 is described below

commit a8f6d64060a491fc1f42f40499d83aa7a27a3518
Author: Anton Chernov <me...@gmail.com>
AuthorDate: Wed Apr 11 14:31:18 2018 +0200

    [MXNET-286] Removed OpenMP from armv6 builds (#10469)
    
    * Removed OpenMP from armv6 builds
    
    * Added comment about OpenMP switching off for armv6 build
    
    * Removed github api call for version for OpenBLAS in the docker build for armv6
---
 ci/docker/Dockerfile.build.armv6 | 1 -
 ci/docker/runtime_functions.sh   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
index 47259ce..20739da 100755
--- a/ci/docker/Dockerfile.build.armv6
+++ b/ci/docker/Dockerfile.build.armv6
@@ -28,7 +28,6 @@ ENV TARGET ARMV6
 WORKDIR /work/deps
 
 # Build OpenBLAS
-ADD https://api.github.com/repos/xianyi/OpenBLAS/git/refs/tags/v0.2.20 openblas_version.json
 RUN git clone --recursive -b v0.2.20 https://github.com/xianyi/OpenBLAS.git && \
     cd OpenBLAS && \
     make -j$(nproc) && \
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 484b49c..019c4ff 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -69,10 +69,13 @@ build_armv6() {
     # file tries to add -llapack. Lapack functionality though, requires -lgfortran
     # to be linked additionally.
 
+    # We do not need OpenMP, since most armv6 systems have only 1 core
+
     cmake \
         -DCMAKE_TOOLCHAIN_FILE=$CROSS_ROOT/Toolchain.cmake \
         -DUSE_CUDA=OFF \
         -DUSE_OPENCV=OFF \
+        -DUSE_OPENMP=OFF \
         -DUSE_SIGNAL_HANDLER=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DUSE_MKL_IF_AVAILABLE=OFF \

-- 
To stop receiving notification emails like this one, please contact
marcoabreu@apache.org.