From ac72934655476a1542515b5c8af54bc6249b40ae Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Mon, 3 Jun 2024 14:26:02 -0700 Subject: [PATCH 01/15] improve doc around supported tasks and accelertor options --- optimum/intel/pipelines/pipeline_base.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/optimum/intel/pipelines/pipeline_base.py b/optimum/intel/pipelines/pipeline_base.py index a6c6a36b0f..72c60f4b6f 100644 --- a/optimum/intel/pipelines/pipeline_base.py +++ b/optimum/intel/pipelines/pipeline_base.py @@ -171,6 +171,12 @@ def pipeline( The task defining which pipeline will be returned. Currently accepted tasks are: - `"text-generation"`: will return a [`TextGenerationPipeline`]:. + - `"fill-mask"`: will return a [`FillMaskPipeline`]. + - `"question-answering"`: will return a [`QuestionAnsweringPipeline`]. + - `"image-classificatio"`: will return a [`ImageClassificationPipeline`]. + - `"text-classification"`: will return a [`TextClassificationPipeline`]. + - `"token-classification"`: will return a [`TokenClassificationPipeline`]. + - `"audio-classification"`: will return a [`AudioClassificationPipeline`]. model (`str` or [`PreTrainedModel`], *optional*): The model that will be used by the pipeline to make predictions. This can be a model identifier or an @@ -185,8 +191,8 @@ def pipeline( is not specified or not a string, then the default tokenizer for `config` is loaded (if it is a string). However, if `config` is also not given or not a string, then the default tokenizer for the given `task` will be loaded. - accelerator (`str`, *optional*, defaults to `"ipex"`): - The optimization backends, choose from ["ipex", "inc", "openvino"]. + accelerator (`str`, *optional*): + The optimization backends, choose from ["ipex"]. use_fast (`bool`, *optional*, defaults to `True`): Whether or not to use a Fast tokenizer if possible (a [`PreTrainedTokenizerFast`]). torch_dtype (`str` or `torch.dtype`, *optional*): From ad44975ee7946c9a51d762300dd4a93dbc366e06 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 4 Jun 2024 09:26:37 -0700 Subject: [PATCH 02/15] leave other accelerator options even if not yet implemented --- optimum/intel/pipelines/pipeline_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimum/intel/pipelines/pipeline_base.py b/optimum/intel/pipelines/pipeline_base.py index 72c60f4b6f..6e0afa6c21 100644 --- a/optimum/intel/pipelines/pipeline_base.py +++ b/optimum/intel/pipelines/pipeline_base.py @@ -192,7 +192,7 @@ def pipeline( However, if `config` is also not given or not a string, then the default tokenizer for the given `task` will be loaded. accelerator (`str`, *optional*): - The optimization backends, choose from ["ipex"]. + The optimization backends, choose from ["ipex", "inc", "openvino"]. use_fast (`bool`, *optional*, defaults to `True`): Whether or not to use a Fast tokenizer if possible (a [`PreTrainedTokenizerFast`]). torch_dtype (`str` or `torch.dtype`, *optional*): From c6e855740c53dc90b8c72fa27e9e3bb6a036fedd Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Fri, 12 Jul 2024 12:49:30 -0700 Subject: [PATCH 03/15] bump ipex/torch vs, fix syntax to supress build warnings/errors and install ipex from wheel instead of source --- docker/Dockerfile.intel | 58 ++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel index 1f778ac840..a86387e3bf 100644 --- a/docker/Dockerfile.intel +++ b/docker/Dockerfile.intel @@ -11,8 +11,7 @@ ARG BASE_IMAGE=ubuntu:22.04 FROM ${BASE_IMAGE} AS dev-base RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ + sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ ca-certificates \ git \ curl \ @@ -25,46 +24,39 @@ RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \ libjpeg-dev \ pybind11-dev \ libpng-dev \ - pybind11-dev \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/*" RUN /usr/sbin/update-ccache-symlinks RUN mkdir /opt/ccache && ccache --set-config=cache_dir=/opt/ccache -ENV PATH /opt/conda/bin:$PATH +ENV PATH=/opt/miniforge3/bin:$PATH -FROM dev-base as conda +FROM dev-base AS conda ARG PYTHON_VERSION=3.10 -RUN curl -fsSL -v -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ - chmod +x ~/miniconda.sh && \ - ~/miniconda.sh -b -p /opt/conda && \ - rm ~/miniconda.sh && \ - /opt/conda/bin/conda install -y python=${PYTHON_VERSION} conda-build pyyaml numpy ipython mkl mkl-include ninja cython typing pybind11 Pillow && \ - /opt/conda/bin/conda clean -ya +RUN curl -fsSL -v -o ~/miniforge3.sh -O https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh && \ + chmod +x ~/miniforge3.sh && \ + ~/miniforge3.sh -b -p /opt/miniforge3 && \ + rm ~/miniforge3.sh && \ + /opt/miniforge3/bin/conda install -y python=${PYTHON_VERSION} conda-build pyyaml numpy ipython mkl mkl-include ninja cython typing pybind11 Pillow && \ + /opt/miniforge3/bin/conda clean -ya FROM dev-base AS build -ARG IPEX_VERSION=v1.13.0 -ARG PYTORCH_VERSION=v1.13.0 -ARG TORCHVISION_VERSION=0.13.0+cpu -ARG TORCHAUDIO_VERSION=0.13.0+cpu -COPY --from=conda /opt/conda /opt/conda +ARG IPEX_VERSION=2.3.100 +ARG PYTORCH_VERSION=2.3.1 +ARG TORCHVISION_VERSION=0.18.1+cpu +ARG TORCHAUDIO_VERSION=2.3.1+cpu + +COPY --from=conda /opt/miniforge3 /opt/miniforge3 RUN --mount=type=cache,target=/opt/ccache \ python -m pip install --no-cache-dir torch==${PYTORCH_VERSION}+cpu torchvision==${TORCHVISION_VERSION} torchaudio==${TORCHAUDIO_VERSION} -f https://download.pytorch.org/whl/torch_stable.html && \ - git clone https://github.com/intel/intel-extension-for-pytorch && \ - cd intel-extension-for-pytorch && \ - git checkout ${IPEX_VERSION} && \ - git submodule sync && \ - git submodule update --init --recursive && \ - python -m pip install --no-cache-dir -r requirements.txt && \ - python setup.py bdist_wheel && \ - python -m pip install --no-cache-dir dist/*.whl && \ - cd .. && rm -rf intel-extension-for-pytorch + python -m pip install intel-extension-for-pytorch==$IPEX_VERSION && \ + python -m pip install oneccl_bind_pt --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/cpu/us/ -FROM dev-base as dev -COPY --from=build /opt/conda /opt/conda +FROM dev-base AS dev +COPY --from=build /opt/miniforge3 /opt/miniforge3 ARG OMP_NUM_THREADS=1 -ENV OMP_NUM_THREADS ${OMP_NUM_THREADS} +ENV OMP_NUM_THREADS=${OMP_NUM_THREADS} ARG KMP_BLOCKTIME=1 -ENV KMP_BLOCKTIME ${KMP_BLOCKTIME} +ENV KMP_BLOCKTIME=${KMP_BLOCKTIME} ARG KMP_HW_SUBSET=1T -ENV KMP_HW_SUBSET ${KMP_HW_SUBSET} -ENV LD_PRELOAD "/opt/conda/lib/libiomp5.so /usr/lib/x86_64-linux-gnu/libtcmalloc.so" -ENV LD_LIBRARY_PATH "/opt/conda/lib/python3.8/site-packages/lib/" \ No newline at end of file +ENV KMP_HW_SUBSET=${KMP_HW_SUBSET} +ENV LD_PRELOAD="/opt/miniforge3/lib/libiomp5.so /usr/lib/x86_64-linux-gnu/libtcmalloc.so" +ENV LD_LIBRARY_PATH="/opt/miniforge3/lib/python3.8/site-packages/lib/" \ No newline at end of file From 6215a4e959a4da8955c4ba8aa9974a4d0689cb5b Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Wed, 17 Jul 2024 10:27:34 -0700 Subject: [PATCH 04/15] simplified Dockerfile, remove build stages and conda --- docker/Dockerfile.intel | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel index a86387e3bf..b02802f15d 100644 --- a/docker/Dockerfile.intel +++ b/docker/Dockerfile.intel @@ -9,7 +9,12 @@ # https://docs.docker.com/develop/develop-images/build_enhancements/ ARG BASE_IMAGE=ubuntu:22.04 -FROM ${BASE_IMAGE} AS dev-base +FROM ${BASE_IMAGE} + +ENV http_proxy="http://proxy-dmz.intel.com:912" +ENV HTTP_PROXY="http://proxy-dmz.intel.com:912" +ENV https_proxy="http://proxy-dmz.intel.com:912" +ENV HTTPS_PROXY="http://proxy-dmz.intel.com:912" RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \ sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ ca-certificates \ @@ -24,39 +29,29 @@ RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \ libjpeg-dev \ pybind11-dev \ libpng-dev \ + python3 \ + python3-pip \ && rm -rf /var/lib/apt/lists/*" RUN /usr/sbin/update-ccache-symlinks RUN mkdir /opt/ccache && ccache --set-config=cache_dir=/opt/ccache -ENV PATH=/opt/miniforge3/bin:$PATH - -FROM dev-base AS conda -ARG PYTHON_VERSION=3.10 -RUN curl -fsSL -v -o ~/miniforge3.sh -O https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh && \ - chmod +x ~/miniforge3.sh && \ - ~/miniforge3.sh -b -p /opt/miniforge3 && \ - rm ~/miniforge3.sh && \ - /opt/miniforge3/bin/conda install -y python=${PYTHON_VERSION} conda-build pyyaml numpy ipython mkl mkl-include ninja cython typing pybind11 Pillow && \ - /opt/miniforge3/bin/conda clean -ya -FROM dev-base AS build ARG IPEX_VERSION=2.3.100 ARG PYTORCH_VERSION=2.3.1 ARG TORCHVISION_VERSION=0.18.1+cpu ARG TORCHAUDIO_VERSION=2.3.1+cpu -COPY --from=conda /opt/miniforge3 /opt/miniforge3 -RUN --mount=type=cache,target=/opt/ccache \ - python -m pip install --no-cache-dir torch==${PYTORCH_VERSION}+cpu torchvision==${TORCHVISION_VERSION} torchaudio==${TORCHAUDIO_VERSION} -f https://download.pytorch.org/whl/torch_stable.html && \ - python -m pip install intel-extension-for-pytorch==$IPEX_VERSION && \ - python -m pip install oneccl_bind_pt --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/cpu/us/ +RUN python3 -m pip install --no-cache-dir \ + torch==${PYTORCH_VERSION}+cpu \ + torchvision==${TORCHVISION_VERSION} \ + torchaudio==${TORCHAUDIO_VERSION} \ + -f https://download.pytorch.org/whl/torch_stable.html && \ + python3 -m pip install intel-extension-for-pytorch==$IPEX_VERSION && \ + python3 -m pip install oneccl_bind_pt --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/cpu/us/ -FROM dev-base AS dev -COPY --from=build /opt/miniforge3 /opt/miniforge3 ARG OMP_NUM_THREADS=1 ENV OMP_NUM_THREADS=${OMP_NUM_THREADS} ARG KMP_BLOCKTIME=1 ENV KMP_BLOCKTIME=${KMP_BLOCKTIME} ARG KMP_HW_SUBSET=1T ENV KMP_HW_SUBSET=${KMP_HW_SUBSET} -ENV LD_PRELOAD="/opt/miniforge3/lib/libiomp5.so /usr/lib/x86_64-linux-gnu/libtcmalloc.so" -ENV LD_LIBRARY_PATH="/opt/miniforge3/lib/python3.8/site-packages/lib/" \ No newline at end of file +ENV LD_PRELOAD="/usr/local/lib/libiomp5.so /usr/lib/x86_64-linux-gnu/libtcmalloc.so" \ No newline at end of file From 2dc75f7bedbcbd8ded7eb41f89ef43df256fdc93 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Wed, 17 Jul 2024 15:16:03 -0700 Subject: [PATCH 05/15] rm proxies --- docker/Dockerfile.intel | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel index b02802f15d..18ea2b60d1 100644 --- a/docker/Dockerfile.intel +++ b/docker/Dockerfile.intel @@ -11,10 +11,6 @@ ARG BASE_IMAGE=ubuntu:22.04 FROM ${BASE_IMAGE} -ENV http_proxy="http://proxy-dmz.intel.com:912" -ENV HTTP_PROXY="http://proxy-dmz.intel.com:912" -ENV https_proxy="http://proxy-dmz.intel.com:912" -ENV HTTPS_PROXY="http://proxy-dmz.intel.com:912" RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \ sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ ca-certificates \ From 138b1e4c6f508142cd9403c5a3fcdf6d0c7c154f Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Fri, 19 Jul 2024 11:32:22 -0700 Subject: [PATCH 06/15] add sanity test for docker build and run --- docker/sanity_test.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 docker/sanity_test.sh diff --git a/docker/sanity_test.sh b/docker/sanity_test.sh new file mode 100755 index 0000000000..8d2c38782c --- /dev/null +++ b/docker/sanity_test.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# # Define image name +IMAGE_NAME="myimage:latest" + +# Step 1: Build the Docker image +docker build -f Dockerfile.intel -t $IMAGE_NAME . + +# Check if the build was successful +if [ $? -ne 0 ]; then + echo "Docker image build failed." + exit 1 +fi + +# Step 2: Run a container from the built image in detached mode with an override command +CONTAINER_ID=$(docker run -d $IMAGE_NAME tail -f /dev/null) + +# Step 3: Check if the container is running +if docker inspect -f '{{.State.Running}}' $CONTAINER_ID 2>/dev/null | grep -q 'true'; then + echo "Container is running." +else + echo "Container failed to start." + docker logs $CONTAINER_ID 2>/dev/null || echo "No container ID found." + exit 1 +fi + +# Step 4: Clean up - stop and remove the container +docker stop $CONTAINER_ID +docker rm $CONTAINER_ID + +echo "Sanity test completed successfully." \ No newline at end of file From 0a553cf0a498f8f5bad16d52caa2213370017a00 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Mon, 22 Jul 2024 12:50:03 -0700 Subject: [PATCH 07/15] add dependency --- docker/Dockerfile.intel | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel index 18ea2b60d1..60fd51b424 100644 --- a/docker/Dockerfile.intel +++ b/docker/Dockerfile.intel @@ -37,6 +37,7 @@ ARG TORCHVISION_VERSION=0.18.1+cpu ARG TORCHAUDIO_VERSION=2.3.1+cpu RUN python3 -m pip install --no-cache-dir \ + intel-openmp \ torch==${PYTORCH_VERSION}+cpu \ torchvision==${TORCHVISION_VERSION} \ torchaudio==${TORCHAUDIO_VERSION} \ From 498731ce74a942d7ecbdd003ac1bbed13f488de0 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:10:01 -0700 Subject: [PATCH 08/15] add docker workflow --- .github/workflows/dockerfile_sanity.yml | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/dockerfile_sanity.yml diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml new file mode 100644 index 0000000000..1714e2ec0a --- /dev/null +++ b/.github/workflows/dockerfile_sanity.yml @@ -0,0 +1,39 @@ +name: Build and Test Docker Image + +on: + push: + paths: + - 'Dockerfile.intel' + branches: + - main + workflow_dispatch: + +jobs: + build_and_run: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Build and Run Docker Image + run: | + IMAGE_NAME="intel_image:latest" + docker build -f Dockerfile.intel -t $IMAGE_NAME . + if [ $? -ne 0 ]; then + echo "Docker image build failed." + exit 1 + fi + CONTAINER_ID=$(docker run -d $IMAGE_NAME tail -f /dev/null) + if docker inspect -f '{{.State.Running}}' $CONTAINER_ID 2>/dev/null | grep -q 'true'; then + echo "Container is running." + else + echo "Container failed to start." + docker logs $CONTAINER_ID 2>/dev/null || echo "No container ID found." + exit 1 + fi + docker stop $CONTAINER_ID + docker rm $CONTAINER_ID \ No newline at end of file From 2298a01ec0dce54473a6518266a532728c515210 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:18:09 -0700 Subject: [PATCH 09/15] fix version --- .github/workflows/dockerfile_sanity.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 1714e2ec0a..6b80933ca1 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -14,10 +14,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Build and Run Docker Image run: | From 437ef7d1ec418bc643b38dd38531383a13b0d319 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:20:47 -0700 Subject: [PATCH 10/15] fix version --- .github/workflows/dockerfile_sanity.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 6b80933ca1..1e11cad127 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -14,10 +14,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and Run Docker Image run: | From 34b378f83995ef3b09177aa155d5d71110e30ce4 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:35:48 -0700 Subject: [PATCH 11/15] path to dockerfile --- .github/workflows/dockerfile_sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 1e11cad127..97e0c5af95 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -22,7 +22,7 @@ jobs: - name: Build and Run Docker Image run: | IMAGE_NAME="intel_image:latest" - docker build -f Dockerfile.intel -t $IMAGE_NAME . + docker build -f docker/Dockerfile.intel -t $IMAGE_NAME . if [ $? -ne 0 ]; then echo "Docker image build failed." exit 1 From f69c2c6add740fc5b3febba251c0e1a2be599f72 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:42:25 -0700 Subject: [PATCH 12/15] remove sanity_test script and replaced with workflow --- docker/sanity_test.sh | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100755 docker/sanity_test.sh diff --git a/docker/sanity_test.sh b/docker/sanity_test.sh deleted file mode 100755 index 8d2c38782c..0000000000 --- a/docker/sanity_test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# # Define image name -IMAGE_NAME="myimage:latest" - -# Step 1: Build the Docker image -docker build -f Dockerfile.intel -t $IMAGE_NAME . - -# Check if the build was successful -if [ $? -ne 0 ]; then - echo "Docker image build failed." - exit 1 -fi - -# Step 2: Run a container from the built image in detached mode with an override command -CONTAINER_ID=$(docker run -d $IMAGE_NAME tail -f /dev/null) - -# Step 3: Check if the container is running -if docker inspect -f '{{.State.Running}}' $CONTAINER_ID 2>/dev/null | grep -q 'true'; then - echo "Container is running." -else - echo "Container failed to start." - docker logs $CONTAINER_ID 2>/dev/null || echo "No container ID found." - exit 1 -fi - -# Step 4: Clean up - stop and remove the container -docker stop $CONTAINER_ID -docker rm $CONTAINER_ID - -echo "Sanity test completed successfully." \ No newline at end of file From fb20a8ffa4d5e4eb66cf621335fc356db430b3a6 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Tue, 23 Jul 2024 10:44:08 -0700 Subject: [PATCH 13/15] remove workflow_dispatch for manual trigger --- .github/workflows/dockerfile_sanity.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 97e0c5af95..12d0cb30e0 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -6,7 +6,6 @@ on: - 'Dockerfile.intel' branches: - main - workflow_dispatch: jobs: build_and_run: From 5831d399e400d0db2ffed612825a9aefc2e4c6df Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Fri, 26 Jul 2024 08:54:33 -0700 Subject: [PATCH 14/15] Update .github/workflows/dockerfile_sanity.yml Co-authored-by: Ilyas Moutawwakil <57442720+IlyasMoutawwakil@users.noreply.github.com> --- .github/workflows/dockerfile_sanity.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 12d0cb30e0..8df14bd15b 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -2,10 +2,16 @@ name: Build and Test Docker Image on: push: + branches: + - main paths: - 'Dockerfile.intel' + + pull_request: branches: - main + paths: + - 'Dockerfile.intel' jobs: build_and_run: From 3a55cb4ce8e362428875371e61c2dc421cba36a2 Mon Sep 17 00:00:00 2001 From: rbrugaro Date: Mon, 29 Jul 2024 09:18:15 -0700 Subject: [PATCH 15/15] path to Dockerfile --- .github/workflows/dockerfile_sanity.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerfile_sanity.yml b/.github/workflows/dockerfile_sanity.yml index 8df14bd15b..12be9a5b15 100644 --- a/.github/workflows/dockerfile_sanity.yml +++ b/.github/workflows/dockerfile_sanity.yml @@ -5,13 +5,13 @@ on: branches: - main paths: - - 'Dockerfile.intel' + - 'docker/Dockerfile.intel' pull_request: branches: - main paths: - - 'Dockerfile.intel' + - 'docker/Dockerfile.intel' jobs: build_and_run: