larroy closed pull request #10797: Better cleaning of git repo, signal handlers
URL: https://github.com/apache/incubator-mxnet/pull/10797
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Jenkinsfile b/Jenkinsfile
index 28edda00959..7b5d1fc65f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,8 @@ def init_git() {
timeout(time: 15, unit: 'MINUTES') {
checkout scm
sh 'git submodule update --init --recursive'
- sh 'git clean -d -f'
+ sh 'git clean -ffdx'
+ sh 'git submodule foreach git clean -ffdx'
}
} catch (exc) {
deleteDir()
diff --git a/ci/build.py b/ci/build.py
index 4473f54210a..dd3c8174581 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -265,6 +265,7 @@ def use_cache():
if args.list:
list_platforms()
+
elif args.platform:
platform = args.platform
tag = get_docker_tag(platform=platform, registry=args.docker_registry)
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 36e23879705..d72da1dea22 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -24,8 +24,8 @@ set -ex
clean_repo() {
set -ex
- git clean -xfd
- git submodule foreach --recursive git clean -xfd
+ git clean -ffdx
+ git submodule foreach --recursive git clean -ffdx
git reset --hard
git submodule foreach --recursive git reset --hard
git submodule update --init --recursive
@@ -219,6 +219,7 @@ build_centos7_cpu() {
USE_LAPACK_PATH=/usr/lib64/liblapack.so \
USE_BLAS=openblas \
USE_DIST_KVSTORE=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -233,6 +234,7 @@ build_centos7_mkldnn() {
USE_LAPACK_PATH=/usr/lib64/liblapack.so \
USE_MKLDNN=1 \
USE_BLAS=openblas \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -250,6 +252,7 @@ build_centos7_gpu() {
USE_CUDA_PATH=/usr/local/cuda \
USE_CUDNN=1 \
USE_DIST_KVSTORE=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -266,6 +269,7 @@ build_ubuntu_cpu_openblas() {
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_DIST_KVSTORE=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -282,6 +286,7 @@ build_ubuntu_cpu_clang39() {
USE_BLAS=openblas \
USE_OPENMP=0 \
USE_DIST_KVSTORE=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -298,6 +303,9 @@ build_ubuntu_cpu_clang50() {
USE_BLAS=openblas \
USE_OPENMP=1 \
USE_DIST_KVSTORE=1 \
+ CXX=clang++-5.0 \
+ CC=clang-5.0 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -314,6 +322,7 @@ build_ubuntu_cpu_clang39_mkldnn() {
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=0 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -330,6 +339,7 @@ build_ubuntu_cpu_clang50_mkldnn() {
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -341,6 +351,7 @@ build_ubuntu_cpu_mkldnn() {
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -359,6 +370,7 @@ build_ubuntu_gpu_mkldnn() {
USE_CUDA=1 \
USE_CUDA_PATH=/usr/local/cuda \
USE_CUDNN=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -374,6 +386,7 @@ build_ubuntu_gpu_cuda91_cudnn7() {
USE_CUDNN=1 \
USE_CPP_PACKAGE=1 \
USE_DIST_KVSTORE=1 \
+ USE_SIGNAL_HANDLER=1 \
-j$(nproc)
}
@@ -401,6 +414,7 @@ build_ubuntu_gpu_cmake_mkldnn() {
-DUSE_CUDNN=1 \
-DUSE_MKLML_MKL=1 \
-DUSE_MKLDNN=1 \
+ -DUSE_SIGNAL_HANDLER=ON \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
/work/mxnet
@@ -422,6 +436,7 @@ build_ubuntu_gpu_cmake() {
-DUSE_MKLML_MKL=0 \
-DUSE_MKLDNN=0 \
-DUSE_DIST_KVSTORE=1 \
+ -DUSE_SIGNAL_HANDLER=ON \
-DCMAKE_BUILD_TYPE=Release \
-G Ninja \
/work/mxnet
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
