Revert "r0.3.3 (#2)"

This reverts commit af9b519.

.github/pull_request_template.md

@@ -15,7 +15,6 @@
 <!-- Explain how the changes have been tested, including the testing environment and any relevant test cases. -->
 
 - [ ] I have tested any changes in container groups locally with `/test-runner/test_runner.py` with all existing tests passing, and I have added new tests where necessary.
-
-### Automated Testing
-
-Leave a PR comment in the following format: `/test-group group_dir: <my-container-group>, runner_label: <my-runner-label>` to run automated tests.
+- [ ] Automated Validation (Do not edit, check to begin Validation)
+
+command: /test-group group_dir: my-container-group, runner_label: test-runner

.github/workflows/bandit.yaml

@@ -3,8 +3,6 @@ on:
   pull_request_review:
     types: [submitted]
 
-permissions: read-all
-
 jobs:
   scan-bandit:
     if: github.event.review.state == 'approved'

.github/workflows/checkbox-trigger.yml

@@ -0,0 +1,101 @@
+---
+name: Checkbox Pipeline Validation
+on:
+  pull_request:
+    types: [edited]
+jobs:
+  check-description-checkbox:
+    runs-on: [ k8-runners ]
+    if: contains(github.event.pull_request.body, '- [x] Automated Validation (Do not edit, check to begin Validation)') && contains(github.event.pull_request.body, '/test-group') && !contains(github.event.pull_request.labels.*.name, 'validating')
+    outputs:
+      group_dir: ${{ steps.comment-inputs.outputs.group_dir }}
+      env_overrides: ${{ steps.comment-inputs.outputs.env_overrides }}
+      runner_label: ${{ steps.comment-inputs.outputs.runner_label }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get Inputs
+        id: comment-inputs
+        run: bash .github/utils/val-args.sh "${{ github.event.pull_request.body }}"
+      - name: Remove PASS Label
+        if: contains(github.event.pull_request.labels.*.name, 'PASS')
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: ["PASS"]
+            })
+      - name: Remove FAIL Label
+        if: contains(github.event.pull_request.labels.*.name, 'FAIL')
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: ["FAIL"]
+            })
+      - name: Lock
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['validating']
+            })
+  container-pipeline-tester:
+      needs: [ check-description-checkbox ]
+      if: needs.check-description-checkbox.outputs.group_dir && needs.check-description-checkbox.outputs.runner_label
+      uses: ./.github/workflows/container-pipeline-tester.yaml
+      with:
+        group_dir: ${{ needs.check-description-checkbox.outputs.group_dir }}
+        env_overrides: ${{ needs.check-description-checkbox.outputs.env_overrides || '' }}
+        runner_label: ${{ needs.check-description-checkbox.outputs.runner_label }}
+      secrets: inherit
+  status-check:
+    needs: [ check-description-checkbox, container-pipeline-tester ]
+    if: ${{ always() && needs.check-description-checkbox.result != 'skipped' }}
+    runs-on: [ k8-runners ]
+    steps:
+      - name: Unlock
+        if: ${{ needs.check-description-checkbox.result != 'skipped' }}
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: ["validating"]
+            })
+      - name: Set Fail Label
+        if: ${{ needs.check-description-checkbox.result != 'success' || needs.container-pipeline-tester.result != 'success' }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['FAIL']
+            })
+      - name: Set Pass Label
+        if: ${{ needs.check-description-checkbox.result == 'success' && needs.container-pipeline-tester.result == 'success' }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['PASS']
+            })
+            

.github/workflows/container-pipeline-tester.yaml

@@ -1,7 +1,4 @@
 name: Container Pipeline Tester
-
-permissions: read-all
-
 on:
   workflow_dispatch:
     inputs:
@@ -92,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get Recipes
         id: recipes
