You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/06/06 09:13:47 UTC
[GitHub] marcoabreu closed pull request #11096: [MXNET-472] ccache for
docker builds
marcoabreu closed pull request #11096: [MXNET-472] ccache for docker builds
URL: https://github.com/apache/incubator-mxnet/pull/11096
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/.gitignore b/.gitignore
index d585672ab7d..416741a5e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,7 @@ python/.eggs
*DartConfiguration.tcl
tests/Makefile
tests/mxnet_unit_tests
+
+# generated wrappers for ccache
+cc
+cxx
diff --git a/Makefile b/Makefile
index 951b29b41cf..0e26858a601 100644
--- a/Makefile
+++ b/Makefile
@@ -477,7 +477,7 @@ endif
$(PS_PATH)/build/libps.a: PSLITE
PSLITE:
- $(MAKE) CXX=$(CXX) DEPS_PATH=$(DEPS_PATH) -C $(PS_PATH) ps
+ $(MAKE) CXX="$(CXX)" DEPS_PATH="$(DEPS_PATH)" -C $(PS_PATH) ps
$(DMLC_CORE)/libdmlc.a: DMLCCORE
diff --git a/ci/README.md b/ci/README.md
index 1c59a3af7c8..ca46434a30f 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -54,7 +54,7 @@ The artifacts are located in the build/ directory in the project root. In case
## Add a platform
-To add a platform, you should add the appropiate dockerfile in
+To add a platform, you should add the appropriate dockerfile in
docker/Dockerfile.build.<platform> and add a shell function named
build_<platform> to the file docker/runtime_functions.sh with build
instructions for that platform.
@@ -63,3 +63,9 @@ instructions for that platform.
Due to current limitations of the CMake build system creating artifacts in the
source 3rdparty folder of the parent mxnet sources concurrent builds of
different platforms is NOT SUPPORTED.
+
+## ccache
+For all builds a directory from the host system is mapped where ccache will store cached
+compiled object files (defaults to /tmp/ci_ccache). This will speed up rebuilds
+significantly. You can set this directory explicitly by setting CCACHE_DIR environment
+variable. All ccache instances are currently set to be 10 Gigabytes max in size.
diff --git a/ci/build.py b/ci/build.py
index deae1d733a8..84be3acebb9 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -33,13 +33,14 @@
import shutil
import subprocess
import sys
+import tempfile
from copy import deepcopy
from itertools import chain
from subprocess import call, check_call
from typing import *
-def get_platforms(path: Optional[str]="docker"):
+def get_platforms(path: Optional[str] = "docker"):
"""Get a list of architectures given our dockerfiles"""
dockerfiles = glob.glob(os.path.join(path, "Dockerfile.build.*"))
dockerfiles = list(filter(lambda x: x[-1] != '~', dockerfiles))
@@ -71,12 +72,12 @@ def build_docker(platform: str, docker_binary: str) -> None:
tag = get_docker_tag(platform)
logging.info("Building container tagged '%s' with %s", tag, docker_binary)
cmd = [docker_binary, "build",
- "-f", get_dockerfile(platform),
- "--rm=false", # Keep intermediary layers to prime the build cache
- "--build-arg", "USER_ID={}".format(os.getuid()),
- "--cache-from", tag,
- "-t", tag,
- "docker"]
+ "-f", get_dockerfile(platform),
+ "--rm=false", # Keep intermediary layers to prime the build cache
+ "--build-arg", "USER_ID={}".format(os.getuid()),
+ "--cache-from", tag,
+ "-t", tag,
+ "docker"]
logging.info("Running command: '%s'", ' '.join(cmd))
check_call(cmd)
@@ -102,8 +103,10 @@ def _get_local_image_id(docker_binary, docker_tag):
def get_mxnet_root() -> str:
curpath = os.path.abspath(os.path.dirname(__file__))
+
def is_mxnet_root(path: str) -> bool:
return os.path.exists(os.path.join(path, ".mxnet_root"))
+
while not is_mxnet_root(curpath):
parent = os.path.abspath(os.path.join(curpath, os.pardir))
if parent == curpath:
@@ -116,9 +119,19 @@ def buildir() -> str:
return os.path.join(get_mxnet_root(), "build")
+def default_ccache_dir() -> str:
+ if 'CCACHE_DIR' in os.environ:
+ ccache_dir = os.path.realpath(os.environ['CCACHE_DIR'])
+ os.makedirs(ccache_dir, exist_ok=True)
+ return ccache_dirpython
+ # Share ccache across containers (should we have a separate dir per platform?)
+ return os.path.join(tempfile.gettempdir(), "ci_ccache")
+
+
def container_run(platform: str,
docker_binary: str,
shared_memory_size: str,
+ local_ccache_dir: str,
command: List[str],
dry_run: bool = False,
into_container: bool = False) -> str:
@@ -127,12 +140,16 @@ def container_run(platform: str,
local_build_folder = buildir()
# We need to create it first, otherwise it will be created by the docker daemon with root only permissions
os.makedirs(local_build_folder, exist_ok=True)
+ os.makedirs(local_ccache_dir, exist_ok=True)
+ logging.info("Using ccache directory: %s", local_ccache_dir)
runlist = [docker_binary, 'run', '--rm', '-t',
- '--shm-size={}'.format(shared_memory_size),
- '-v', "{}:/work/mxnet".format(mx_root), # mount mxnet root
- '-v', "{}:/work/build".format(local_build_folder), # mount mxnet/build for storing build artifacts
- '-u', '{}:{}'.format(os.getuid(), os.getgid()),
- tag]
+ '--shm-size={}'.format(shared_memory_size),
+ '-v', "{}:/work/mxnet".format(mx_root), # mount mxnet root
+ '-v', "{}:/work/build".format(local_build_folder), # mount mxnet/build for storing build artifacts
+ '-v', "{}:/work/ccache".format(local_ccache_dir),
+ '-u', '{}:{}'.format(os.getuid(), os.getgid()),
+ '-e', "CCACHE_DIR=/work/ccache", # this path is inside the container as /work/ccache is mounted
+ tag]
runlist.extend(command)
cmd = ' '.join(runlist)
if not dry_run and not into_container:
@@ -159,6 +176,7 @@ def container_run(platform: str,
def list_platforms() -> str:
print("\nSupported platforms:\n{}".format('\n'.join(get_platforms())))
+
def main() -> int:
# We need to be in the same directory than the script so the commands in the dockerfiles work as
# expected. But the script can be invoked from a different path
@@ -173,7 +191,7 @@ def script_name() -> str:
logging.basicConfig(format='{}: %(asctime)-15s %(message)s'.format(script_name()))
parser = argparse.ArgumentParser(description="""Utility for building and testing MXNet on docker
- containers""",epilog="")
+ containers""", epilog="")
parser.add_argument("-p", "--platform",
help="platform",
type=str)
@@ -219,6 +237,11 @@ def script_name() -> str:
help="command to run in the container",
nargs='*', action='append', type=str)
+ parser.add_argument("--ccache-dir",
+ default=default_ccache_dir(),
+ help="Ccache directory",
+ type=str)
+
args = parser.parse_args()
command = list(chain(*args.command))
docker_binary = get_docker_binary(args.nvidiadocker)
@@ -234,21 +257,22 @@ def script_name() -> str:
import docker_cache
logging.info('Docker cache download is enabled')
docker_cache.load_docker_cache(bucket_name=args.docker_cache_bucket, docker_tag=tag)
+ # prepare ccache
build_docker(platform, docker_binary)
if args.build_only:
logging.warning("Container was just built. Exiting due to build-only.")
return 0
if command:
- container_run(platform, docker_binary, shared_memory_size, command)
+ container_run(platform, docker_binary, shared_memory_size, args.ccache_dir, command)
elif args.print_docker_run:
- print(container_run(platform, docker_binary, shared_memory_size, [], True))
+ print(container_run(platform, docker_binary, shared_memory_size, args.ccache_dir, [], True))
elif args.into_container:
- container_run(platform, docker_binary, shared_memory_size, [], False, True)
+ container_run(platform, docker_binary, shared_memory_size, args.ccache_dir, [], False, True)
else:
cmd = ["/work/mxnet/ci/docker/runtime_functions.sh", "build_{}".format(platform)]
logging.info("No command specified, trying default build: %s", ' '.join(cmd))
- container_run(platform, docker_binary, shared_memory_size, cmd)
+ container_run(platform, docker_binary, shared_memory_size, args.ccache_dir, cmd)
elif args.all:
platforms = get_platforms()
@@ -266,7 +290,7 @@ def script_name() -> str:
build_platform = "build_{}".format(platform)
cmd = ["/work/mxnet/ci/docker/runtime_functions.sh", build_platform]
shutil.rmtree(buildir(), ignore_errors=True)
- container_run(platform, docker_binary, shared_memory_size, cmd)
+ container_run(platform, docker_binary, shared_memory_size, args.ccache_dir, cmd)
plat_buildir = os.path.join(get_mxnet_root(), build_platform)
shutil.move(buildir(), plat_buildir)
logging.info("Built files left in: %s", plat_buildir)
diff --git a/ci/docker/Dockerfile.build.android_arm64 b/ci/docker/Dockerfile.build.android_arm64
index d7687514d7a..fe9490f8298 100755
--- a/ci/docker/Dockerfile.build.android_arm64
+++ b/ci/docker/Dockerfile.build.android_arm64
@@ -18,9 +18,17 @@
#
# Dockerfile to build MXNet for Android ARM64/ARMv8
+FROM ccache/build.ubuntu as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
FROM dockcross/base:latest
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
# The cross-compiling emulator
RUN apt-get update && apt-get install -y \
qemu-user \
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7
index c22e000cad1..bc2c0e897a5 100755
--- a/ci/docker/Dockerfile.build.android_armv7
+++ b/ci/docker/Dockerfile.build.android_armv7
@@ -18,9 +18,17 @@
#
# Dockerfile to build MXNet for Android ARMv7
+FROM ccache/build.ubuntu as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
FROM dockcross/base:latest
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
# The cross-compiling emulator
RUN apt-get update && apt-get install -y \
qemu-user \
diff --git a/ci/docker/Dockerfile.build.arm64 b/ci/docker/Dockerfile.build.arm64
index ec949600f73..edf78856722 100755
--- a/ci/docker/Dockerfile.build.arm64
+++ b/ci/docker/Dockerfile.build.arm64
@@ -18,10 +18,18 @@
#
# Dockerfile to build MXNet for ARM64/ARMv8
+FROM ubuntu:16.04 as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
# Temporary fix due to https://github.com/apache/incubator-mxnet/issues/10837
#FROM dockcross/linux-arm64
FROM mxnetci/dockcross-linux-arm64:05082018
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
ENV ARCH aarch64
ENV FC /usr/bin/${CROSS_TRIPLE}-gfortran
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
index 20739dabe2e..1d000bb0962 100755
--- a/ci/docker/Dockerfile.build.armv6
+++ b/ci/docker/Dockerfile.build.armv6
@@ -18,10 +18,17 @@
#
# Dockerfile to build MXNet for ARMv6
+FROM ubuntu:16.04 as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
FROM dockcross/linux-armv6
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
ENV ARCH armv6l
-ENV FC=/usr/bin/${CROSS_TRIPLE}-gfortran
ENV HOSTCC gcc
ENV TARGET ARMV6
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
index c2493063518..7d55dc46327 100755
--- a/ci/docker/Dockerfile.build.armv7
+++ b/ci/docker/Dockerfile.build.armv7
@@ -18,8 +18,16 @@
#
# Dockerfile to build MXNet for Android ARMv7
+FROM ubuntu:16.04 as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
FROM dockcross/linux-armv7
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
ENV ARCH armv71
ENV CC /usr/bin/arm-linux-gnueabihf-gcc
ENV CXX /usr/bin/arm-linux-gnueabihf-g++
diff --git a/ci/docker/Dockerfile.build.centos7_cpu b/ci/docker/Dockerfile.build.centos7_cpu
index 92314faf121..1777640273f 100755
--- a/ci/docker/Dockerfile.build.centos7_cpu
+++ b/ci/docker/Dockerfile.build.centos7_cpu
@@ -24,6 +24,8 @@ WORKDIR /work/deps
COPY install/centos7_core.sh /work/
RUN /work/centos7_core.sh
+COPY install/centos7_install_ccache.sh /work/
+RUN /work/centos7_install_ccache.sh
COPY install/centos7_python.sh /work/
RUN /work/centos7_python.sh
COPY install/ubuntu_mklml.sh /work/
diff --git a/ci/docker/Dockerfile.build.centos7_gpu b/ci/docker/Dockerfile.build.centos7_gpu
index 2d28170f11b..cb2ba08c6aa 100755
--- a/ci/docker/Dockerfile.build.centos7_gpu
+++ b/ci/docker/Dockerfile.build.centos7_gpu
@@ -24,6 +24,8 @@ WORKDIR /work/deps
COPY install/centos7_core.sh /work/
RUN /work/centos7_core.sh
+COPY install/centos7_install_ccache.sh /work/
+RUN /work/centos7_install_ccache.sh
COPY install/centos7_python.sh /work/
RUN /work/centos7_python.sh
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
index c358edb1fb0..c963457299b 100755
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -22,13 +22,21 @@
FROM nvidia/cuda:9.0-cudnn7-devel as cudabuilder
+FROM ubuntu:16.04 as ccachebuilder
+
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
+
# Temporary fix due to https://github.com/apache/incubator-mxnet/issues/10837
# FROM dockcross/linux-arm64
FROM mxnetci/dockcross-linux-arm64:05082018
+# extract ccache binary into latest context
+COPY --from=ccachebuilder /usr/local/bin/ccache /usr/local/bin/ccache
+
ENV ARCH aarch64
-ENV FC /usr/bin/${CROSS_TRIPLE}-gfortran
ENV HOSTCC gcc
+ENV FC /usr/bin/${CROSS_TRIPLE}-gfortran
ENV TARGET ARMV8
WORKDIR /work
@@ -39,6 +47,9 @@ RUN git clone --recursive -b v0.2.20 https://github.com/xianyi/OpenBLAS.git && \
make -j$(nproc) && \
PREFIX=${CROSS_ROOT} make install
+ENV OpenBLAS_HOME=${CROSS_ROOT}
+ENV OpenBLAS_DIR=${CROSS_ROOT}
+
# Setup CUDA build env (including configuring and copying nvcc)
COPY --from=cudabuilder /usr/local/cuda /usr/local/cuda
ENV TARGET_ARCH aarch64
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 4d3c4664363..46ed811400b 100755
--- a/ci/docker/Dockerfile.build.ubuntu_build_cuda
+++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -27,6 +27,8 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
COPY install/ubuntu_scala.sh /work/
diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu b/ci/docker/Dockerfile.build.ubuntu_cpu
index 2dc7ef13f21..24558adce68 100755
--- a/ci/docker/Dockerfile.build.ubuntu_cpu
+++ b/ci/docker/Dockerfile.build.ubuntu_cpu
@@ -24,6 +24,8 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
COPY install/ubuntu_scala.sh /work/
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu b/ci/docker/Dockerfile.build.ubuntu_gpu
index 10971724aaa..614d43b911b 100755
--- a/ci/docker/Dockerfile.build.ubuntu_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu
@@ -24,6 +24,8 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+COPY install/ubuntu_install_ccache.sh /work/
+RUN /work/ubuntu_install_ccache.sh
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
COPY install/ubuntu_scala.sh /work/
diff --git a/ci/docker/install/centos7_install_ccache.sh b/ci/docker/install/centos7_install_ccache.sh
new file mode 100755
index 00000000000..3face0a93b5
--- /dev/null
+++ b/ci/docker/install/centos7_install_ccache.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Script to build ccache for centos7 based images
+
+set -ex
+
+pushd .
+
+yum -y install epel-release
+yum -y install git
+yum -y install autoconf
+yum -y install wget
+yum -y install make
+yum -y install google-perftools
+yum -y install asciidoc
+yum -y install gcc-c++-4.8.*
+
+mkdir -p /work/deps
+cd /work/deps
+
+git clone --recursive -b v3.4.2 https://github.com/ccache/ccache.git
+
+cd ccache
+
+./autogen.sh
+./configure
+make -j$(nproc)
+make install
+
+cd /work/deps
+rm -rf /work/deps/ccache
+
+popd
+
+export CCACHE_MAXSIZE=${CCACHE_MAXSIZE:=10G}
+export CCACHE_DIR=${CCACHE_DIR:=/work/ccache}
diff --git a/ci/docker/install/ubuntu_install_ccache.sh b/ci/docker/install/ubuntu_install_ccache.sh
new file mode 100755
index 00000000000..3ceaaad8032
--- /dev/null
+++ b/ci/docker/install/ubuntu_install_ccache.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Script to build ccache for ubuntu based images
+
+set -ex
+
+pushd .
+
+apt update
+apt install -y --no-install-recommends \
+ git \
+ ssh \
+ apt-transport-https \
+ build-essential \
+ ca-certificates \
+ autoconf \
+ google-perftools \
+ asciidoc \
+ libxslt1-dev \
+ docbook-xsl \
+ xsltproc \
+ libxml2-utils
+
+mkdir -p /work/deps
+cd /work/deps
+
+git clone --recursive -b v3.4.2 https://github.com/ccache/ccache.git
+
+cd ccache
+
+./autogen.sh
+./configure
+make -j$(nproc)
+make install
+
+cd /work/deps
+rm -rf /work/deps/ccache
+
+popd
+
+export CCACHE_MAXSIZE=${CCACHE_MAXSIZE:=10G}
+export CCACHE_DIR=${CCACHE_DIR:=/work/ccache}
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 10bca17b5ff..b52de8fcab6 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -31,6 +31,37 @@ clean_repo() {
git submodule update --init --recursive
}
+# wrap compiler calls with ccache
+build_ccache_wrappers() {
+ set -ex
+
+ rm -f cc
+ rm -f cxx
+
+ touch cc
+ touch cxx
+
+ if [ -z ${CC+x} ]; then
+ echo "No \$CC set, defaulting to gcc";
+ export CC=gcc
+ fi
+
+ if [ -z ${CXX+x} ]; then
+ echo "No \$CXX set, defaulting to g++";
+ export CXX=g++
+ fi
+
+ # this function is nessesary for cuda enabled make based builds, since nvcc needs just an executable for -ccbin
+
+ echo -e "#!/bin/sh\n/usr/local/bin/ccache ${CC} \"\$@\"\n" >> cc
+ echo -e "#!/bin/sh\n/usr/local/bin/ccache ${CXX} \"\$@\"\n" >> cxx
+
+ chmod +x cc
+ chmod +x cxx
+
+ export CC=`pwd`/cc
+ export CXX=`pwd`/cxx
+}
# Build commands: Every platform in docker/Dockerfile.build.<platform> should have a corresponding
# function here with the same suffix:
@@ -38,7 +69,11 @@ clean_repo() {
build_jetson() {
set -ex
pushd .
- mv make/crosscompile.jetson.mk make/config.mk
+
+ build_ccache_wrappers
+
+ cp -f make/crosscompile.jetson.mk ./config.mk
+
make -j$(nproc)
export MXNET_LIBRARY_PATH=`pwd`/libmxnet.so
@@ -73,6 +108,8 @@ build_armv6() {
cmake \
-DCMAKE_TOOLCHAIN_FILE=$CROSS_ROOT/Toolchain.cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=OFF \
-DUSE_OPENCV=OFF \
-DUSE_OPENMP=OFF \
@@ -95,7 +132,9 @@ build_armv7() {
set -ex
pushd .
cd /work/build
- cmake\
+ cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=OFF\
-DUSE_OPENCV=OFF\
-DUSE_OPENMP=OFF\
@@ -113,7 +152,9 @@ build_armv7() {
build_amzn_linux_cpu() {
cd /work/build
- cmake\
+ cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=OFF\
-DUSE_OPENCV=ON\
-DUSE_OPENMP=ON\
@@ -128,7 +169,9 @@ build_amzn_linux_cpu() {
}
build_arm64() {
- cmake\
+ cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=OFF\
-DUSE_OPENCV=OFF\
-DUSE_OPENMP=OFF\
@@ -146,7 +189,9 @@ build_arm64() {
build_android_arm64() {
set -ex
cd /work/build
- cmake\
+ cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=OFF\
-DUSE_SSE=OFF\
-DUSE_LAPACK=OFF\
@@ -166,6 +211,8 @@ build_android_arm64() {
build_centos7_cpu() {
set -ex
cd /work/mxnet
+ export CC="ccache gcc"
+ export CXX="ccache g++"
make \
DEV=1 \
USE_LAPACK=1 \
@@ -178,6 +225,8 @@ build_centos7_cpu() {
build_centos7_mkldnn() {
set -ex
cd /work/mxnet
+ export CC="ccache gcc"
+ export CXX="ccache g++"
make \
DEV=1 \
USE_LAPACK=1 \
@@ -190,6 +239,8 @@ build_centos7_mkldnn() {
build_centos7_gpu() {
set -ex
cd /work/mxnet
+ # unfortunately this build has problems in 3rdparty dependencies with ccache and make
+ # build_ccache_wrappers
make \
DEV=1 \
USE_LAPACK=1 \
@@ -202,8 +253,14 @@ build_centos7_gpu() {
-j$(nproc)
}
+build_ubuntu_cpu() {
+ build_ubuntu_cpu_openblas
+}
+
build_ubuntu_cpu_openblas() {
set -ex
+ export CC="ccache gcc"
+ export CXX="ccache g++"
make \
DEV=1 \
USE_CPP_PACKAGE=1 \
@@ -214,54 +271,71 @@ build_ubuntu_cpu_openblas() {
build_ubuntu_cpu_clang39() {
set -ex
+
+ export CXX=clang++-3.9
+ export CC=clang-3.9
+
+ build_ccache_wrappers
+
make \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_OPENMP=0 \
USE_DIST_KVSTORE=1 \
- CXX=clang++-3.9 \
- CC=clang-3.9 \
-j$(nproc)
}
build_ubuntu_cpu_clang50() {
set -ex
- make \
+
+ export CXX=clang++-5.0
+ export CC=clang-5.0
+
+ build_ccache_wrappers
+
+ make \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_OPENMP=1 \
USE_DIST_KVSTORE=1 \
- CXX=clang++-5.0 \
- CC=clang-5.0 \
-j$(nproc)
}
build_ubuntu_cpu_clang39_mkldnn() {
set -ex
+
+ export CXX=clang++-3.9
+ export CC=clang-3.9
+
+ build_ccache_wrappers
+
make \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=0 \
- CXX=clang++-3.9 \
- CC=clang-3.9 \
-j$(nproc)
}
build_ubuntu_cpu_clang50_mkldnn() {
set -ex
+
+ export CXX=clang++-5.0
+ export CC=clang-5.0
+
+ build_ccache_wrappers
+
make \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=1 \
- CXX=clang++-5.0 \
- CC=clang-5.0 \
-j$(nproc)
}
build_ubuntu_cpu_mkldnn() {
set -ex
+ build_ccache_wrappers
make \
DEV=1 \
USE_CPP_PACKAGE=1 \
@@ -272,6 +346,7 @@ build_ubuntu_cpu_mkldnn() {
build_ubuntu_gpu_mkldnn() {
set -ex
+ build_ccache_wrappers
make \
DEV=1 \
USE_CPP_PACKAGE=1 \
@@ -285,7 +360,9 @@ build_ubuntu_gpu_mkldnn() {
build_ubuntu_gpu_cuda91_cudnn7() {
set -ex
- make \
+ # unfortunately this build has problems in 3rdparty dependencies with ccache and make
+ # build_ccache_wrappers
+ make \
DEV=1 \
USE_BLAS=openblas \
USE_CUDA=1 \
@@ -314,6 +391,8 @@ build_ubuntu_gpu_cmake_mkldnn() {
set -ex
cd /work/build
cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=1 \
-DUSE_CUDNN=1 \
-DUSE_MKLML_MKL=1 \
@@ -332,6 +411,8 @@ build_ubuntu_gpu_cmake() {
set -ex
cd /work/build
cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DUSE_CUDA=1 \
-DUSE_CUDNN=1 \
-DUSE_MKLML_MKL=0 \
diff --git a/make/config.mk b/make/config.mk
index dd67c33cc9e..b65f77c605f 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -37,9 +37,15 @@
# choice of compiler
#--------------------
+ifndef CC
export CC = gcc
+endif
+ifndef CXX
export CXX = g++
+endif
+ifndef NVCC
export NVCC = nvcc
+endif
# whether compile with options for MXNet developer
DEV = 0
diff --git a/make/crosscompile.jetson.mk b/make/crosscompile.jetson.mk
index acc9c4a5a8a..868fefe05ec 100644
--- a/make/crosscompile.jetson.mk
+++ b/make/crosscompile.jetson.mk
@@ -57,10 +57,10 @@ DEBUG = 0
USE_SIGNAL_HANDLER = 1
# the additional link flags you want to add
-ADD_LDFLAGS =
+ADD_LDFLAGS = -L${CROSS_ROOT}/lib
# the additional compile flags you want to add
-ADD_CFLAGS =
+ADD_CFLAGS = -I${CROSS_ROOT}/include
#---------------------------------------------
# matrix computation libraries for CPU/GPU
@@ -96,7 +96,7 @@ USE_LIBJPEG_TURBO = 0
USE_LIBJPEG_TURBO_PATH = NONE
# use openmp for parallelization
-USE_OPENMP = 1
+USE_OPENMP = 0
# whether use MKL-DNN library
USE_MKLDNN = 0
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services