Skip to content

Commit b974db4

Browse files
sharvil10sharvil10
committed
Merge remote-tracking branch 'origin/main' into sharvil10/gaudi-1.18-notebook
2 parents 9eaa133 + f56f8cc commit b974db4

36 files changed

+110
-87
lines changed

‎.github/scan/action.yml

-35
This file was deleted.

‎.github/workflows/container-ci.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,19 @@ jobs:
158158
# password: ${{ secrets.REGISTRY_TOKEN }}
159159
- name: Pull Image
160160
run: docker pull ${{ secrets.REGISTRY }}/${{ secrets.REPO }}:${{ matrix.container }}
161+
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
162+
with:
163+
path: ${{ github.workspace }}/.cache/trivy
164+
key: ${{ github.head_ref || github.ref_name }}-trivy
161165
- name: Scan Container
162-
uses: intel/ai-containers/.github/scan@main
166+
uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # v0.28.0
163167
with:
168+
cache: true
169+
format: sarif
170+
github-pat: ${{ secrets.GITHUB_TOKEN }}
164171
image-ref: ${{ secrets.REGISTRY }}/${{ secrets.REPO }}:${{ matrix.container }}
165172
output: ${{ matrix.container }}-scan.sarif
173+
timeout: 30m0s
166174
- name: Cleanup
167175
if: always()
168176
run: docker rmi -f ${{ secrets.REGISTRY }}/${{ secrets.REPO }}:${{ matrix.container }}

‎.github/workflows/integration-test.yaml

