From 15b56a83f9a254070300785534af32ffd3b5eed8 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Wed, 31 Mar 2021 18:40:15 +0000 Subject: [PATCH 1/6] fix cd pypi env var name --- tools/pip/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pip/setup.py b/tools/pip/setup.py index 246c8c4e3e0b..e7310dbc04f0 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -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() From c9b71c0a3ec9c599e782b376c891daf8e41c924f Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Wed, 31 Mar 2021 23:05:02 +0000 Subject: [PATCH 2/6] fix in ci/build.py --- ci/build.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci/build.py b/ci/build.py index f7e8a9e966b0..f172eac8dd65 100755 --- a/ci/build.py +++ b/ci/build.py @@ -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() @@ -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 : ", environment) + # Build docker command docker_arg_list = [ "--cap-add", "SYS_PTRACE", # Required by ASAN @@ -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) From b7d5f65ad96aa087099ff0d9d8658a38034b30a8 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Thu, 1 Apr 2021 07:21:33 +0000 Subject: [PATCH 3/6] fix --- ci/Jenkinsfile_utils.groovy | 3 +-- ci/build.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy index a77ab1cde15c..956e5d88e6c6 100644 --- a/ci/Jenkinsfile_utils.groovy +++ b/ci/Jenkinsfile_utils.groovy @@ -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' : '') diff --git a/ci/build.py b/ci/build.py index f172eac8dd65..7b6fa9fbfc13 100755 --- a/ci/build.py +++ b/ci/build.py @@ -132,7 +132,7 @@ def container_run(platform: str, logging.info("Using ccache directory: %s", local_ccache_dir) # Log enviroment - logging.info("environment : ", environment) + logging.info("environment ---> {0}".format(environment)) # Build docker command docker_arg_list = [ @@ -277,7 +277,7 @@ def main() -> int: command = list(chain.from_iterable(args.command)) environment = dict([(e.split('=')[:2] if '=' in e else (e, os.environ[e])) for e in args.environment]) - + print(environment) if args.list: print(list_platforms()) elif args.platform: From 597e3e1579c6c1fddaa0fc48acee090a4b5dc523 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Thu, 1 Apr 2021 17:55:15 +0000 Subject: [PATCH 4/6] fix --- ci/Jenkinsfile_utils.groovy | 2 +- tools/pip/setup.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy index 956e5d88e6c6..85b55288f660 100644 --- a/ci/Jenkinsfile_utils.groovy +++ b/ci/Jenkinsfile_utils.groovy @@ -153,7 +153,7 @@ def docker_run(platform, function_name, use_nvidia = false, shared_mem = '500m', env_vars = [env_vars] } env_vars << "BRANCH=${env.BRANCH_NAME}" - def env_vars_str = "-e " + 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' : '') diff --git a/tools/pip/setup.py b/tools/pip/setup.py index e7310dbc04f0..a842ddf006c2 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -58,6 +58,10 @@ elif travis_tag.startswith('patch-'): __version__ = os.environ['TRAVIS_TAG'].split('-')[1] +# release tag +elif is_release: + __version__ += 'RELEASE' + DEPENDENCIES = [ 'numpy<2.0.0,>1.16.0', From 4e209854299119b4dd9f04eaaffbefc0e98fd369 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 1 Apr 2021 15:51:47 -0700 Subject: [PATCH 5/6] Update setup.py --- tools/pip/setup.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/pip/setup.py b/tools/pip/setup.py index a842ddf006c2..c0458a41cafe 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -58,11 +58,6 @@ elif travis_tag.startswith('patch-'): __version__ = os.environ['TRAVIS_TAG'].split('-')[1] -# release tag -elif is_release: - __version__ += 'RELEASE' - - DEPENDENCIES = [ 'numpy<2.0.0,>1.16.0', 'requests>=2.20.0,<3', From 1aa6bd5b60a8fe4c3716296134a6df5969b58b0a Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Fri, 2 Apr 2021 10:22:14 -0700 Subject: [PATCH 6/6] Update build.py --- ci/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.py b/ci/build.py index 7b6fa9fbfc13..2c63c0d8d05f 100755 --- a/ci/build.py +++ b/ci/build.py @@ -277,7 +277,7 @@ def main() -> int: command = list(chain.from_iterable(args.command)) environment = dict([(e.split('=')[:2] if '=' in e else (e, os.environ[e])) for e in args.environment]) - print(environment) + if args.list: print(list_platforms()) elif args.platform: