From d13f493311078c60df37f84c51426e792dd5c8bf Mon Sep 17 00:00:00 2001 From: eaidova Date: Wed, 27 Nov 2024 09:38:56 +0400 Subject: [PATCH] remove ov dev install in workflow files --- .github/workflows/build_treon_reusable.yml | 4 ++-- .github/workflows/codecheck.yml | 4 ++-- .github/workflows/convert_notebooks.yml | 4 ++-- .github/workflows/install_requirements.yml | 4 ++-- Makefile | 4 ++-- check_install.py | 10 +--------- .../cross-lingual-books-alignment.ipynb | 2 +- .../yolov10-optimization.ipynb | 17 ++--------------- 8 files changed, 14 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build_treon_reusable.yml b/.github/workflows/build_treon_reusable.yml index 0a8605b8df0..b5ed5efda2a 100644 --- a/.github/workflows/build_treon_reusable.yml +++ b/.github/workflows/build_treon_reusable.yml @@ -180,9 +180,9 @@ jobs: run: | python -m pip install --upgrade pip mkdir pipcache - python -m pip install --cache-dir pipcache --no-deps openvino openvino-dev nncf + python -m pip install --cache-dir pipcache --no-deps openvino nncf cp -r pipcache pipcache_openvino - # python -m pip uninstall -y openvino openvino-dev nncf + # python -m pip uninstall -y openvino nncf # Download a small dataset to use for testing purposes in monai-kidney training notebook - name: Download CT files diff --git a/.github/workflows/codecheck.yml b/.github/workflows/codecheck.yml index eaed8ab1be5..cdbefcd06a4 100644 --- a/.github/workflows/codecheck.yml +++ b/.github/workflows/codecheck.yml @@ -59,9 +59,9 @@ jobs: run: | python -m pip install --upgrade pip mkdir pipcache - python -m pip install --cache-dir pipcache --no-deps openvino openvino-dev nncf + python -m pip install --cache-dir pipcache --no-deps openvino nncf cp -r pipcache pipcache_openvino - python -m pip uninstall -y openvino openvino-dev nncf + python -m pip uninstall -y openvino nncf - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/convert_notebooks.yml b/.github/workflows/convert_notebooks.yml index bda30929370..1123f427789 100644 --- a/.github/workflows/convert_notebooks.yml +++ b/.github/workflows/convert_notebooks.yml @@ -133,9 +133,9 @@ jobs: run: | python -m pip install --upgrade pip==21.3.* mkdir pipcache - python -m pip install --cache-dir pipcache --no-deps openvino openvino-dev nncf + python -m pip install --cache-dir pipcache --no-deps openvino nncf cp -r pipcache pipcache_openvino - python -m pip uninstall -y openvino openvino-dev nncf + python -m pip uninstall -y openvino nncf # Download a small dataset to use for testing purposes in monai-kidney training notebook - name: Download CT files diff --git a/.github/workflows/install_requirements.yml b/.github/workflows/install_requirements.yml index 902361ef8df..278fe52487e 100644 --- a/.github/workflows/install_requirements.yml +++ b/.github/workflows/install_requirements.yml @@ -45,9 +45,9 @@ jobs: run: | python -m pip install --upgrade pip mkdir pipcache - python -m pip install --cache-dir pipcache --no-deps openvino openvino-dev nncf + python -m pip install --cache-dir pipcache --no-deps openvino nncf cp -r pipcache pipcache_openvino - python -m pip uninstall -y openvino openvino-dev nncf + python -m pip uninstall -y openvino nncf - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/Makefile b/Makefile index e6f05b1cb84..4ee9937815d 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ cache_openvino_packages: @echo Cache openvino packages @. $(ACTIVATE); python -m pip install --upgrade pip mkdir pipcache - @. $(ACTIVATE); python -m pip install --cache-dir pipcache --no-deps openvino openvino-dev nncf + @. $(ACTIVATE); python -m pip install --cache-dir pipcache --no-deps openvino nncf cp -r pipcache pipcache_openvino - @. $(ACTIVATE); python -m pip uninstall -y openvino openvino-dev nncf + @. $(ACTIVATE); python -m pip uninstall -y openvino nncf install_dependencies: @echo Installing dependencies diff --git a/check_install.py b/check_install.py index 78a02184e4f..f544c88cff2 100644 --- a/check_install.py +++ b/check_install.py @@ -82,12 +82,6 @@ def kernel_check(): OPENVINO_IMPORT = False -DEVTOOLS_INSTALLED = True -try: - from openvino.tools.mo import mo # OpenVINO 2022.1 -except ImportError: - DEVTOOLS_INSTALLED = False - print("System information:") print(f"Python executable: {PYTHON_EXECUTABLE}") @@ -103,7 +97,6 @@ def kernel_check(): print(f"Python version: {PYTHON_VERSION.major}.{PYTHON_VERSION.minor} " f"{show_supported(SUPPORTED_PYTHON_VERSION)}") print(f"OpenVINO pip package installed: {show_supported(PIP_OPENVINO_INSTALLED)}") print(f"OpenVINO import succeeds: {show_supported(OPENVINO_IMPORT)}") -print(f"OpenVINO development tools installed: {show_supported(DEVTOOLS_INSTALLED)}") print(f"OpenVINO not installed globally: {show_supported(not GLOBAL_OPENVINO_INSTALLED)}") print(f"No broken requirements: {show_supported(NO_BROKEN_REQUIREMENTS)}") @@ -185,7 +178,7 @@ def kernel_check(): if not DEVTOOLS_INSTALLED: print() print( - "OpenVINO development tools are not installed in this Python environment. \n" "Please follow the instructions in the README to install `openvino-dev`\n" + "OpenVINO development tools are not installed in this Python environment. \n" "Please follow the instructions in the README to install `openvino`\n" ) if not NO_BROKEN_REQUIREMENTS: @@ -198,7 +191,6 @@ def kernel_check(): IN_OPENVINO_ENV and PIP_OPENVINO_INSTALLED and OPENVINO_IMPORT - and DEVTOOLS_INSTALLED and SUPPORTED_PYTHON_VERSION and KERNEL_INSTALLED and CORRECT_KERNEL_PYTHON diff --git a/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb b/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb index 76f00fcec7c..1ec4b704571 100644 --- a/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb +++ b/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb @@ -27,7 +27,7 @@ "\n", "- `requests` - for getting books\n", "- `pysbd` - for splitting sentences\n", - "- `transformers[torch]` and `openvino_dev` - for getting sentence embeddings\n", + "- `transformers[torch]` and `openvino` - for getting sentence embeddings\n", "- `seaborn` - for alignment matrix visualization\n", "- `ipywidgets` - for displaying HTML and JS output in the notebook \n", "\n", diff --git a/notebooks/yolov10-optimization/yolov10-optimization.ipynb b/notebooks/yolov10-optimization/yolov10-optimization.ipynb index 70496c5d0c6..112d1adda94 100644 --- a/notebooks/yolov10-optimization/yolov10-optimization.ipynb +++ b/notebooks/yolov10-optimization/yolov10-optimization.ipynb @@ -72,25 +72,12 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "id": "bf76580b-860a-4dcd-8b01-f494cdffe37e", "metadata": { "tags": [] }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "\u001b[33mWARNING: Skipping openvino as it is not installed.\u001b[0m\u001b[33m\n", - "\u001b[0m\u001b[33mWARNING: Skipping openvino-dev as it is not installed.\u001b[0m\u001b[33m\n", - "\u001b[0mNote: you may need to restart the kernel to use updated packages.\n", - "Note: you may need to restart the kernel to use updated packages.\n", - "Note: you may need to restart the kernel to use updated packages.\n", - "Note: you may need to restart the kernel to use updated packages.\n" - ] - } - ], + "outputs": [], "source": [ "import os\n", "\n",