From 82ac2106f6ab60ef3a9c101a8e3374977fba4406 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:44:27 +0000 Subject: [PATCH 1/2] Bump the classical-ml group across 1 directory with 2 updates Bumps the classical-ml group with 2 updates in the /classical-ml directory: [matplotlib](https://github.com/matplotlib/matplotlib) and [jupyterlab](https://github.com/jupyterlab/jupyterlab). Updates `matplotlib` from 3.9.0 to 3.9.1 - [Release notes](https://github.com/matplotlib/matplotlib/releases) - [Commits](https://github.com/matplotlib/matplotlib/compare/v3.9.0...v3.9.1) Updates `jupyterlab` from 4.2.3 to 4.2.4 - [Release notes](https://github.com/jupyterlab/jupyterlab/releases) - [Changelog](https://github.com/jupyterlab/jupyterlab/blob/@jupyterlab/lsp@4.2.4/CHANGELOG.md) - [Commits](https://github.com/jupyterlab/jupyterlab/compare/@jupyterlab/lsp@4.2.3...@jupyterlab/lsp@4.2.4) --- updated-dependencies: - dependency-name: matplotlib dependency-type: direct:production update-type: version-update:semver-patch dependency-group: classical-ml - dependency-name: jupyterlab dependency-type: direct:production update-type: version-update:semver-patch dependency-group: classical-ml ... Signed-off-by: dependabot[bot] --- classical-ml/jupyter-requirements.txt | 2 +- classical-ml/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classical-ml/jupyter-requirements.txt b/classical-ml/jupyter-requirements.txt index 7fbf6c46a..33f959aeb 100644 --- a/classical-ml/jupyter-requirements.txt +++ b/classical-ml/jupyter-requirements.txt @@ -1,4 +1,4 @@ -jupyterlab==4.2.3 +jupyterlab==4.2.4 jupyterhub==5.0.0 notebook==7.2.1 jupyter-server-proxy>=4.1.2 diff --git a/classical-ml/requirements.txt b/classical-ml/requirements.txt index 7375d58e0..5fa37d8dc 100644 --- a/classical-ml/requirements.txt +++ b/classical-ml/requirements.txt @@ -1,5 +1,5 @@ daal4py==2024.5.0 -matplotlib==3.9.0 +matplotlib==3.9.1 numpy==1.26.4 scikit-learn-intelex==2024.5.0 threadpoolctl==3.5.0 From 95b80462ef3dfab74ac0d74d03e86ea652edd952 Mon Sep 17 00:00:00 2001 From: tylertitsworth Date: Mon, 22 Jul 2024 08:59:37 -0700 Subject: [PATCH 2/2] remove preset tests Signed-off-by: tylertitsworth --- classical-ml/tests/sklearn.sh | 32 ---------------------------- classical-ml/tests/tests.yaml | 12 ----------- classical-ml/tests/xgboost.sh | 39 ----------------------------------- 3 files changed, 83 deletions(-) delete mode 100644 classical-ml/tests/sklearn.sh delete mode 100644 classical-ml/tests/xgboost.sh diff --git a/classical-ml/tests/sklearn.sh b/classical-ml/tests/sklearn.sh deleted file mode 100644 index d9a1cbfd1..000000000 --- a/classical-ml/tests/sklearn.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================ -# -# This file was assembled from multiple pieces, whose use is documented -# throughout. Please refer to the TensorFlow dockerfiles documentation -# for more information. -# based on https://github.com/pytorch/pytorch/blob/master/Dockerfile -# -# NOTE: To build this you will need a docker version >= 19.03 and DOCKER_BUILDKIT=1 -# -# If you do not use buildkit you are not going to have a good time -# -# For reference: -# https://docs.docker.com/develop/develop-images/build_enhancements/ - -wget https://raw.githubusercontent.com/intel/ai-containers/main/preset/classical-ml/tests/scikit/kmeans.py -python kmeans.py true - -rm -rf kmeans.py diff --git a/classical-ml/tests/tests.yaml b/classical-ml/tests/tests.yaml index a39a3e6fb..0016987be 100644 --- a/classical-ml/tests/tests.yaml +++ b/classical-ml/tests/tests.yaml @@ -19,18 +19,6 @@ classical-ml-import-${PACKAGE_OPTION:-pip}: 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.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.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.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.5.0}-xgboost-${XGBOOST_VERSION:-2.1.0}-base cmd: python /tests/performance.py diff --git a/classical-ml/tests/xgboost.sh b/classical-ml/tests/xgboost.sh deleted file mode 100644 index ba760c717..000000000 --- a/classical-ml/tests/xgboost.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================ -# -# This file was assembled from multiple pieces, whose use is documented -# throughout. Please refer to the TensorFlow dockerfiles documentation -# for more information. -# based on https://github.com/pytorch/pytorch/blob/master/Dockerfile -# -# NOTE: To build this you will need a docker version >= 19.03 and DOCKER_BUILDKIT=1 -# -# If you do not use buildkit you are not going to have a good time -# -# For reference: -# https://docs.docker.com/develop/develop-images/build_enhancements/ - -mkdir -p /home/dev/data /home/dev/output -cd /home/dev/data || exit -wget https://raw.githubusercontent.com/dmlc/xgboost/master/demo/data/agaricus.txt.train -wget https://raw.githubusercontent.com/dmlc/xgboost/master/demo/data/agaricus.txt.test -wget https://raw.githubusercontent.com/dmlc/xgboost/master/demo/data/featmap.txt -cd .. || exit - -wget https://raw.githubusercontent.com/intel/ai-containers/main/preset/classical-ml/tests/xgboost/test_xgboost.py -python test_xgboost.py - -rm -rf /home/dev