This is an automated email from the ASF dual-hosted git repository.
zhasheng 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 1368a08 CI: switch to patched ccache 3 version (#17853)
1368a08 is described below
commit 1368a084b5e6c5a6e3dae60aec4cb7b16ae69c31
Author: Leonard Lausen <[email protected]>
AuthorDate: Mon Mar 16 23:24:45 2020 -0700
CI: switch to patched ccache 3 version (#17853)
---
ci/docker/install/deb_ubuntu_ccache.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/ci/docker/install/deb_ubuntu_ccache.sh
b/ci/docker/install/deb_ubuntu_ccache.sh
index 096f86a..cdc9354 100755
--- a/ci/docker/install/deb_ubuntu_ccache.sh
+++ b/ci/docker/install/deb_ubuntu_ccache.sh
@@ -26,6 +26,7 @@ pushd .
apt update || true
apt install -y \
autoconf \
+ gperf \
xsltproc
mkdir -p /work/deps
@@ -50,15 +51,15 @@ export
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
git clone --recursive https://github.com/ccache/ccache.git
cd ccache
-# Checkout a fixed & tested pre-release commit of ccache 4
-# ccache 4 contains fixes for caching nvcc output:
https://github.com/ccache/ccache/pull/381
-git checkout 2e7154e67a5dd56852dae29d4c418d4ddc07c230
+git checkout v3.7.8
+# Backport cuda related fixes: https://github.com/ccache/ccache/pull/381
+git config user.name "MXNet CI"
+git config user.email "[email protected]"
+git cherry-pick --strategy-option=theirs
c4fffda031034f930df2cf188878b8f9160027df
+git cherry-pick 0dec5c2df3e3ebc1fbbf33f74c992bef6264f37a
-
-export CFLAGS="-mno-avx"
-export CXXFLAGS="-mno-avx"
./autogen.sh
-./configure --disable-man --with-libzstd-from-internet
--with-libb2-from-internet
+./configure --disable-man
make -j$(nproc)
make install