+12-14
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,22 @@ jobs:
8484
with:
8585
pattern: test-runner-summary*
8686
merge-multiple: true
87-
- name: Check for JSON files
87+
- name: Find Summary
88+
id: summary
8889
shell: bash
8990
run: |
90-
if [[ -n "$(find . -maxdepth 1 -name 'test-runner-summary*.json' -print -quit)" ]]; then
91-
echo "has_matching_json_files=true" >> "$GITHUB_OUTPUT"
92-
echo "Files matching the pattern test-runner-summary*.json found in the directory"
91+
SUMMARY=$(find . -maxdepth 1 -name '*summary.json' -print)
92+
if [[ -n "$SUMMARY" ]]; then
93+
echo "summary=true" >> $GITHUB_OUTPUT
94+
echo "Files matching the pattern ./*summary.json"
95+
jq -s '[.[] | .[]]' ./*summary.json > combined.json
96+
echo "Files found in the directory"
9397
else
94-
echo "has_matching_json_files=false" >> "$GITHUB_OUTPUT"
95-
echo "No files matching the pattern test-runner-summary*.json found in the directory"
98+
echo "summary=false" >> $GITHUB_OUTPUT
99+
echo "No files matching the pattern ./*summary.json"
96100
fi
97-
id: check_matching_json_files
98-
- name: Combine JSON files
99-
if: ${{ steps.check_matching_json_files.outputs.has_matching_json_files == 'true' }}
100-
run: |
101-
jq -s '[.[] | .[]]' *.json > combined.json
102-
echo "Files found in the directory"
103101
- name: Generate TXT file
104-
if: ${{ steps.check_matching_json_files.outputs.has_matching_json_files == 'true' }}
102+
if: ${{ steps.summary.outputs.summary != 'false' }}
105103
run: |
106104
{
107105
echo "### Integration Test Results"
@@ -119,7 +117,7 @@ jobs:
119117
fi
120118
} >> output.txt
121119
- name: PR-comment
122-
if: ${{ steps.check_matching_json_files.outputs.has_matching_json_files == 'true' }}
120+
if: ${{ steps.summary.outputs.summary != 'false' }}
123121
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
124122
with:
125123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-runner-ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
7575
with:
7676
egress-policy: audit
77-
- uses: coverallsapp/github-action@1134c89e4bf10443bf8f0ec69640b667cfd91041 # v2.3.1
77+
- uses: coverallsapp/github-action@4cdef0b2dbe0c9aa26bed48edb868db738625e79 # v2.3.3
7878
with:
7979
parallel-finished: true
8080
integration-test:

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ logs/
1414
models-perf/
1515
output/
1616
site
17-
test-runner-summary-output.json
1817
venv/

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repos:
1919
- hooks:
2020
- id: gitleaks
2121
repo: https://github.com/gitleaks/gitleaks
22-
rev: v8.20.1
22+
rev: v8.21.1
2323
- hooks:
2424
- args: [--license-filepath=.github/license_template.txt, --use-current-year, --detect-license-in-X-top-lines=40, --skip-license-insertion-comment=Copyright]
2525
files: |

‎classical-ml/jupyter-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jupyterlab==4.2.5
2-
jupyterhub==5.2.0
2+
jupyterhub==5.2.1
33
notebook==7.2.2
44
jupyter-server-proxy>=4.1.2

‎docs/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mkdocs-callouts>=1.13.2
22
mkdocs-git-authors-plugin>=0.8.0
33
mkdocs-git-revision-date-localized-plugin>=1.2.5
4-
mkdocs-material==9.5.40
4+
mkdocs-material==9.5.42
55
mkdocs-table-reader-plugin>=2.1.0
66
mkdocs==1.6.1
77
pandas>=2.0.3

‎jax/README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ The images below include [JAX\*] and [Intel® Extension for OpenXLA\*].
88

99
| Tag(s) | [JAX\*] | [Intel® Extension for OpenXLA\*] | [Flax] | Dockerfile |
1010
| -------------------------- | --------- | -------------------------------- | -------- | --------------- |
11-
| `0.4.0-pip-base`, `latest` | [v0.4.32] | [v0.4.0-jax] | [v0.9.0] | [v0.4.0] |
11+
| `0.4.0-pip-base`, `latest` | [v0.4.26] | [v0.4.0-jax] | [v0.8.2] | [v0.4.1] |
1212

1313
The images below additionally include [Jupyter Notebook](https://jupyter.org/) server:
1414

1515
| Tag(s) | [JAX\*] | [Intel® Extension for OpenXLA\*] | [Flax] | Dockerfile |
1616
| ------------------- | --------- | ----------------- | -------- | --------------- |
17-
| `0.4.0-pip-jupyter` | [v0.4.32] | [v0.4.0-jax] | [v0.9.0] | [v0.4.0] |
17+
| `0.4.0-pip-jupyter` | [v0.4.26] | [v0.4.0-jax] | [v0.8.2] | [v0.4.1] |
1818

1919
### Run the Jupyter Container
2020

@@ -35,13 +35,13 @@ The images below include [Intel® Distribution for Python*]:
3535

3636
| Tag(s) | [JAX\*] | [Intel® Extension for OpenXLA\*] | [Flax] | Dockerfile |
3737
| ---------------- | --------- | ----------------- | -------- | --------------- |
38-
| `0.4.0-idp-base` | [v0.4.32] | [v0.4.0-jax] | [v0.9.0] | [v0.4.0] |
38+
| `0.4.0-idp-base` | [v0.4.26] | [v0.4.0-jax] | [v0.8.2] | [v0.4.1] |
3939

4040
The images below additionally include [Jupyter Notebook](https://jupyter.org/) server:
4141

4242
| Tag(s) | [JAX\*] | [Intel® Extension for OpenXLA\*] | [Flax] | Dockerfile |
4343
| ------------------- | --------- | ----------------- | -------- | --------------- |
44-
| `0.4.0-idp-jupyter` | [v0.4.32] | [v0.4.0-jax] | [v0.9.0] | [v0.4.0] |
44+
| `0.4.0-idp-jupyter` | [v0.4.26] | [v0.4.0-jax] | [v0.8.2] | [v0.4.1] |
4545

4646
## Build from Source
4747

@@ -77,10 +77,10 @@ It is the image user's responsibility to ensure that any use of The images below
7777
[JAX\*]: https://github.com/google/jax
7878
[Flax]: https://github.com/google/flax
7979

80-
[v0.4.32]: https://github.com/google/jax/releases/tag/jax-v0.4.32
80+
[v0.4.26]: https://github.com/google/jax/releases/tag/jax-v0.4.26
8181

8282
[v0.4.0-jax]: https://github.com/intel/intel-extension-for-openxla/releases/tag/0.4.0
8383

84-
[v0.9.0]: https://github.com/google/Flax/releases/tag/v0.9.0
84+
[v0.8.2]: https://github.com/google/Flax/releases/tag/v0.8.2
8585

86-
[v0.4.0]: https://github.com/intel/ai-containers/blob/v0.4.0/jax/Dockerfile
86+
[v0.4.1]: https://github.com/intel/ai-containers/blob/main/jax/Dockerfile

‎python/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy==1.26.4
22
setuptools>=70.0.0
3-
psutil==6.0.0
3+
psutil==6.1.0
44
mkl==2024.2.2
55
mkl-include==2024.2.2
66
intel-openmp==2024.2.1

‎pytorch/jupyter-requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
jupyterlab==4.3.0b2
2-
jupyterhub==5.2.0
3-
notebook==7.3.0a1
1+
jupyterlab==4.3.0rc0
2+
jupyterhub==5.2.1
3+
notebook==7.3.0b0
44
jupyter-server-proxy>=4.1.2

‎pytorch/venv-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools>=70.0.0
2-
psutil==6.0.0
2+
psutil==6.1.0
33
mkl==2024.2.2
44
mkl-include==2024.2.2
55
intel-openmp==2024.2.1

‎tensorflow/jupyter-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jupyterlab>=4.2.4
2-
jupyterhub==5.2.0
2+
jupyterhub==5.2.1
33
notebook>=7.1.3
44
jupyter-server-proxy>=4.1.2

‎tensorflow/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tensorflow==2.15.1
22
intel-extension-for-tensorflow[cpu]>=2.15,<2.16
33
tensorflow-hub==0.16.1
4-
pillow==10.4.0
4+
pillow==11.0.0

‎tensorflow/serving/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
numpy==2.1.2
2-
pillow==10.4.0
2+
pillow==11.0.0
33
requests==2.32.3
44
tensorflow==2.17.0
55
tensorflow-serving-api==2.17.0

‎test-runner/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ runs:
8181
if: always()
8282
with:
8383
name: test-runner-summary ${{ env.test }}
84-
path: test-runner-summary*.json
84+
path: ${{ inputs.test_dir }}/logs/*summary.json
8585
overwrite: true

‎test-runner/test_runner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def get_test_list(args: dict, tests_yaml: List[dict]):
206206
break
207207
summary.append([idx + 1, test.name, "PASS"])
208208
json_summary.append({"Group": test_group, "Test": test.name, "Status": "PASS"})
209-
json_summary_path = f"test-runner-summary-{test_group}.json"
209+
json_summary_path = f"{args.logs_path}/{test_group.replace('/', '-')}-summary.json"
210210

211211
with open(json_summary_path, "w", encoding="utf-8") as file:
212212
json.dump(json_summary, file, indent=4)

‎workflows/charts/tensorflow-serving/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
apiVersion: v2
16-
name: tensorflow-serving-on-intel
16+
name: tensorflow-serving
1717
description: TensorFlow Serving is a flexible, high-performance serving system for machine learning models, designed for production environments. TensorFlow Serving makes it easy to deploy new algorithms and experiments, while keeping the same server architecture and APIs. TensorFlow Serving provides out-of-the-box integration with TensorFlow models, but can be easily extended to serve other types of models and data.
1818

1919
# A chart can be either an 'application' or a 'library' chart.

‎workflows/charts/tensorflow-serving/README.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
# tensorflow-serving-on-intel
1+
# TensorFlow Serving on Intel GPU
2+
3+
TensorFlow Serving is a flexible, high-performance serving system for machine learning models, designed for production environments. TensorFlow Serving makes it easy to deploy new algorithms and experiments, while keeping the same server architecture and APIs. TensorFlow Serving provides out-of-the-box integration with TensorFlow models, but can be easily extended to serve other types of models and data.
24

35
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
46

5-
TensorFlow Serving is a flexible, high-performance serving system for machine learning models, designed for production environments. TensorFlow Serving makes it easy to deploy new algorithms and experiments, while keeping the same server architecture and APIs. TensorFlow Serving provides out-of-the-box integration with TensorFlow models, but can be easily extended to serve other types of models and data.
7+
## Installation
68

7-
## Maintainers
9+
```bash
10+
helm repo add intel https://intel.github.io/helm-charts
11+
helm install my-tgi intel/text-generation-inference
12+
```
813

9-
| Name | Email | Url |
10-
| ---- | ------ | --- |
11-
| tylertitsworth | <tyler.titsworth@intel.com> | <https://github.com/tylertitsworth> |
14+
Then, follow the installation notes to test the deployment
1215

1316
## Values
1417

‎workflows/charts/tensorflow-serving/README.md.gotmpl

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# TensorFlow Serving on Intel GPU
2+
3+
{{ template "chart.description" . }}
4+
5+
{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
6+
7+
## Installation
8+
9+
```bash
10+
helm repo add intel https://intel.github.io/helm-charts
11+
helm install my-tgi intel/text-generation-inference
12+
```
13+
14+
Then, follow the installation notes to test the deployment
15+
16+
{{ template "chart.valuesSection" . }}
17+
18+
{{ template "helm-docs.versionFooter" . }}

‎workflows/charts/tgi/.helmignore ‎workflows/charts/text-generation-inference/.helmignore

File renamed without changes.

‎workflows/charts/tgi/Chart.yaml ‎workflows/charts/text-generation-inference/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
apiVersion: v2
16-
name: tgi-on-intel
16+
name: text-generation-inference
1717
description: A Rust, Python and gRPC server for text generation inference by huggingface on Intel GPUs.
1818

1919
# A chart can be either an 'application' or a 'library' chart.

‎workflows/charts/tgi/README.md ‎workflows/charts/text-generation-inference/README.md

+9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ For more information about how to use Huggingface text-generation-inference with
99
1010
![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
1111

12+
## Installation
13+
14+
```bash
15+
helm repo add intel https://intel.github.io/helm-charts
16+
helm install my-tgi intel/text-generation-inference
17+
```
18+
19+
Then, follow the installation notes to test the deployment
20+
1221
## Values
1322

1423
| Key | Type | Default | Description |

‎workflows/charts/tgi/README.md.gotmpl ‎workflows/charts/text-generation-inference/README.md.gotmpl

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ For more information about how to use Huggingface text-generation-inference with
99

1010
{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
1111

12-
{{ template "chart.requirementsSection" . }}
12+
## Installation
13+
14+
```bash
15+
helm repo add intel https://intel.github.io/helm-charts
16+
helm install my-tgi intel/text-generation-inference
17+
```
18+
19+
Then, follow the installation notes to test the deployment
1320

1421
{{ template "chart.valuesSection" . }}
1522

‎workflows/charts/tgi/templates/NOTES.txt ‎workflows/charts/text-generation-inference/templates/NOTES.txt

File renamed without changes.

‎workflows/charts/tgi/templates/_helpers.tpl ‎workflows/charts/text-generation-inference/templates/_helpers.tpl

File renamed without changes.

‎workflows/charts/tgi/templates/deploy.yaml ‎workflows/charts/text-generation-inference/templates/deploy.yaml

File renamed without changes.

‎workflows/charts/tgi/templates/ingress.yaml ‎workflows/charts/text-generation-inference/templates/ingress.yaml

File renamed without changes.

‎workflows/charts/tgi/templates/pvc.yaml ‎workflows/charts/text-generation-inference/templates/pvc.yaml

File renamed without changes.

‎workflows/charts/tgi/templates/secret.yaml ‎workflows/charts/text-generation-inference/templates/secret.yaml

File renamed without changes.

‎workflows/charts/tgi/templates/service.yaml ‎workflows/charts/text-generation-inference/templates/service.yaml

File renamed without changes.

‎workflows/charts/tgi/templates/tests/test-connection.yaml ‎workflows/charts/text-generation-inference/templates/tests/test-connection.yaml

File renamed without changes.

‎workflows/charts/tgi/values.yaml ‎workflows/charts/text-generation-inference/values.yaml

File renamed without changes.

‎workflows/charts/torchserve/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# limitations under the License.
1414

1515
apiVersion: v2
16-
name: torchserve-on-intel
17-
description: TorchServe on Intel is a performant, flexible and easy to use tool for serving PyTorch models in production.
16+
name: torchserve
17+
description: TorchServe is a performant, flexible and easy to use tool for serving PyTorch models in production on Intel GPUs.
1818

1919
# A chart can be either an 'application' or a 'library' chart.
2020
#

‎workflows/charts/torchserve/README.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
# TorchServe with Intel Optimizations
22

3-
TorchServe on Intel is a performant, flexible and easy to use tool for serving PyTorch models in production.
3+
TorchServe is a performant, flexible and easy to use tool for serving PyTorch models in production on Intel GPUs.
44

5-
For more information about how to use TorchServe with Intel Optimizations, check out the [container documentation](../../../pytorch/serving/README.md).
5+
For more information about how to use TorchServe with Intel Optimizations, check out the [container documentation](https://github.com/intel/ai-containers/blob/main/pytorch/serving/README.md).
66

77
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
88

9+
## Installation
10+
11+
```bash
12+
helm repo add intel https://intel.github.io/helm-charts
13+
helm install my-tgi intel/text-generation-inference
14+
```
15+
16+
Then, follow the installation notes to test the deployment
17+
918
## Values
1019

1120
| Key | Type | Default | Description |

‎workflows/charts/torchserve/README.md.gotmpl

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22

33
{{ template "chart.description" . }}
44

5-
For more information about how to use TorchServe with Intel Optimizations, check out the [container documentation](../../../pytorch/serving/README.md).
5+
For more information about how to use TorchServe with Intel Optimizations, check out the [container documentation](https://github.com/intel/ai-containers/blob/main/pytorch/serving/README.md).
66

77
{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
88

9-
{{ template "chart.requirementsSection" . }}
9+
## Installation
10+
11+
```bash
12+
helm repo add intel https://intel.github.io/helm-charts
13+
helm install my-tgi intel/text-generation-inference
14+
```
15+
16+
Then, follow the installation notes to test the deployment
1017

1118
{{ template "chart.valuesSection" . }}
1219

0 commit comments

Comments
 (0)