[incubator-mxnet] branch v1.2.0 updated: Update script used for building OSX maven packages in v1.2.0 (#11996)

[ns...@apache.org]

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

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


The following commit(s) were added to refs/heads/v1.2.0 by this push:
     new 3565264  Update script used for building OSX maven packages in v1.2.0 (#11996)
3565264 is described below

commit 3565264aa8f2af9ab50927a6b99b52e0b1a92b54
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Thu Aug 2 14:36:37 2018 -0700

    Update script used for building OSX maven packages in v1.2.0 (#11996)
    
    * use Opencv3.4.1 for mac builds
    
    * [maven-release-plugin] prepare release mxnet-parent_2.11-1.2.1
    
    * [maven-release-plugin] prepare for next development iteration
    
    * update opencv@2 to opencv for v1.2.0 branch and update version to Scala package versionto  1.2.2
---
 scala-package/dev/compile-mxnet-backend.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scala-package/dev/compile-mxnet-backend.sh b/scala-package/dev/compile-mxnet-backend.sh
index 43517fc..3e2554f 100755
--- a/scala-package/dev/compile-mxnet-backend.sh
+++ b/scala-package/dev/compile-mxnet-backend.sh
@@ -23,7 +23,7 @@
 set -e
 echo "Compiling MXNet Backend, Hang tight!....."
 
-if [[ ($# -ne 3) || ( $1 == "--help") ||  $1 == "-h" ]]; then
+if [[ ($# -ne 2) || ( $1 == "--help") ||  $1 == "-h" ]]; then
   echo "Usage: [-h|--help]  <osx-x86_64-cpu/linux-x86_64-cpu/linux-x86_64-gpu> <project.basedir>" 1>&2
   exit 1
 fi
@@ -57,9 +57,9 @@ cp make/config.mk ./config.mk
 if [[ $PLATFORM == "osx-x86_64-cpu" ]];
 then
     echo "Building MXNet Backend on MAC OS"
-    echo "ADD_CFLAGS += -I/usr/local/opt/opencv@2/include" >> ./config.mk
+    echo "ADD_CFLAGS += -I/usr/local/opt/opencv/include" >> ./config.mk
     echo "ADD_CFLAGS += -I/usr/local/opt/openblas/include" >> ./config.mk
-    echo "ADD_LDFLAGS += -L/usr/local/opt/opencv@2/lib" >> ./config.mk
+    echo "ADD_LDFLAGS += -L/usr/local/opt/opencv/lib" >> ./config.mk
     echo "ADD_LDFLAGS += -L/usr/local/opt/openblas/lib" >> ./config.mk
     echo "USE_OPENMP = 0" >> ./config.mk
     echo "USE_LAPACK_PATH = /usr/local/opt/lapack/lib" >> ./config.mk