This is an automated email from the ASF dual-hosted git repository.
lausen 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 2c4732b Fix CI (#18056)
2c4732b is described below
commit 2c4732b74c1ccbbeccc7add27d6bbcffe437421b
Author: Leonard Lausen <[email protected]>
AuthorDate: Tue Apr 14 22:31:41 2020 -0700
Fix CI (#18056)
* Fix Julia tests always testing master branch instead of PR branches.
* Fix ci/docker_cache.py
* Fix Dockerfiles for nightly tests
---
ci/build.py | 2 +-
ci/docker/Dockerfile.build.ubuntu_nightly_cpu | 3 +++
ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 3 +++
ci/docker/runtime_functions.sh | 1 +
julia/deps/build.jl | 2 +-
julia/src/base.jl | 1 +
6 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ci/build.py b/ci/build.py
index cbc4121..c6a96d5 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -71,7 +71,7 @@ def get_docker_binary(use_nvidia_docker: bool) -> str:
def build_docker(platform: str, docker_binary: str, registry: str,
num_retries: int, no_cache: bool,
- cache_intermediate: bool) -> str:
+ cache_intermediate: bool = False) -> str:
"""
Build a container for the given platform
:param platform: Platform
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
index 49a665e..47754b6 100644
--- a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
+++ b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
@@ -42,6 +42,9 @@ RUN /work/ubuntu_perl.sh
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+COPY install/ubuntu_gcc8.sh /work/
+RUN /work/ubuntu_gcc8.sh
+
COPY install/ubuntu_caffe.sh /work/
RUN /work/ubuntu_caffe.sh
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
index 82d0497..e4e7bd1 100644
--- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
@@ -42,6 +42,9 @@ RUN /work/ubuntu_perl.sh
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+COPY install/ubuntu_gcc8.sh /work/
+RUN /work/ubuntu_gcc8.sh
+
COPY install/ubuntu_tvm.sh /work/
RUN /work/ubuntu_tvm.sh
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 5ea21bc..88b6dfe 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -2087,6 +2087,7 @@ publish_scala_build() {
pushd .
scala_prepare
source /opt/rh/devtoolset-7/enable
+ export USE_SYSTEM_CUDA=1
./ci/publish/scala/build.sh
popd
}
diff --git a/julia/deps/build.jl b/julia/deps/build.jl
index a79d2a0..5194dc3 100644
--- a/julia/deps/build.jl
+++ b/julia/deps/build.jl
@@ -33,7 +33,7 @@ if haskey(ENV, "MXNET_HOME")
# In case of macOS, if user build libmxnet from source and set the
MXNET_HOME,
# the output is still named as `libmxnet.so`.
lib = Libdl.find_library(["libmxnet.$(Libdl.dlext)", "libmxnet.so"],
- [joinpath(MXNET_HOME, "lib"), MXNET_HOME])
+ [joinpath(MXNET_HOME, "lib"), joinpath(MXNET_HOME,
"build"), MXNET_HOME])
if !isempty(lib)
@info("Existing libmxnet detected at $lib, skip building...")
libmxnet_detected = true
diff --git a/julia/src/base.jl b/julia/src/base.jl
index 2b60dca..e94b1bb 100644
--- a/julia/src/base.jl
+++ b/julia/src/base.jl
@@ -42,6 +42,7 @@ const grad_req_map = Dict{Symbol,GRAD_REQ}(
################################################################################
const MXNET_LIB = Libdl.find_library(["libmxnet.$(Libdl.dlext)",
"libmxnet.so"], # see build.jl
[joinpath(get(ENV, "MXNET_HOME", ""),
"lib"),
+ joinpath(get(ENV, "MXNET_HOME", ""),
"build"),
get(ENV, "MXNET_HOME", ""),
joinpath(@__DIR__, "..",
"deps", "usr", "lib")])
