Skip to content

Commit 4b9065c

Browse files
author
Tyler Titsworth
authored
Merge branch 'main' into tylertitsworth/perf-sample-ex
Signed-off-by: Tyler Titsworth <tyler.titsworth@intel.com>
2 parents f1d7cfa + ecdeddb commit 4b9065c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1295
-372
lines changed

‎.github/workflows/container-ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
- name: Cleanup
156156
if: always()
157157
run: docker rmi -f ${{ secrets.REGISTRY }}/${{ secrets.REPO }}:${{ matrix.container }}
158-
- uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
158+
- uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
159159
with:
160160
sarif_file: '${{ matrix.container }}-scan.sarif'
161161
category: '${{ matrix.container }}'

‎.github/workflows/scorecard.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353
name: SARIF file
5454
path: results.sarif
5555
retention-days: 5
56-
- uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
56+
- uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
5757
with:
5858
sarif_file: results.sarif

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22

3-
Thank you for considering contributing to Intel® AI Containers! We welcome your help to make this project better. Contributing to an open source project can be a daunting task, but the Intel AI Containers team is here to help you through the process. If at any point in this process you feel out of your depth or confused by our processes, please don't hesitate to reach out to a maintainer or file an [issue](https://github.com/intel/ai-containers/issues).
3+
Thank you for considering contributing to AI Containers! We welcome your help to make this project better. Contributing to an open source project can be a daunting task, but the Intel AI Containers team is here to help you through the process. If at any point in this process you feel out of your depth or confused by our processes, please don't hesitate to reach out to a maintainer or file an [issue](https://github.com/intel/ai-containers/issues).
44

55
## Getting Started
66

@@ -138,4 +138,4 @@ commit automatically with `git commit -s`.
138138

139139
## License
140140

