Skip to content

Commit

Permalink
remove ov dev install in workflow files (#2560)
Browse files Browse the repository at this point in the history
  • Loading branch information
eaidova authored Nov 27, 2024
1 parent 9af6200 commit 57854dc
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_treon_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/convert_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/install_requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions check_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand All @@ -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)}")
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 2 additions & 15 deletions notebooks/yolov10-optimization/yolov10-optimization.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 57854dc

Please sign in to comment.