Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions classical-ml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ The images below include [Intel® Extension for Scikit-learn*] and [XGBoost*].

| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
| `2024.3.0-pip-base`, `latest` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.2.0-xgboost-2.0.3-pip-base`, `latest` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.5.0-pip-base`, `latest` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
| `2024.3.0-pip-base` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.2.0-xgboost-2.0.3-pip-base` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
| `scikit-learning-2024.0.0-xgboost-2.0.2-pip-base` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |

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

| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
| `2024.5.0-pip-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
| `2024.3.0-pip-jupyter` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.2.0-xgboost-2.0.3-pip-jupyter` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
| `scikit-learning-2024.0.0-xgboost-2.0.2-pip-jupyter` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |
Expand All @@ -41,15 +43,15 @@ The images below include [Intel® Distribution for Python*]:

| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
| ------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
| `2024.3.0-idp-base` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.3.0-idp-base` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
| `2024.2.0-xgboost-2.0.3-idp-base` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
| `scikit-learning-2024.0.0-xgboost-2.0.2-idp-base` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |

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

| Tag(s) | Intel SKLearn | Scikit-learn | XGBoost | Dockerfile |
| ---------------------------------------------------- | -------------- | ------------ | -------- | --------------- |
| `2024.3.0-idp-jupyter` | [v2024.3.0] | [v1.4.2] | [v2.0.3] | [v0.4.0-Beta] |
| `2024.3.0-idp-jupyter` | [v2024.5.0] | [v1.5.0] | [v2.1.0] | [v0.4.0] |
| `2024.2.0-xgboost-2.0.3-idp-jupyter` | [v2024.2.0] | [v1.4.1] | [v2.0.3] | [v0.4.0-Beta] |
| `scikit-learning-2024.0.0-xgboost-2.0.2-idp-jupyter` | [v2024.0.0] | [v1.3.2] | [v2.0.2] | [v0.3.4] |

Expand Down Expand Up @@ -87,16 +89,20 @@ It is the image user's responsibility to ensure that any use of The images below
[Scikit-learn*]: https://scikit-learn.org/stable/
[XGBoost*]: https://github.com/dmlc/xgboost

[v2024.5.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.5.0
[v2024.3.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.3.0
[v2024.2.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.2.0
[v2024.0.0]: https://github.com/intel/scikit-learn-intelex/releases/tag/2024.0.0

[v1.5.0]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.0
[v1.4.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.2
[v1.4.1]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.1
[v1.3.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.3.2

[v2.1.0]: https://github.com/dmlc/xgboost/releases/tag/v2.1.0
[v2.0.3]: https://github.com/dmlc/xgboost/releases/tag/v2.0.3
[v2.0.2]: https://github.com/dmlc/xgboost/releases/tag/v2.0.2

[v0.4.0-Beta]: https://github.com/intel/ai-containers/blob/v0.4.0-Beta/tensorflow/Dockerfile
[v0.3.4]: https://github.com/intel/ai-containers/blob/v0.3.4/tensorflow/Dockerfile
[v0.4.0]: https://github.com/intel/ai-containers/blob/v0.4.0/classical-ml/Dockerfile
[v0.4.0-Beta]: https://github.com/intel/ai-containers/blob/v0.4.0-Beta/classical-ml/Dockerfile
[v0.3.4]: https://github.com/intel/ai-containers/blob/v0.3.4/classical-ml/Dockerfile
4 changes: 2 additions & 2 deletions classical-ml/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
bash -c "python -c 'import sklearnex, sklearn; import xgboost as xgb; print(\"Scikit version:\", sklearn.__version__, \"\\nXGBoost version:\", xgb.__version__)'"
depends_on:
- ${PACKAGE_OPTION:-pip}
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
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
pull_policy: always
jupyter:
build:
Expand All @@ -62,5 +62,5 @@ services:
http_proxy: ${http_proxy}
https_proxy: ${https_proxy}
extends: ml-base
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-jupyter
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
network_mode: host
10 changes: 5 additions & 5 deletions classical-ml/tests/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@

---
classical-ml-import-${PACKAGE_OPTION:-pip}:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
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
cmd: python -c "from sklearnex import patch_sklearn; patch_sklearn();import xgboost as xgb; print(xgb.__version__)"
classical-ml-import-${PACKAGE_OPTION:-pip}-jupyter:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-jupyter
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
cmd: sh -c "python -m jupyter --version"
classical-ml-base-${PACKAGE_OPTION:-pip}-sklearn:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
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
cmd: bash /tests/sklearn.sh
volumes:
- src: $PWD/classical-ml/tests
dst: /tests
classical-ml-base-${PACKAGE_OPTION:-pip}-xgboost:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
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
cmd: bash /tests/xgboost.sh
volumes:
- src: $PWD/classical-ml/tests
dst: /tests
classical-ml-performance-${PACKAGE_OPTION:-pip}:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
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
cmd: python /tests/performance.py
volumes:
- src: $PWD/classical-ml/tests
Expand Down