-        run: echo "RECIPES=$(find ${{ inputs.group_dir }} -type f -name 'tests.yaml' -exec dirname {} \; | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+        run: echo "RECIPES=$(find ${{ inputs.group_dir }} -type f -name 'tests.yaml' -exec dirname {} \; | awk -F/ '{print $NF}' | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
   test-containers:
     needs: [ setup-test ]
     if: ${{ needs.setup-test.outputs.recipes != '[]' }}
@@ -114,5 +111,5 @@ jobs:
         with:
           mlops_repo: ${{ vars.MLOPS_REPO }}
           registry: ${{ vars.REGISTRY }}
-          test_dir: ${{ matrix.recipe }}
+          test_dir: ${{ inputs.group_dir }}/${{ matrix.recipe }}
           token: ${{ github.token }}

.github/workflows/dockerfile-builder.yml

@@ -1,7 +1,4 @@
 name: Dockerfile Builder
-
-permissions: read-all
-
 on: 
   workflow_dispatch:
 

.github/workflows/review-trigger.yml

@@ -3,22 +3,6 @@ name: Review Pipeline Validation
 on:
   pull_request_review:
     types: [submitted, edited]
-
-permissions:
-  actions: read
-  checks: read
-  contents: read
-  deployments: read
-  discussions: read
-  id-token: write
-  issues: read
-  packages: read
-  pages: read
-  pull-requests: write
-  repository-projects: read
-  security-events: read
-  statuses: read
-
 jobs:
   check-review:
     runs-on: [ k8-runners ]

.github/workflows/serving-mkl-build.yaml

@@ -0,0 +1,94 @@
+name: Tensorflow Serving Container Build
+on: 
+  workflow_dispatch:
+    inputs:
+      base_image_tag:
+        default: "20.04"
+        required: false
+        type: string
+      bazel_version:
+        default: "5.4.0"
+        required: false
+        type: string
+      tf_package_version:
+        default: "2.12.0"
+        required: false
+        type: string
+      tf_bazel_options:
+        default: "--local_ram_resources=HOST_RAM*0.8 --local_cpu_resources=HOST_CPUS-4"
+        required: true
+        type: string
+      tf_serving_build_options:
+        description: "Build Option excluding '--copt-=march='"
+        default: "--config=mkl --config=release --define=build_with_openmp=false"
+        required: true
+        type: string
+      other_version: 
+        required: false
+        type: string
+
+jobs:
+  base-build:
+    container:
+      image: ${{ vars.REGISTRY }}/aiops/compose-dev
+      env:
+        http_proxy: ${{ secrets.HTTP_PROXY }}
+        https_proxy: ${{ secrets.HTTPS_PROXY }}
+        no_proxy: ${{ secrets.NO_PROXY }}
+      credentials:
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+    strategy:
+      matrix:
+        tf_package: ["intel-tensorflow", "intel-tensorflow-avx512"]
+        experimental: [ true ]
+      fail-fast: false
+    runs-on: [ aia-devops ]
+    steps: 
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+        set-safe-directory: true
+    - uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.HUB_USER }}
+        password: ${{ secrets.HUB_TOKEN }}
+    - uses: docker/login-action@v3
+      with:
+        registry: ${{ vars.REGISTRY }}
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+    - name: Remove Containers
+      run: docker compose down
+      working-directory: tensorflow
+    - if: matrix.tf_package == "intel-tensorflow-avx512"
+      name: Build Framework Ingredient Containers
+      run: |
+        BASE_IMAGE_TAG=${{ github.event.inputs.base_image_tag }} \
+        BAZEL_VERSION=${{ github.event.inputs.bazel_version }} \
+        REGISTRY=${{ vars.REGISTRY }} \
+        TF_PACKAGE=${{ matrix.tf_package }} \
+        TF_SERVING_BAZEL_OPTIONS=${{ github.event.inputs.tf_bazel_options }} \
+        TF_SERVING_BUILD_OPTION="${{ github.event.inputs.tf_serving_build_options }} --copt=-march=skylake-avx512" \
+        TF_SERVING_VERSION=${{ github.event.inputs.tf_package_version }} \
+        ${{ github.event.input.other_version }} docker compose -f docker-compose-serving.yaml build --no-cache
+      working-directory: tensorflow
+    - if: matrix.tf_package == "intel-tensorflow"
+      name: Build Framework Ingredient Containers
+      run: |
+        BASE_IMAGE_TAG=${{ github.event.inputs.base_image_tag }} \
+        BAZEL_VERSION=${{ github.event.inputs.bazel_version }} \
+        TF_PACKAGE=${{ matrix.tf_package }} \
+        TF_SERVING_BAZEL_OPTIONS=${{ github.event.inputs.tf_bazel_options }} \
+        TF_SERVING_BUILD_OPTION="${{ github.event.inputs.tf_serving_build_options }} --copt=-march=native" \
+        TF_SERVING_VERSION=${{ github.event.inputs.tf_package_version }} \
+        ${{ github.event.input.other_version }} docker compose -f docker-compose-serving.yaml build --no-cache
+      working-directory: tensorflow
+    - name: Push Framework Ingredient Containers
+      run: |
+        BASE_IMAGE_TAG=${{ github.event.inputs.base_image_tag }} \
+        TF_PACKAGE=${{ matrix.tf_package }} \
+        TF_SERVING_VERSION=${{ github.event.inputs.tf_package_version }} \
+        ${{ github.event.input.other_version }} docker compose -f docker-compose-serving.yaml push serving-mkl
+      working-directory: tensorflow
+

.github/workflows/unit-test.yaml

@@ -4,8 +4,6 @@ on:
     branches:
       - develop
 
-permissions: read-all
-
 jobs:
   unit-test:
     runs-on: [ test-runner ]

README.md

@@ -1,5 +1,4 @@
 # Intel® AI Containers
-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8270/badge)](https://www.bestpractices.dev/projects/8270)
 
 This repository contains Dockerfiles, scripts, yaml files, Helm charts, etc. used to scale out AI containers with versions of TensorFlow and PyTorch that have been optimized for Intel platforms. Scaling is done with python, Docker, kubernetes, kubeflow, cnvrg.io, Helm, and other container orchestration frameworks for use in the cloud and on-premise.