From e6d95fd0a72271ee650cfc4f72d56006db3020da Mon Sep 17 00:00:00 2001 From: Disty0 Date: Fri, 15 Dec 2023 11:32:01 +0300 Subject: [PATCH] Add env variables for MKL, DPCPP and OpenVINO installer --- CHANGELOG.md | 13 +++++++------ installer.py | 8 ++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0acc17d68..3ee3aa807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,15 +37,16 @@ - **Extra networks** new *settting -> extra networks -> build info on first access* indexes all networks on first access instead of server startup - **IPEX**, thanks @disty0 - - update to **Torch 2.1** - - built-in *MKL* and *DPCPP* for IPEX - no need to install OneAPI anymore + - update to **Torch 2.1** + if you get file not found errors, set DISABLE_IPEXRUN=1 and run the webui with --reinstall + - built-in *MKL* and *DPCPP* for IPEX, no need to install OneAPI anymore - fix IPEX Optimize not applying with Diffusers backend - disable 32 bit workarounds if the GPU supports 64 bit + - add DISABLE_IPEXRUN environment variable - compatibility improvements - - **OpenVINO** - - Add *Directory for OpenVINO cache* option to *System Paths*, thanks @disty0 - - Remove Intel ARC specific 1024x1024 workaround, thanks @disty0 + - **OpenVINO**, thanks @disty0 + - Add *Directory for OpenVINO cache* option to *System Paths* + - Remove Intel ARC specific 1024x1024 workaround - **Inpaint** add option `apply_overlay` to control if inpaint result should be applied as overlay or as-is can remove artifacts and hard edges of inpaint area but also remove some details from original - disable google fonts check on server startup diff --git a/installer.py b/installer.py index fb0f462ed..206e4b107 100644 --- a/installer.py +++ b/installer.py @@ -426,9 +426,9 @@ def check_torch(): torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.1.0a0 torchvision==0.16.0a0 intel-extension-for-pytorch==2.1.10+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/') if "linux" in sys.platform: os.environ.setdefault('TENSORFLOW_PACKAGE', 'tensorflow==2.14.0 intel-extension-for-tensorflow[xpu]==2.14.0.1') - install('mkl==2024.0.0', 'mkl') - install('mkl-dpcpp==2024.0.0', 'mkl-dpcpp') - install('openvino', 'openvino', ignore=True) + install(os.environ.get('MKL_PACKAGE', 'mkl==2024.0.0'), 'mkl') + install(os.environ.get('DPCPP_PACKAGE', 'mkl-dpcpp==2024.0.0'), 'mkl-dpcpp') + install(os.environ.get('OPENVINO_PACKAGE', 'openvino==2023.2.0'), 'openvino', ignore=True) install('onnxruntime-openvino', 'onnxruntime-openvino', ignore=True) elif allow_openvino and args.use_openvino: log.info('Using OpenVINO') @@ -500,7 +500,7 @@ def check_torch(): if opts.get('cuda_compile_backend', '') == 'hidet': install('hidet', 'hidet') if args.use_openvino or opts.get('cuda_compile_backend', '') == 'openvino_fx': - install('openvino==2023.2.0', 'openvino') + install(os.environ.get('OPENVINO_PACKAGE', 'openvino==2023.2.0'), 'openvino') install('onnxruntime-openvino', 'onnxruntime-openvino', ignore=True) # TODO openvino: numpy version conflicts with tensorflow and doesn't support Python 3.11 os.environ.setdefault('PYTORCH_TRACING_MODE', 'TORCHFX') os.environ.setdefault('NEOReadDebugKeys', '1')