Skip to content

Commit

Permalink
Update the assembler to write build args to the dockerfile (#65)
Browse files Browse the repository at this point in the history
* Update the assembler to write build args to the dockerfile

* Regenerate dockerfiles

* Regenerate ubuntu TF
  • Loading branch information
dmsuehir authored Aug 19, 2021
1 parent ab7f684 commit 84e046e
Show file tree
Hide file tree
Showing 66 changed files with 256 additions and 247 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="1.15.2"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -34,14 +34,14 @@ RUN apt-get update && \
python-tk && \
pip install requests

ARG PY_VERSION=3
ARG PY_VERSION="3.8"

RUN apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \
build-essential \
python${PY_VERSION}-dev

ARG TF_MODELS_BRANCH
ARG TF_MODELS_BRANCH="1efe98bb8e8d98bbffc703a90d88df15fc2ce906"

ARG FETCH_PR

Expand Down Expand Up @@ -85,7 +85,7 @@ RUN cd ${TF_MODELS_DIR}/research && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="preprocess-coco-val"

ARG MODEL_WORKSPACE

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/intel-tf-image-recognition.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/intel-tf-language-modeling.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/intel-tf-language-translation.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/intel-tf-object-detection.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -34,7 +34,7 @@ RUN apt-get update && \
python-tk && \
pip install requests

ARG PY_VERSION=3
ARG PY_VERSION="3.8"

RUN apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

ARG PY_VERSION=3
ARG PY_VERSION="3.7"

RUN apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/lpot/tensorflow/intel-tf-lpot.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

ARG PY_VERSION=3
ARG PY_VERSION="3.7"

RUN apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \
Expand Down
10 changes: 5 additions & 5 deletions dockerfiles/ml/XGBoost/xgboost.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -19,13 +19,13 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.

ARG UBUNTU_VERSION
ARG UBUNTU_VERSION="20.04"

FROM ubuntu:${UBUNTU_VERSION}

ARG CONDA_INSTALL_PATH=/opt/conda

ARG MINICONDA_VERSION=4.7.12
ARG MINICONDA_VERSION="4.7.12"

RUN apt-get update && \
apt-get install --no-install-recommends --fix-missing -y \
Expand All @@ -40,8 +40,8 @@ RUN apt-get update && \

ENV PATH="${CONDA_INSTALL_PATH}/bin:${PATH}"

ARG PY_VERSION
ARG INTEL_PY_BUILD
ARG PY_VERSION="3"
ARG INTEL_PY_BUILD="2021.3.0"

RUN conda config --add channels intel && \
conda install -y -q intelpython${PY_VERSION}_core==${INTEL_PY_BUILD} python=${PY_VERSION}
Expand Down
14 changes: 7 additions & 7 deletions dockerfiles/ml/scikit-learn/scikit-learn-census.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -19,13 +19,13 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.

ARG UBUNTU_VERSION
ARG UBUNTU_VERSION="20.04"

FROM ubuntu:${UBUNTU_VERSION}

ARG CONDA_INSTALL_PATH=/opt/conda

ARG MINICONDA_VERSION=4.7.12
ARG MINICONDA_VERSION="4.7.12"

RUN apt-get update && \
apt-get install --no-install-recommends --fix-missing -y \
Expand All @@ -40,8 +40,8 @@ RUN apt-get update && \

ENV PATH="${CONDA_INSTALL_PATH}/bin:${PATH}"

ARG PY_VERSION
ARG INTEL_PY_BUILD
ARG PY_VERSION="3"
ARG INTEL_PY_BUILD="2021.3.0"

RUN conda config --add channels intel && \
conda install -y -q intelpython${PY_VERSION}_core==${INTEL_PY_BUILD} python=${PY_VERSION}
Expand Down Expand Up @@ -71,13 +71,13 @@ ENV USE_DAAL4PY_SKLEARN YES

RUN conda install -y -q \
daal4py \
scikit-learn \
scikit-learn-intelex \
threadpoolctl && \
conda clean -y --all

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="scikit-learn-census"

ARG MODEL_WORKSPACE

Expand Down
10 changes: 5 additions & 5 deletions dockerfiles/ml/scikit-learn/scikit-learn.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -19,13 +19,13 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.

ARG UBUNTU_VERSION
ARG UBUNTU_VERSION="20.04"

FROM ubuntu:${UBUNTU_VERSION}

ARG CONDA_INSTALL_PATH=/opt/conda

ARG MINICONDA_VERSION=4.7.12
ARG MINICONDA_VERSION="4.7.12"

RUN apt-get update && \
apt-get install --no-install-recommends --fix-missing -y \
Expand All @@ -40,8 +40,8 @@ RUN apt-get update && \

ENV PATH="${CONDA_INSTALL_PATH}/bin:${PATH}"

ARG PY_VERSION
ARG INTEL_PY_BUILD
ARG PY_VERSION="3"
ARG INTEL_PY_BUILD="2021.3.0"

RUN conda config --add channels intel && \
conda install -y -q intelpython${PY_VERSION}_core==${INTEL_PY_BUILD} python=${PY_VERSION}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -36,7 +36,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="densenet169-fp32-inference"

ARG MODEL_WORKSPACE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -36,7 +36,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="inceptionv3-fp32-inference"

ARG MODEL_WORKSPACE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -36,7 +36,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="inceptionv3-int8-inference"

ARG MODEL_WORKSPACE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -36,7 +36,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="inceptionv4-fp32-inference"

ARG MODEL_WORKSPACE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -36,7 +36,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="inceptionv4-int8-inference"

ARG MODEL_WORKSPACE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Intel Corporation
# Copyright (c) 2020-2021 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

ARG TENSORFLOW_IMAGE="intel/intel-optimized-tensorflow"

ARG TENSORFLOW_TAG
ARG TENSORFLOW_TAG="latest"

FROM ${TENSORFLOW_IMAGE}:${TENSORFLOW_TAG}

Expand All @@ -39,7 +39,7 @@ RUN apt-get update && \

ARG PACKAGE_DIR=model_packages

ARG PACKAGE_NAME
ARG PACKAGE_NAME="mobilenet-v1-fp32-inference"

ARG MODEL_WORKSPACE

Expand Down
Loading

0 comments on commit 84e046e

Please sign in to comment.