Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update IPEX CPU toolchain to 2.5.0 version #510

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Update IPEX CPU toolchain to 2.5.0 version #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
527ab58
update ipex xpu toolchain
sramakintel Nov 7, 2024
bb13085
update torchserve cpu
sramakintel Nov 7, 2024
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
9 changes: 8 additions & 1 deletion pytorch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ The images below are built only with CPU optimizations (GPU acceleration support

| Tag(s) | Pytorch | IPEX | Dockerfile |
| -------------------------- | -------- | ------------ | --------------- |
| `2.4.0-pip-base`, `latest` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.5.0-pip-base`, `latest` | [v2.5.0] | [v2.5.0+cpu] | [v0.4.0-Beta] |
| `2.4.0-pip-base` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.3.0-pip-base` | [v2.3.0] | [v2.3.0+cpu] | [v0.4.0-Beta] |
| `2.2.0-pip-base` | [v2.2.0] | [v2.2.0+cpu] | [v0.3.4] |
| `2.1.0-pip-base` | [v2.1.0] | [v2.1.0+cpu] | [v0.2.3] |
Expand All @@ -88,6 +89,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s

| Tag(s) | Pytorch | IPEX | Dockerfile |
| ------------------- | -------- | ------------ | --------------- |
| `2.5.0-pip-jupyter` | [v2.5.0] | [v2.5.0+cpu] | [v0.4.0-Beta] |
| `2.4.0-pip-jupyter` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.3.0-pip-jupyter` | [v2.3.0] | [v2.3.0+cpu] | [v0.4.0-Beta] |
| `2.2.0-pip-jupyter` | [v2.2.0] | [v2.2.0+cpu] | [v0.3.4] |
Expand Down Expand Up @@ -269,6 +271,7 @@ The images below are [TorchServe*] with CPU Optimizations:

| Tag(s) | Pytorch | IPEX | Dockerfile |
| ------------------- | -------- | ------------ | --------------- |
| `2.5.0-serving-cpu` | [v2.5.0] | [v2.5.0+cpu] | [v0.4.0-Beta] |
| `2.4.0-serving-cpu` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.3.0-serving-cpu` | [v2.3.0] | [v2.3.0+cpu] | [v0.4.0-Beta] |
| `2.2.0-serving-cpu` | [v2.2.0] | [v2.2.0+cpu] | [v0.3.4] |
Expand All @@ -287,6 +290,7 @@ The images below are built only with CPU optimizations (GPU acceleration support

| Tag(s) | Pytorch | IPEX | Dockerfile |
| ---------------- | -------- | ------------ | --------------- |
| `2.5.0-idp-base` | [v2.5.0] | [v2.5.0+cpu] | [v0.4.0-Beta] |
| `2.4.0-idp-base` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.3.0-idp-base` | [v2.3.0] | [v2.3.0+cpu] | [v0.4.0-Beta] |
| `2.2.0-idp-base` | [v2.2.0] | [v2.2.0+cpu] | [v0.3.4] |
Expand All @@ -297,6 +301,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s

| Tag(s) | Pytorch | IPEX | Dockerfile |
| ------------------- | -------- | ------------ | --------------- |
| `2.5.0-idp-jupyter` | [v2.5.0] | [v2.5.0+cpu] | [v0.4.0-Beta] |
| `2.4.0-idp-jupyter` | [v2.4.0] | [v2.4.0+cpu] | [v0.4.0-Beta] |
| `2.3.0-idp-jupyter` | [v2.3.0] | [v2.3.0+cpu] | [v0.4.0-Beta] |
| `2.2.0-idp-jupyter` | [v2.2.0] | [v2.2.0+cpu] | [v0.3.4] |
Expand Down Expand Up @@ -404,6 +409,7 @@ It is the image user's responsibility to ensure that any use of The images below
[v2.1.10+xpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.1.10%2Bxpu
[v2.0.110+xpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.0.110%2Bxpu

[v2.5.0]: https://github.com/pytorch/pytorch/releases/tag/v2.5.0
[v2.4.0]: https://github.com/pytorch/pytorch/releases/tag/v2.4.0
[v2.3.0]: https://github.com/pytorch/pytorch/releases/tag/v2.3.0
[v2.2.2]: https://github.com/pytorch/pytorch/releases/tag/v2.2.2
Expand All @@ -421,6 +427,7 @@ It is the image user's responsibility to ensure that any use of The images below
[v2.3.1]: https://github.com/intel/neural-compressor/releases/tag/v2.3.1
[v2.1.1]: https://github.com/intel/neural-compressor/releases/tag/v2.1.1

[v2.5.0+cpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.5.0%2Bcpu
[v2.4.0+cpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.4.0%2Bcpu
[v2.3.0+cpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.3.0%2Bcpu
[v2.2.0+cpu]: https://github.com/intel/intel-extension-for-pytorch/releases/tag/v2.2.0%2Bcpu
Expand Down
20 changes: 10 additions & 10 deletions pytorch/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ services:
BASE_IMAGE_NAME: ${BASE_IMAGE_NAME:-ubuntu}
BASE_IMAGE_TAG: ${BASE_IMAGE_TAG:-22.04}
GITHUB_RUN_NUMBER: ${GITHUB_RUN_NUMBER:-0}
IPEX_VERSION: ${IPEX_VERSION:-2.4.0}
IPEX_VERSION: ${IPEX_VERSION:-2.5.0}
MINIFORGE_VERSION: ${MINIFORGE_VERSION:-Linux-x86_64}
NO_PROXY: ''
PACKAGE_OPTION: ${PACKAGE_OPTION:-pip}
PYTHON_VERSION: ${PYTHON_VERSION:-3.10}
PYTORCH_VERSION: ${PYTORCH_VERSION:-2.4.0+cpu}
PYTORCH_VERSION: ${PYTORCH_VERSION:-2.5.0+cpu}
REGISTRY: ${REGISTRY}
REPO: ${REPO}
TORCHAUDIO_VERSION: ${TORCHAUDIO_VERSION:-2.4.0}
TORCHVISION_VERSION: ${TORCHVISION_VERSION:-0.19.0}
TORCHAUDIO_VERSION: ${TORCHAUDIO_VERSION:-2.5.0}
TORCHVISION_VERSION: ${TORCHVISION_VERSION:-0.20.0}
context: .
labels:
dependency.python: ${PYTHON_VERSION:-3.10}
Expand All @@ -43,29 +43,29 @@ services:
org.opencontainers.base.name: "intel/python:3.10-core"
org.opencontainers.image.name: "intel/intel-optimized-pytorch"
org.opencontainers.image.title: "Intel® Extension for PyTorch Base Image"
org.opencontainers.image.version: ${IPEX_VERSION:-2.4.0}-${PACKAGE_OPTION:-pip}-base
org.opencontainers.image.version: ${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-base
target: ipex-base-${PACKAGE_OPTION:-pip}
command: >
sh -c "python -c 'import torch; import intel_extension_for_pytorch as ipex; print(\"torch:\", torch.__version__, \" ipex:\",ipex.__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}-ipex-${IPEX_VERSION:-2.4.0}-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}-ipex-${IPEX_VERSION:-2.5.0}-base
pull_policy: always
jupyter:
build:
labels:
dependency.python.pip: jupyter-requirements.txt
org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.4.0}-${PACKAGE_OPTION:-pip}-base"
org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-base"
org.opencontainers.image.title: "Intel® Extension for PyTorch Jupyter Image"
org.opencontainers.image.version: ${IPEX_VERSION:-2.4.0}-${PACKAGE_OPTION:-pip}-jupyter
org.opencontainers.image.version: ${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-jupyter
target: jupyter
command: >
bash -c "python -m jupyter --version"
environment:
http_proxy: ${http_proxy}
https_proxy: ${https_proxy}
extends: ipex-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}-ipex-${IPEX_VERSION:-2.4.0}-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}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
network_mode: host
ports:
- 8888:8888
Expand Down Expand Up @@ -118,7 +118,7 @@ services:
docs: serving
org.opencontainers.base.name: "intel/python:3.10-core"
org.opencontainers.image.title: "Intel® Extension for PyTorch Serving Image"
org.opencontainers.image.version: ${IPEX_VERSION:-2.4.0}-serving-cpu
org.opencontainers.image.version: ${IPEX_VERSION:-2.5.0}-serving-cpu
target: torchserve-cpu
command: torchserve --version
entrypoint: ""
Expand Down
8 changes: 4 additions & 4 deletions pytorch/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
torch==2.4.0+cpu
torchvision==0.19.0+cpu
torchaudio==2.4.0+cpu
torch==2.5.0+cpu
torchvision==0.20.0+cpu
torchaudio==2.5.0+cpu
--extra-index-url https://download.pytorch.org/whl/cpu
intel_extension_for_pytorch==2.4.0+cpu
intel_extension_for_pytorch==2.5.0+cpu
--extra-index-url https://pytorch-extension.intel.com/release-whl/stable/cpu/us/
4 changes: 2 additions & 2 deletions pytorch/serving/torchserve-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ torch-model-archiver==0.12.0
torch-workflow-archiver==0.2.15
torchserve==0.12.0
torchtext==0.18.0+cpu
torchvision==0.19.0
torchvision==0.20.0
-f https://pytorch-extension.intel.com/release-whl/stable/cpu/us/
intel_extension_for_pytorch==2.4.0+cpu
intel_extension_for_pytorch==2.5.0+cpu
6 changes: 3 additions & 3 deletions pytorch/tests/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
# limitations under the License.

import-ipex-cpu-${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}-ipex-${IPEX_VERSION:-2.4.0}-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}-ipex-${IPEX_VERSION:-2.5.0}-base
cmd: python -c "import torch;import intel_extension_for_pytorch as ipex;print(f'torch {torch.__version__} ipex {ipex.__version__}')"
import-ipex-xpu-${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}-ipex-${IPEX_VERSION:-2.3.110xpu}-xpu-base
cmd: python -c "import torch; import intel_extension_for_pytorch as ipex;[print(f'[{i}] {torch.xpu.get_device_properties(i)}') for i in range(torch.xpu.device_count())];"
device: ["/dev/dri"]
import-cpu-jupyter-${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}-ipex-${IPEX_VERSION:-2.4.0}-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}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
cmd: python -m jupyter --version
import-xpu-jupyter-${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}-ipex-${IPEX_VERSION:-2.3.110xpu}-xpu-jupyter
cmd: python -m jupyter --version
device: ["/dev/dri"]
ipex-cpu-${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}-ipex-${IPEX_VERSION:-2.4.0}-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}-ipex-${IPEX_VERSION:-2.5.0}-base
cmd: python /tests/ipex-resnet50.py --ipex --device cpu --backend gloo
volumes:
- dst: /tests
Expand Down