Skip to content

Commit cb847a5

Browse files
author
Tyler Titsworth
authored
Merge branch 'main' into tylertitsworth/weekly-patch
2 parents 9044121 + 5077a3a commit cb847a5

14 files changed

+26
-26
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@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
158+
- uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
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@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
56+
- uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
5757
with:
5858
sarif_file: results.sarif

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ repos:
4747
- args: ["--config-file", ".github/linters/actionlint.yml"]
4848
id: actionlint
4949
repo: https://github.com/rhysd/actionlint
50-
rev: v1.7.1
50+
rev: v1.7.2
5151
- hooks:
5252
- id: helm-docs-container
5353
repo: https://github.com/norwoodj/helm-docs

‎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.6.0}-${PACKAGE_OPTION:-pip}-base
43+
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.7.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-${SKLEARN_VERSION:-2024.6.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.7.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.6.0}-${PACKAGE_OPTION:-pip}-base"
55+
org.opencontainers.base.name: "intel/intel-optimized-ml:${SKLEARN_VERSION:-2024.7.0}-${PACKAGE_OPTION:-pip}-base"
5656
org.opencontainers.image.title: "Intel® Optimized ML Jupyter Base Image"
57-
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.6.0}-${PACKAGE_OPTION:-pip}-jupyter
57+
org.opencontainers.image.version: ${SKLEARN_VERSION:-2024.7.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-${SKLEARN_VERSION:-2024.6.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.7.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-jupyter
6666
network_mode: host

‎classical-ml/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
daal4py==2024.6.0
1+
daal4py==2024.7.0
22
matplotlib==3.9.2
33
numpy==1.26.4
4-
scikit-learn-intelex==2024.6.0
4+
scikit-learn-intelex==2024.7.0
55
threadpoolctl==3.5.0
66
xgboost==2.1.1
7-
pandas==2.2.2
7+
pandas==2.2.3
88
nbconvert==7.16.4

‎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-${SKLEARN_VERSION:-2024.6.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.7.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-${SKLEARN_VERSION:-2024.6.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.7.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-${SKLEARN_VERSION:-2024.6.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.7.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.34
4+
mkdocs-material==9.5.36
55
mkdocs-table-reader-plugin>=2.1.0
66
mkdocs==1.6.1
77
pandas>=2.0.3

‎python/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy==1.26.4
22
setuptools>=70.0.0
33
psutil==6.0.0
4-
mkl==2024.2.1
5-
mkl-include==2024.2.1
4+
mkl==2024.2.2
5+
mkl-include==2024.2.2
66
intel-openmp==2024.2.1

‎tensorflow/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ services:
9292
command: >
9393
bash -c "horovodrun --check-build && mpirun --version && python -c 'import horovod.tensorflow as hvd;hvd.init();import horovod.tensorflow;import neural_compressor, tf2onnx; print(\"\\nNeural Compressor Version:\", neural_compressor.__version__, \"\\\nTensorFlow2ONNX Version:\", tf2onnx.__version__)'"
9494
extends: tf-base
95-
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0}
95+
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0.2}
9696
xpu:
9797
build:
9898
args:

‎tensorflow/multinode/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cython>=3.0.11
22
impi-rt>=2021.12.0
33
mpi4py>=3.1.0
4-
neural-compressor==3.0
4+
neural-compressor==3.0.2
55
tf2onnx>=1.16.1

‎tensorflow/serving/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
numpy==2.1.0
1+
numpy==2.1.1
22
pillow==10.4.0
33
requests==2.32.3
44
tensorflow==2.17.0

‎tensorflow/tests/tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ import-xpu-jupyter-${PACKAGE_OPTION:-pip}:
3131
cmd: python -m jupyter --version
3232
device: ["/dev/dri"]
3333
import-multinode-${PACKAGE_OPTION:-pip}:
34-
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0}
34+
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0.2}
3535
cmd: horovodrun --check-build && mpirun --version && python -c 'import horovod.tensorflow as hvd;hvd.init();import horovod.tensorflow'
3636
import-inc-${PACKAGE_OPTION:-pip}:
37-
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0}
37+
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0.2}
3838
cmd: python -c "import neural_compressor as inc;print(inc.__version__)"
3939
itex-cpu-${PACKAGE_OPTION:-pip}:
4040
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}-${TF_VERSION:-2.15.1}-base
@@ -55,13 +55,13 @@ itex-xpu-jupyter-${PACKAGE_OPTION:-pip}:
5555
notebook: True
5656
device: ["/dev/dri"]
5757
multinode-${PACKAGE_OPTION:-pip}:
58-
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0}
58+
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0.2}
5959
cmd: horovodrun -np 2 -H localhost:2 --binding-args="-bind-to socket -map-by socket" python /tests/tf_base_test.py
6060
volumes:
6161
- dst: /tests
6262
src: $PWD/tensorflow/tests
6363
inc-${PACKAGE_OPTION:-pip}:
64-
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0}
64+
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}-${TF_VERSION:-2.15.1}-horovod-${HOROVOD_VERSION:-0.28.1}-inc-${INC_VERSION:-3.0.2}
6565
cmd: bash /tests/inc_test.sh
6666
volumes:
6767
- dst: /tests

‎test-runner/dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ coverage>=7.5.0
33
coveralls>=4.0.1
44
expandvars>=0.12.0
55
hypothesis>=6.100.1
6-
pydantic==2.9.1
6+
pydantic==2.9.2
77
pylint>=3.1.0
88
pytest>=8.1.1
99
python_on_whales>=0.70.1

‎test-runner/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
expandvars>=0.12.0
2-
pydantic==2.9.1
2+
pydantic==2.9.2
33
python_on_whales>=0.70.1
44
pyyaml>=6.0.1
55
tabulate>=0.9.0

0 commit comments

Comments
 (0)