diff --git a/CHANGELOG.md b/CHANGELOG.md index 85a44e360..22158d0f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ ## TODO -- resize type: fixed, fill, etc. +- resize type: strech, fill/color, edge, etc. - reference styles +- quick apply style ## Update for 2024-03-15 diff --git a/modules/onnx_impl/__init__.py b/modules/onnx_impl/__init__.py index e48a355b6..61ff7c76b 100644 --- a/modules/onnx_impl/__init__.py +++ b/modules/onnx_impl/__init__.py @@ -194,9 +194,11 @@ def initialize_onnx(): global initialized # pylint: disable=global-statement if initialized: return - from installer import log + from installer import log, installed from modules import devices from modules.shared import opts + if not installed('onnx', quiet=True): + return try: # may fail on onnx import import onnx # pylint: disable=unused-import from .execution_providers import ExecutionProvider, TORCH_DEVICE_TO_EP, available_execution_providers @@ -243,7 +245,7 @@ def initialize_onnx(): def initialize_olive(): global run_olive_workflow # pylint: disable=global-statement from installer import installed, log - if not installed("olive-ai"): + if not installed('olive-ai', quiet=True) or not installed('onnx', quiet=True): return import sys import importlib @@ -268,6 +270,7 @@ def install_olive(): return try: log.info('Installing Olive') + install('onnx', 'onnx', ignore=True) install('olive-ai', 'olive-ai', ignore=True) import olive.workflows # pylint: disable=unused-import except Exception as e: