Merge make/pip and make/maven configurations (#17027)

apache · Dec 10, 2019 · bf3b4dc · bf3b4dc
1 parent 8645b9a
commit bf3b4dc
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 754 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1977,7 +1977,7 @@ build_static_libmxnet() {
     set -ex
     pushd .
     local mxnet_variant=${1:?"This function requires a python command as the first argument"}
-    source tools/staticbuild/build.sh ${mxnet_variant} pip
+    source tools/staticbuild/build.sh ${mxnet_variant}
     popd
 }
 

diff --git a/ci/publish/python/build.sh b/ci/publish/python/build.sh
@@ -18,7 +18,7 @@
 
 set -ex
 
-source tools/staticbuild/build.sh $mxnet_variant pip
+source tools/staticbuild/build.sh $mxnet_variant
 
 set -ex
 

diff --git a/ci/publish/scala/build.sh b/ci/publish/scala/build.sh
@@ -22,7 +22,7 @@ set -ex
 # MAVEN_PUBLISH_OS_TYPE: linux-x86_64-cpu|linux-x86_64-gpu|osx-x86_64-cpu
 # export MAVEN_PUBLISH_OS_TYPE=linux-x86_64-cpu
 
-source tools/staticbuild/build.sh $mxnet_variant maven
+source tools/staticbuild/build.sh $mxnet_variant
 
 set -ex
 

diff --git a/make/maven/maven_darwin_mkl.mk b/make/maven/maven_darwin_mkl.mk
diff --git a/make/maven/maven_linux_cu90mkl.mk b/make/maven/maven_linux_cu90mkl.mk