Skip to content

Commit

Permalink
Classical ML 2024.2.0 (#216)
Browse files Browse the repository at this point in the history 
* update classical-ml to 2024.2.0

* glob strings

* update tests

* remove release tag dependency, pull from main

* update idp licensing
  • Loading branch information
Tyler Titsworth authored Mar 26, 2024
1 parent 6058c40 commit 8419fd6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 30 deletions.
17 changes: 9 additions & 8 deletions classical-ml/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ RUN python -m pip install --no-cache-dir \
COPY base/.patch_sklearn.py ${HOME}/.patch_sklearn.py

RUN mkdir -p /licensing && \
wget --progress=dot:giga -O - https://github.com/intel/scikit-learn-intelex/archive/refs/tags/${SCIKIT_VERSION}.tar.gz | \
tar -xz -C /licensing --strip=2 "scikit-learn-intelex-${SCIKIT_VERSION}/doc/third-party-programs-sklearnex.txt" \
"scikit-learn-intelex-${SCIKIT_VERSION}/doc/daal4py/third-party-programs.txt"
wget --progress=dot:giga -O - "https://github.com/intel/scikit-learn-intelex/archive/refs/heads/main.tar.gz" | \
tar -xz -C /licensing --strip=2 "scikit-learn-intelex-main/doc/third-party-programs-sklearnex.txt" \
"scikit-learn-intelex-main/doc/daal4py/third-party-programs.txt"

RUN wget --progress=dot:giga --no-check-certificate https://raw.githubusercontent.com/intel/scikit-learn-intelex/${SCIKIT_VERSION}/LICENSE -O /licensing/SCIKIT_LICENSE
RUN wget --progress=dot:giga --no-check-certificate "https://raw.githubusercontent.com/intel/scikit-learn-intelex/main/LICENSE" -O /licensing/SCIKIT_LICENSE

FROM ${COMPOSE_PROJECT_NAME}-python AS ml-base-idp

Expand All @@ -63,10 +63,11 @@ ENV PYTHONSTARTUP=${HOME}/.patch_sklearn.py
COPY base/.patch_sklearn.py ${HOME}/.patch_sklearn.py

RUN mkdir -p /licensing && \
wget --progress=dot:giga -O - https://github.com/intel/scikit-learn-intelex/archive/refs/tags/${SCIKIT_VERSION}.tar.gz | \
tar -xz -C /licensing --strip=2 "scikit-learn-intelex-${SCIKIT_VERSION}/doc/third-party-programs-sklearnex.txt" \
"scikit-learn-intelex-${SCIKIT_VERSION}/doc/daal4py/third-party-programs.txt" && \
wget --progress=dot:giga --no-check-certificate https://raw.githubusercontent.com/intel/scikit-learn-intelex/${SCIKIT_VERSION}/LICENSE -O /licensing/SCIKIT_LICENSE
wget --progress=dot:giga -O - "https://github.com/intel/scikit-learn-intelex/archive/refs/heads/main.tar.gz" | \
tar -xz -C /licensing --strip=2 "scikit-learn-intelex-main/doc/third-party-programs-sklearnex.txt" \
"scikit-learn-intelex-main/doc/daal4py/third-party-programs.txt"

RUN wget --progress=dot:giga --no-check-certificate "https://raw.githubusercontent.com/intel/scikit-learn-intelex/main/LICENSE" -O /licensing/SCIKIT_LICENSE

FROM ml-base-${PACKAGE_OPTION} AS jupyter

Expand Down
4 changes: 2 additions & 2 deletions classical-ml/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
| MINICONDA_VERSION | `latest-Linux-x86_64` | Miniconda Version from `https://repo.anaconda.com/miniconda` |
| PACKAGE_OPTION | `pip` | Stock Python (pypi) or Intel Python (conda) (`pip` or `idp`) |
| PYTHON_VERSION | `3.10` | Python Version |
| SCIKIT_VERSION | `2024.0.0` | Intel SKLearn Version |
| XGBOOST_VERSION | `2.0.2` | XGBoost Version |
| SCIKIT_VERSION | `2024.2.0` | Intel SKLearn Version |
| XGBOOST_VERSION | `2.0.3` | XGBoost Version |

### Jupyter

Expand Down
8 changes: 4 additions & 4 deletions classical-ml/docker-compose.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ services:
no_proxy: ${no_proxy}
COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-classical-ml}
PACKAGE_OPTION: ${PACKAGE_OPTION:-pip}
SCIKIT_VERSION: ${SCIKIT_VERSION:-2024.0.0}
XGBOOST_VERSION: ${XGBOOST_VERSION:-2.0.2}
SCIKIT_VERSION: ${SCIKIT_VERSION:-2024.2.0}
XGBOOST_VERSION: ${XGBOOST_VERSION:-2.0.3}
context: .
dockerfile: Dockerfile
target: ml-base-${PACKAGE_OPTION:-pip}
Expand All @@ -31,7 +31,7 @@ services:
- python
command: >
bash -c "python -c 'import sklearnex, sklearn; import xgboost as xgb; print(\"Scikit version:\", sklearn.__version__, \"\\nXGBoost version:\", xgb.__version__)'"
image: ${REGISTRY}/aiops/mlops-ci: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.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
image: ${REGISTRY}/aiops/mlops-ci: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.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
pull_policy: always

jupyter:
Expand All @@ -43,5 +43,5 @@ services:
http_proxy: ${http_proxy}
https_proxy: ${https_proxy}
extends: ml-base
image: ${REGISTRY}/aiops/mlops-ci: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.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-jupyter
image: ${REGISTRY}/aiops/mlops-ci: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.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-jupyter
network_mode: host
20 changes: 4 additions & 16 deletions classical-ml/tests/tests.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
---
classical-ml-base-idp-sklearn:
img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-idp-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
classical-ml-base-${PACKAGE_OPTION:-pip}-sklearn:
img: ${REGISTRY}/aiops/mlops-ci: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.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
cmd: bash /tests/sklearn.sh
volumes:
- src: $PWD/classical-ml/tests
dst: /tests
classical-ml-base-idp-xgboost:
img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-idp-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
cmd: bash /tests/xgboost.sh
volumes:
- src: $PWD/classical-ml/tests
dst: /tests
classical-ml-base-pip-sklearn:
img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
cmd: bash /tests/sklearn.sh
volumes:
- src: $PWD/classical-ml/tests
dst: /tests
classical-ml-base-pip-xgboost:
img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
classical-ml-base-${PACKAGE_OPTION:-pip}-xgboost:
img: ${REGISTRY}/aiops/mlops-ci: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.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
cmd: bash /tests/xgboost.sh
volumes:
- src: $PWD/classical-ml/tests
Expand Down

0 comments on commit 8419fd6

Please sign in to comment.