141-
Intel® AI Containers is licensed under the terms in [LICENSE](./LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms.
141+
AI Containers is licensed under the terms in [LICENSE](./LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Intel® AI Containers
1+
# AI Containers
22

33
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8270/badge)](https://www.bestpractices.dev/projects/8270)
44
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/intel/ai-containers/badge)](https://securityscorecards.dev/viewer/?uri=github.com/intel/ai-containers)
@@ -28,7 +28,7 @@ docker login $REGISTRY
2828
docker pull $REGISTRY/$REPO:latest
2929
```
3030

31-
The maintainers of Intel® AI Containers use Azure to store containers, but an open source container registry like [harbor](https://github.com/goharbor/harbor) is preferred.
31+
The maintainers of AI Containers use Azure to store containers, but an open source container registry like [harbor](https://github.com/goharbor/harbor) is preferred.
3232

3333
> [!WARNING]
3434
> You can optionally skip this step and use some placeholder values, however some container groups depend on other images and will pull from a registry that you have not defined and result in an error.

‎apptainer/python/requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
numpy==2.0.1
2-
setuptools==72.1.0
1+
numpy==2.1.0
2+
setuptools==73.0.1
33
psutil==6.0.0
4-
mkl==2024.2.0
5-
mkl-include==2024.2.0
6-
intel-openmp==2024.2.0
4+
mkl==2024.2.1
5+
mkl-include==2024.2.1
6+
intel-openmp==2024.2.1

‎classical-ml/README.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ The images below include [Intel® Extension for Scikit-learn*] and [XGBoost*].
1010

1111
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
1212
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
13-
| `2024.5.0-pip-base`, `latest` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
13+
| `2024.6.0-pip-base`, `latest` | [v2024.6.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
14+
| `2024.5.0-pip-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
1415
| `2024.3.0-pip-base` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
1516
| `2024.2.0-xgboost-2.0.3-pip-base` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
1617
| `scikit-learning-2024.0.0-xgboost-2.0.2-pip-base` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |
@@ -19,6 +20,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s
1920

2021
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
2122
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
23+
| `2024.6.0-pip-jupyter` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
2224
| `2024.5.0-pip-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
2325
| `2024.3.0-pip-jupyter` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
2426
| `2024.2.0-xgboost-2.0.3-pip-jupyter` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
@@ -43,21 +45,25 @@ The images below include [Intel® Distribution for Python*]:
4345

4446
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
4547
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
46-
| `2024.3.0-idp-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
48+
| `2024.6.0-idp-base` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
49+
| `2024.5.0-idp-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
50+
| `2024.3.0-idp-base` | [v2024.3.0] | [v1.4.1] | [v2.1.0] | [v0.4.0] |
4751
| `2024.2.0-xgboost-2.0.3-idp-base` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
4852
| `scikit-learning-2024.0.0-xgboost-2.0.2-idp-base` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |
4953

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

5256
| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
5357
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
54-
| `2024.3.0-idp-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
58+
| `2024.6.0-idp-jupyter` | [v2024.6.0] | [v1.5.1] | [v2.1.1] | [v0.4.0] |
59+
| `2024.5.0-idp-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
60+
| `2024.3.0-idp-jupyter` | [v2024.3.0] | [v1.4.0] | [v2.1.0] | [v0.4.0] |
5561
| `2024.2.0-xgboost-2.0.3-idp-jupyter` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
5662
| `scikit-learning-2024.0.0-xgboost-2.0.2-idp-jupyter` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |
5763

5864
## Build from Source
5965

60-
To build the images from source, clone the [Intel® AI Containers](https://github.com/intel/ai-containers) repository, follow the main `README.md` file to setup your environment, and run the following command:
66+
To build the images from source, clone the [AI Containers](https://github.com/intel/ai-containers) repository, follow the main `README.md` file to setup your environment, and run the following command:
6167

6268
```bash
6369
cd classical-ml
@@ -89,16 +95,19 @@ It is the image user's responsibility to ensure that any use of The images below
8995
[Scikit-learn*]: https://scikit-learn.org/stable/
9096
[XGBoost*]: https://github.com/dmlc/xgboost
9197

98+
[v2024.6.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.6.0
9299
[v2024.5.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.5.0
93100
[v2024.3.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.3.0
94101
[v2024.2.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.2.0
95102
[v2024.0.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.0.0
96103

104+
[v1.5.1]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.1
97105
[v1.5.0]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.0
98106
[v1.4.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.2
99107
[v1.4.1]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.1
100108
[v1.3.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.3.2
101109

110+
[v2.1.1]: https://github.com/dmlc/xgboost/releases/tag/v2.1.1
102111
[v2.1.0]: https://github.com/dmlc/xgboost/releases/tag/v2.1.0
103112
[v2.0.3]: https://github.com/dmlc/xgboost/releases/tag/v2.0.3
104113
[v2.0.2]: https://github.com/dmlc/xgboost/releases/tag/v2.0.2

‎classical-ml/docker-compose.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ services:
4040
org.opencontainers.base.name: "intel/python:3.10-core"
4141
org.opencontainers.image.name: "intel/intel-optimized-ml"
4242
org.opencontainers.image.title: "Intel® Optimized ML Base Image"
43-
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.4.0}-${PACKAGE_OPTION:-pip}-base
43+
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.6.0}-${PACKAGE_OPTION:-pip}-base
4444
target: ml-base-${PACKAGE_OPTION:-pip}
4545
command: >
4646
bash -c "python -c 'import sklearnex, sklearn; import xgboost as xgb; print(\"Scikit version:\", sklearn.__version__, \"\\nXGBoost version:\", xgb.__version__)'"
4747
depends_on:
4848
- ${PACKAGE_OPTION:-pip}
49-
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
49+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SKLEARN_VERSION:-2024.6.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
5050
pull_policy: always
5151
jupyter:
5252
build:
5353
labels:
5454
dependency.python.pip: jupyter-requirements.txt
55-
org.opencontainers.base.name: "intel/intel-optimized-ml:${SKLEARN_VERSION:-2024.4.0}-${PACKAGE_OPTION:-pip}-base"
55+
org.opencontainers.base.name: "intel/intel-optimized-ml:${SKLEARN_VERSION:-2024.6.0}-${PACKAGE_OPTION:-pip}-base"
5656
org.opencontainers.image.title: "Intel® Optimized ML Jupyter Base Image"
57-
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.4.0}-${PACKAGE_OPTION:-pip}-jupyter
57+
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.6.0}-${PACKAGE_OPTION:-pip}-jupyter
5858
target: jupyter
5959
command: >
6060
bash -c "python -m jupyter --version"
6161
environment:
6262
http_proxy: ${http_proxy}
6363
https_proxy: ${https_proxy}
6464
extends: ml-base
65-
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
65+
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SKLEARN_VERSION:-2024.6.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
6666
network_mode: host

‎classical-ml/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
daal4py==2024.6.0
2-
matplotlib==3.9.1.post1
2+
matplotlib==3.9.2
33
numpy==1.26.4
44
scikit-learn-intelex==2024.6.0
55
threadpoolctl==3.5.0

‎classical-ml/tests/tests.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
---
1616
classical-ml-import-${PACKAGE_OPTION:-pip}:
17-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
17+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SKLEARN_VERSION:-2024.6.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
1818
cmd: python -c "from sklearnex import patch_sklearn; patch_sklearn();import xgboost as xgb; print(xgb.__version__)"
1919
classical-ml-import-${PACKAGE_OPTION:-pip}-jupyter:
20-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
20+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SKLEARN_VERSION:-2024.6.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
2121
cmd: sh -c "python -m jupyter --version"
2222
classical-ml-performance-${PACKAGE_OPTION:-pip}:
23-
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
23+
img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SKLEARN_VERSION:-2024.6.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
2424
cmd: python /tests/performance.py
2525
volumes:
2626
- src: $PWD/classical-ml/tests

‎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.31
4+
mkdocs-material==9.5.33
55
mkdocs-table-reader-plugin>=2.1.0
66
mkdocs==1.6.0
77
pandas>=2.0.3

‎mkdocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ plugins:
5151
- read_csv
5252
repo_name: intel/ai-containers
5353
repo_url: https://github.com/intel/ai-containers
54-
site_name: Intel® AI Containers
54+
site_name: AI Containers
5555
#TODO: Get previous container versions in an easy way
5656
# https://squidfunk.github.io/mkdocs-material/setup/setting-up-versioning/
5757
theme:

‎preset/inference-optimization/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ dataset-librarian==1.0.4
22
evaluate==0.4.2
33
git+https://github.com/huggingface/optimum-intel.git
44
tf2onnx==1.16.1
5-
onnxruntime==1.18.1
5+
onnxruntime==1.19.0

‎python/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ python /tests/perf_sample.py
4040

4141
## Build from Source (Advanced)
4242

43-
To build the images from source, clone the [Intel® AI Containers](https://github.com/intel/ai-containers) repository, follow the main `README.md` file to setup your environment, and run the following commands:
43+
To build the images from source, clone the [AI Containers](https://github.com/intel/ai-containers) repository, follow the main `README.md` file to setup your environment, and run the following command:
4444

4545
```bash
4646
cd python

0 commit comments

Comments
 (0)