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 b8bb63d Add back R tests and fix typo around R and perl tests (#13940)
b8bb63d is described below
commit b8bb63df1bab5710c475d70cdbc005db33548f5c
Author: Marco de Abreu <marcoab...@users.noreply.github.com>
AuthorDate: Mon Jan 21 20:01:17 2019 +0100
Add back R tests and fix typo around R and perl tests (#13940)
* Add back R tests and fix typo around R and perl tests
* Fix permissions
* Fix copy&paste mistake around roxygen and remove previous permission
override
---
Makefile | 2 +-
ci/docker/runtime_functions.sh | 2 ++
ci/jenkins/Jenkins_steps.groovy | 30 +++++++++++++++++++++++++++++-
ci/jenkins/Jenkinsfile_unix_cpu | 1 +
ci/jenkins/Jenkinsfile_unix_gpu | 1 +
5 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index f4769c3..c6334fb 100644
--- a/Makefile
+++ b/Makefile
@@ -606,7 +606,7 @@ rpkg:
cp -rf 3rdparty/dmlc-core/include/* R-package/inst/include/
cp -rf 3rdparty/tvm/nnvm/include/* R-package/inst/include
Rscript -e "if(!require(devtools)){install.packages('devtools', repo =
'https://cloud.r-project.org/')}"
- Rscript -e "if(!require(devtools)||packageVersion('roxygen2') <
'6.1.1'){install.packages('roxygen2', repo = 'https://cloud.r-project.org/')}"
+ Rscript -e "if(!require(roxygen2)||packageVersion('roxygen2') <
'6.1.1'){install.packages('roxygen2', repo = 'https://cloud.r-project.org/')}"
Rscript -e "library(devtools); library(methods);
options(repos=c(CRAN='https://cloud.r-project.org/'));
install_deps(pkg='R-package', dependencies = TRUE)"
cp R-package/dummy.NAMESPACE R-package/NAMESPACE
echo "import(Rcpp)" >> R-package/NAMESPACE
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 3da6c52..76fd2c6 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -883,6 +883,7 @@ unittest_ubuntu_cpu_R() {
mkdir -p /tmp/r-site-library
# build R packages in parallel
mkdir -p ~/.R/
+ build_ccache_wrappers
echo "MAKEFLAGS = -j"$(nproc) > ~/.R/Makevars
# make -j not supported
make rpkg \
@@ -898,6 +899,7 @@ unittest_ubuntu_gpu_R() {
mkdir -p /tmp/r-site-library
# build R packages in parallel
mkdir -p ~/.R/
+ build_ccache_wrappers
echo "MAKEFLAGS = -j"$(nproc) > ~/.R/Makevars
# make -j not supported
make rpkg \
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 8b0e83e..079a384 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -888,6 +888,20 @@ def test_unix_clojure_cpu() {
}
def test_unix_r_cpu() {
+ return ['R: CPU': {
+ node(NODE_LINUX_CPU) {
+ ws('workspace/ut-r-cpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ utils.unpack_and_init('cpu', mx_lib, true)
+ utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_R', false)
+ utils.publish_test_coverage()
+ }
+ }
+ }
+ }]
+}
+
+def test_unix_perl_cpu() {
return ['Perl: CPU': {
node(NODE_LINUX_CPU) {
ws('workspace/ut-perl-cpu') {
@@ -943,7 +957,7 @@ def test_unix_cpp_cpu() {
}]
}
-def test_unix_r_gpu() {
+def test_unix_perl_gpu() {
return ['Perl: GPU': {
node(NODE_LINUX_GPU) {
ws('workspace/ut-perl-gpu') {
@@ -957,6 +971,20 @@ def test_unix_r_gpu() {
}]
}
+def test_unix_r_gpu() {
+ return ['R: GPU': {
+ node(NODE_LINUX_GPU) {
+ ws('workspace/ut-r-gpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ utils.unpack_and_init('gpu', mx_lib, true)
+ utils.docker_run('ubuntu_gpu', 'unittest_ubuntu_gpu_R', true)
+ utils.publish_test_coverage()
+ }
+ }
+ }
+ }]
+}
+
def test_unix_julia07_cpu() {
return ['Julia 0.7: CPU': {
node(NODE_LINUX_CPU) {
diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu
index 2fe4576..2cf2c35 100644
--- a/ci/jenkins/Jenkinsfile_unix_cpu
+++ b/ci/jenkins/Jenkinsfile_unix_cpu
@@ -52,6 +52,7 @@ core_logic: {
custom_steps.test_unix_scala_cpu(),
custom_steps.test_unix_scala_mkldnn_cpu(),
custom_steps.test_unix_clojure_cpu(),
+ custom_steps.test_unix_perl_cpu(),
custom_steps.test_unix_r_cpu(),
custom_steps.test_unix_julia07_cpu(),
custom_steps.test_unix_julia10_cpu(),
diff --git a/ci/jenkins/Jenkinsfile_unix_gpu b/ci/jenkins/Jenkinsfile_unix_gpu
index bd88490..664e591 100644
--- a/ci/jenkins/Jenkinsfile_unix_gpu
+++ b/ci/jenkins/Jenkinsfile_unix_gpu
@@ -51,6 +51,7 @@ core_logic: {
custom_steps.test_unix_python3_mkldnn_gpu(),
custom_steps.test_unix_python3_mkldnn_nocudnn_gpu(),
custom_steps.test_unix_python3_tensorrt_gpu(),
+ custom_steps.test_unix_perl_gpu(),
custom_steps.test_unix_r_gpu(),
custom_steps.test_unix_cpp_gpu(),
custom_steps.test_unix_cpp_mkldnn_gpu(),
