find right wheels in other jobs

openvinotoolkit · Oct 3, 2024 · 74595fb · 74595fb
1 parent 9c1efc5
commit 74595fb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/job_onnx_models_tests.yml b/.github/workflows/job_onnx_models_tests.yml
@@ -86,8 +86,12 @@ jobs:
 
       - name: Install OpenVINO Python wheels
         run: |
-          # Install the core OV wheel
-          python3 -m pip install ${INSTALL_DIR}/tools/openvino-*.whl
+          # Find and install OV core wheel
+          pushd ${INSTALL_DIR}/tools
+            py_version=$(python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
+            ov_wheel_name=$(find . -name "openvino-*cp$py_version*.whl")
+            python3 -m pip install $ov_wheel_name
+          popd
 
           extras_to_install="onnx"
 

diff --git a/.github/workflows/job_samples_tests.yml b/.github/workflows/job_samples_tests.yml
@@ -120,9 +120,14 @@ jobs:
           export IE_APP_PATH=$INSTALL_DIR/samples_bin
           export IE_APP_PYTHON_PATH=$INSTALL_DIR/samples/python
           export SHARE=$INSTALL_TEST_DIR/smoke_tests/samples_smoke_tests_data
-
+          
           # Install Python benchmark_app by installing openvino-*.whl
-          python3 -m pip install --ignore-installed PyYAML -r $INSTALL_TEST_DIR/smoke_tests/requirements.txt $INSTALL_DIR/tools/openvino-*.whl
+          pushd ${INSTALL_DIR}/tools
+            py_version=$(python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
+            ov_wheel_name=$(find . -name "openvino-*cp$py_version*.whl")
+            python3 -m pip install --ignore-installed PyYAML -r $INSTALL_TEST_DIR/smoke_tests/requirements.txt $ov_wheel_name
+          popd
+          
           export LD_LIBRARY_PATH=${IE_APP_PATH}:$LD_LIBRARY_PATH
 
           source ${INSTALL_DIR}/setupvars.sh

diff --git a/.github/workflows/job_tokenizers.yml b/.github/workflows/job_tokenizers.yml
@@ -100,18 +100,22 @@ jobs:
       - name: Install OpenVINO Python wheel (Linux and macOS)
         if: runner.os != 'Windows'
         run: |
-          # Find and install wheel
+          # Find and install OV core wheel
           pushd ${INSTALL_DIR}/tools
-            wheel_name=$(find . -name 'openvino-*.whl')
-            python3 -m pip install $wheel_name
+            py_version=$(python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
+            ov_wheel_name=$(find . -name "openvino-*cp$py_version*.whl")
+            python3 -m pip install $ov_wheel_name
           popd
 
       - name: Install OpenVINO Python wheel (Windows)
         if: runner.os == 'Windows'
         run: |
-          # Find and install wheel
-          $ovCoreWheelPath=Get-ChildItem -Path "${{ env.INSTALL_DIR }}\\tools" -Filter openvino-*.whl | % { $_.FullName }
-          python3 -m pip install "$ovCoreWheelPath"
+          # Find and install OV core wheel
+          Push-Location "${INSTALL_DIR}\tools"
+            $py_version = python3 -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')"
+            $ov_wheel_name = Get-ChildItem -Name "openvino-*cp$py_version*.whl" -Recurse
+            python3 -m pip install $ov_wheel_name
+          Pop-Location
 
       #
       # Build