Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build when --upstream-container-version not specified #2175

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Fix build when --upstream-container-version not specified #2175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 49 additions & 17 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,19 +701,6 @@ def create_dockerfile(ddir, dockerfile_name, argmap):


def container_build(images):
# Set the docker build-args based on container version
if FLAGS.container_version in CONTAINER_VERSION_MAP:
if FLAGS.upstream_container_version is not None:
upstream_container_version = FLAGS.upstream_container_version
else:
upstream_container_version = CONTAINER_VERSION_MAP[
FLAGS.container_version][0]
onnx_runtime_version = CONTAINER_VERSION_MAP[FLAGS.container_version][1]
onnx_runtime_openvino_version = CONTAINER_VERSION_MAP[
FLAGS.container_version][2]
else:
fail('unsupported container version {}'.format(FLAGS.container_version))

# The build and install directories within the container.
build_dir = os.path.join(os.sep, 'tmp', 'tritonbuild')
install_dir = os.path.join(os.sep, 'tmp', 'tritonbuild', 'install')
Expand All @@ -726,21 +713,21 @@ def container_build(images):
base_image = images['base']
else:
base_image = 'nvcr.io/nvidia/tritonserver:{}-py3'.format(
upstream_container_version)
FLAGS.upstream_container_version)

if 'pytorch' in images:
pytorch_image = images['pytorch']
else:
pytorch_image = 'nvcr.io/nvidia/pytorch:{}-py3'.format(
upstream_container_version)
FLAGS.upstream_container_version)

dockerfileargmap = {
'TRITON_VERSION': FLAGS.version,
'TRITON_CONTAINER_VERSION': FLAGS.container_version,
'BASE_IMAGE': base_image,
'PYTORCH_IMAGE': pytorch_image,
'ONNX_RUNTIME_VERSION': onnx_runtime_version,
'ONNX_RUNTIME_OPENVINO_VERSION': onnx_runtime_openvino_version
'ONNX_RUNTIME_VERSION': FLAGS.onnx_runtime_version,
'ONNX_RUNTIME_OPENVINO_VERSION': FLAGS.onnx_runtime_openvino_version
}

cachefrommap = [
Expand Down Expand Up @@ -804,6 +791,10 @@ def container_build(images):
# --container-version is removed so that a direct build is
# performed within the container
#
# Add --upstream-container-version, --onnx-runtime-version and
# --onnx-runtime-openvino-version if necessary since these
# FLAGS can be set manually and so may not be in sys.argv
#
# --build-dir is added/overridden to 'build_dir'
#
# --install-dir is added/overridden to 'install_dir'
Expand All @@ -822,6 +813,18 @@ def container_build(images):
continue
runargs.append(a)

if FLAGS.upstream_container_version is not None:
runargs += [
'--upstream-container-version', FLAGS.upstream_container_version
]
if FLAGS.onnx_runtime_version is not None:
runargs += ['--onnx-runtime-version', FLAGS.onnx_runtime_version]
if FLAGS.onnx_runtime_openvino_version is not None:
runargs += [
'--onnx-runtime-openvino-version',
FLAGS.onnx_runtime_openvino_version
]

runargs += ['--build-dir', build_dir]
runargs += ['--install-dir', install_dir]

Expand Down Expand Up @@ -971,6 +974,20 @@ def container_build(images):
help=
'The upstream container version to use when performing a container build. If not specified the upstream container version will be chosen automaticallly based on --container-version.'
)
parser.add_argument(
'--onnx-runtime-version',
type=str,
required=False,
help=
'The ONNX Runtime version to use. If not specified the upstream container version will be chosen automaticallly based on --container-version.'
)
parser.add_argument(
'--onnx-runtime-openvino-version',
type=str,
required=False,
help=
'The ONNX Runtime OpenVINO version to use. If not specified the upstream container version will be chosen automaticallly based on --container-version.'
)
parser.add_argument(
'--container-prebuild-command',
type=str,
Expand Down Expand Up @@ -1066,6 +1083,21 @@ def container_build(images):
if FLAGS.filesystem is None:
FLAGS.filesystem = []

if FLAGS.container_version is not None:
if FLAGS.container_version in CONTAINER_VERSION_MAP:
if FLAGS.upstream_container_version is None:
FLAGS.upstream_container_version = CONTAINER_VERSION_MAP[
FLAGS.container_version][0]
if FLAGS.onnx_runtime_version is None:
FLAGS.onnx_runtime_version = CONTAINER_VERSION_MAP[
FLAGS.container_version][1]
if FLAGS.onnx_runtime_openvino_version is None:
FLAGS.onnx_runtime_openvino_version = CONTAINER_VERSION_MAP[
FLAGS.container_version][2]
else:
fail('unsupported container version {}'.format(
FLAGS.container_version))

# Initialize map of docker images.
images = {}
for img in FLAGS.image:
Expand Down