Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[CD] Fix the name of the pip wheels in CD #20115

Merged
merged 6 commits into from
Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ci/Jenkinsfile_utils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ def docker_run(platform, function_name, use_nvidia = false, shared_mem = '500m',
env_vars = [env_vars]
}
env_vars << "BRANCH=${env.BRANCH_NAME}"
env_vars = env_vars.collect { "-e ${it}" }
def env_vars_str = env_vars.join(' ')
def env_vars_str = "-e " + env_vars.join(' ')
command = command.replaceAll('%ENV_VARS%', env_vars_str)
command = command.replaceAll('%BUILD_ARGS%', build_args.length() > 0 ? "${build_args}" : '')
command = command.replaceAll('%USE_NVIDIA%', use_nvidia ? '--nvidiadocker' : '')
Expand Down
11 changes: 9 additions & 2 deletions ci/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ def container_run(platform: str,
'CCACHE_LOGFILE': '/tmp/ccache.log', # a container-scoped log, useful for ccache verification.
})
environment.update({k: os.environ[k] for k in ['CCACHE_MAXSIZE'] if k in os.environ})
if 'RELEASE_BUILD' not in environment:
environment['RELEASE_BUILD'] = 'false'

tag = get_docker_tag(platform=platform, registry=docker_registry)
mx_root = get_mxnet_root()
Expand All @@ -129,6 +131,9 @@ def container_run(platform: str,
os.makedirs(local_ccache_dir, exist_ok=True)
logging.info("Using ccache directory: %s", local_ccache_dir)

# Log enviroment
logging.info("environment ---> {0}".format(environment))

# Build docker command
docker_arg_list = [
"--cap-add", "SYS_PTRACE", # Required by ASAN
Expand All @@ -144,9 +149,11 @@ def container_run(platform: str,
# temp dir should be local and not shared
'-e', 'CCACHE_TEMPDIR={}'.format(environment['CCACHE_TEMPDIR']),
# this path is inside the container as /work/ccache is mounted
'-e', "CCACHE_DIR={}".format(environment['CCACHE_DIR']),
'-e', 'CCACHE_DIR={}'.format(environment['CCACHE_DIR']),
# a container-scoped log, useful for ccache verification.
'-e', "CCACHE_LOGFILE={}".format(environment['CCACHE_LOGFILE']),
'-e', 'CCACHE_LOGFILE={}'.format(environment['CCACHE_LOGFILE']),
# whether this is a release build or not
'-e', 'RELEASE_BUILD={}'.format(environment['RELEASE_BUILD']),
]
docker_arg_list += [tag]
docker_arg_list.extend(command)
Expand Down
3 changes: 1 addition & 2 deletions tools/pip/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
__version__ = libinfo['__version__']

# set by the CD pipeline
is_release = os.environ.get("IS_RELEASE", "").strip()
is_release = os.environ.get("RELEASE_BUILD", "False").strip().lower() in ['true', '1']

# set by the travis build pipeline
travis_tag = os.environ.get("TRAVIS_TAG", "").strip()
Expand All @@ -58,7 +58,6 @@
elif travis_tag.startswith('patch-'):
__version__ = os.environ['TRAVIS_TAG'].split('-')[1]


DEPENDENCIES = [
'numpy<2.0.0,>1.16.0',
'requests>=2.20.0,<3',
Expand Down