Skip to content

Commit 7b8b19b

Browse files
author
Tyler Titsworth
authored
Update Intel Optimized ML Docs (#313)
Signed-off-by: tylertitsworth <tyler.titsworth@intel.com>
1 parent 14fa971 commit 7b8b19b

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

classical-ml/README.md

+12-3
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,15 +45,19 @@ 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

@@ -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/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

0 commit comments

Comments
 (0)