Skip to content

Commit 88ac24a

Browse files
sramakintelsramakintel
authored
Merge branch 'main' into sramakr1/apptainer_ci_python
2 parents 81561fd + 1d3cb1e commit 88ac24a

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

‎classical-ml/README.md

+12-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ The images below include [Intel® Extension for Scikit-learn*] and [XGBoost*].
1010

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

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

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

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

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

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

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

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

97+
[v1.5.0]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.5.0
9498
[v1.4.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.2
9599
[v1.4.1]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.4.1
96100
[v1.3.2]: https://github.com/scikit-learn/scikit-learn/releases/tag/1.3.2
97101

102+
[v2.1.0]: https://github.com/dmlc/xgboost/releases/tag/v2.1.0
98103
[v2.0.3]: https://github.com/dmlc/xgboost/releases/tag/v2.0.3
99104
[v2.0.2]: https://github.com/dmlc/xgboost/releases/tag/v2.0.2
100105

101-
[v0.4.0-Beta]: https://github.com/intel/ai-containers/blob/v0.4.0-Beta/tensorflow/Dockerfile
102-
[v0.3.4]: https://github.com/intel/ai-containers/blob/v0.3.4/tensorflow/Dockerfile
106+
[v0.4.0]: https://github.com/intel/ai-containers/blob/v0.4.0/classical-ml/Dockerfile
107+
[v0.4.0-Beta]: https://github.com/intel/ai-containers/blob/v0.4.0-Beta/classical-ml/Dockerfile
108+
[v0.3.4]: https://github.com/intel/ai-containers/blob/v0.3.4/classical-ml/Dockerfile

‎classical-ml/docker-compose.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-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-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
5050
pull_policy: always
5151
jupyter:
5252
build:
@@ -62,5 +62,5 @@ services:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-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-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
6666
network_mode: host

‎classical-ml/tests/tests.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-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-${SCIKIT_VERSION:-2024.5.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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-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
2121
cmd: sh -c "python -m jupyter --version"
2222
classical-ml-base-${PACKAGE_OPTION:-pip}-sklearn:
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.3.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-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-${SCIKIT_VERSION:-2024.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base
2424
cmd: bash /tests/sklearn.sh
2525
volumes:
2626
- src: $PWD/classical-ml/tests
2727
dst: /tests
2828
classical-ml-base-${PACKAGE_OPTION:-pip}-xgboost:
29-
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
29+
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
3030
cmd: bash /tests/xgboost.sh
3131
volumes:
3232
- src: $PWD/classical-ml/tests
3333
dst: /tests
3434
classical-ml-performance-${PACKAGE_OPTION:-pip}:
35-
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
35+
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
3636
cmd: python /tests/performance.py
3737
volumes:
3838
- src: $PWD/classical-ml/tests

0 commit comments

Comments
 (0)