use simpler inputs for install action

openvinotoolkit · Nov 12, 2024 · 320187d · 320187d
1 parent 64b811c
commit 320187d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 40 deletions.
diff --git a/.github/actions/install_ov_wheels/action.yml b/.github/actions/install_ov_wheels/action.yml
@@ -4,41 +4,18 @@ inputs:
   wheels-dir-path:
     description: 'Path to the directory in which wheels are located'
     required: true
-  install-core-wheel:
-    description: 'Whether to install the OpenVINO Core wheel (openvino-*.whl)'
-    required: true
-  install-tokenizers-wheel:
-    description: 'Whether to install the OpenVINO Dev wheel (openvino_tokenizes*.whl)'
+  wheels-to-install:
+    description: 'List of wheel names to install in the form of "openvino openvino-dev openvino-tokenizers"'
     required: true
 runs:
   using: 'composite'
   steps:
     - name: Install OpenVINO Python wheels (Windows)
       shell: pwsh
       if: runner.os == 'Windows'
-      run: |
-        if ( "${{ inputs.install-core-wheel }}" -eq "true" )
-        {
-            $pyVersion = python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')"
-            $ovCoreWheelPath = Get-ChildItem -Path ${{ inputs.wheels-dir-path }} -Filter "openvino-*cp$pyVersion*.whl" | % { $_.FullName }
-            python3 -m pip install $ovCoreWheelPath
-        }
-        
-        if ( "${{ inputs.install-tokenizers-wheel }}" -eq "true" )
-        {
-            $ovTokenizersWheelPath = Get-ChildItem -Path ${{ inputs.wheels-dir-path }} -Filter openvino_tokenizers-*.whl | % { $_.FullName }
-            python3 -m pip install "$ovTokenizersWheelPath"
-        }
+      run: python3 -m pip install ${{ inputs.wheels-to-install }} --find-links ${{ inputs.wheels-dir-path }} --no-index --no-cache
+
     - name: Install OpenVINO Python wheels (Linux and macOS)
       shell: bash
       if: runner.os != 'Windows'
-      run: |
-        if [[ "${{ inputs.install-core-wheel }}" == "true" ]]; then
-          py_version=$(python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
-          ov_wheel_path=$(find ${{ inputs.wheels-dir-path }} -name "openvino-*cp$py_version*.whl")
-          python3 -m pip install $ov_wheel_path
-        fi
-        
-        if [[ "${{ inputs.install-tokenizers-wheel }}" == "true" ]]; then
-          python3 -m pip install ${{ inputs.wheels-dir-path }}/openvino_tokenizers-*.whl
-        fi
+      run: python3 -m pip install ${{ inputs.wheels-to-install }} --find-links ${{ inputs.wheels-dir-path }} --no-index --no-cache
diff --git a/.github/workflows/job_pytorch_layer_tests.yml b/.github/workflows/job_pytorch_layer_tests.yml
@@ -105,8 +105,7 @@ jobs:
         uses: ./openvino/.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: false
+          wheels-to-install: 'openvino'
 
       - name: Install Pytorch Layer tests dependencies
         run: |

diff --git a/.github/workflows/job_tensorflow_layer_tests.yml b/.github/workflows/job_tensorflow_layer_tests.yml
@@ -105,8 +105,7 @@ jobs:
         uses: ./openvino/.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: true
+          wheels-to-install: 'openvino openvino-tokenizers'
 
       - name: Install Python Layer tests dependencies
         run: |

diff --git a/.github/workflows/job_tokenizers.yml b/.github/workflows/job_tokenizers.yml
@@ -99,8 +99,7 @@ jobs:
         uses: ./.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: false
+          wheels-to-install: 'openvino'
 
       #
       # Build

diff --git a/.github/workflows/windows_vs2019_release.yml b/.github/workflows/windows_vs2019_release.yml
@@ -142,8 +142,7 @@ jobs:
         uses: ./openvino/.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: false
+          wheels-to-install: 'openvino'
 
       - name: Samples tests
         run: |
@@ -302,8 +301,7 @@ jobs:
         uses: ./openvino/.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: false
+          wheels-to-install: 'openvino'
 
       - name: Install Python API tests dependencies
         run: |
@@ -464,8 +462,7 @@ jobs:
         uses: ./openvino/.github/actions/install_ov_wheels
         with:
           wheels-dir-path: ${{ env.INSTALL_WHEELS_DIR }}
-          install-core-wheel: true
-          install-tokenizers-wheel: false
+          wheels-to-install: 'openvino'
 
       - name: Install Python API tests dependencies
         run: python3 -m pip install -r ${{ env.INSTALL_TEST_DIR }}/bindings/python/requirements_test.txt