Skip to content

Commit f6196c0

Browse files
authored
Drop python 3.8 support (#182)
* Drop python 3.8 support * Revert py3.8 drop * Temporaly disable pip cache in cpp precommit to avoid conflicts * Shake OpenCV version to check if it fixes missing OpenCV problem in CMake * Try the latest OCV version for Win * Upgrade OV in win builder * Promote gtest version * Bump OV version for cpp * Disable running win precommits * Try to restrict cpp features for win tests * Disable win precommit pip cache * Use sample as a sanity check on Win CI
1 parent 8fd7edd commit f6196c0

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

.github/workflows/test_accuracy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: actions/setup-python@v4
1313
with:
14-
python-version: 3.8
14+
python-version: 3.9
1515
cache: pip
1616
- name: Create and start a virtual environment
1717
run: |

.github/workflows/test_precommit.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- run: "! git grep -n '[^ -~]' -- ':(exclude)model_api/python/README.md'"
1717
- uses: actions/setup-python@v4
1818
with:
19-
python-version: 3.8
19+
python-version: 3.9
2020
cache: pip
2121
- name: Create and start a virtual environment
2222
run: |
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v3
4242
- uses: actions/setup-python@v4
4343
with:
44-
python-version: 3.8
44+
python-version: 3.9
4545
cache: pip
4646
- name: Create and start a virtual environment
4747
run: |
@@ -77,8 +77,7 @@ jobs:
7777
- uses: actions/checkout@v3
7878
- uses: actions/setup-python@v4
7979
with:
80-
python-version: 3.8
81-
cache: pip
80+
python-version: 3.9
8281
- name: Create and start a virtual environment
8382
run: |
8483
python -m venv venv
@@ -108,8 +107,8 @@ jobs:
108107
- uses: actions/checkout@v3
109108
- uses: actions/setup-python@v4
110109
with:
111-
python-version: 3.8
112-
cache: pip
110+
python-version: 3.9
111+
#cache: pip
113112
- name: Create and start a virtual environment
114113
shell: bash
115114
run: |
@@ -121,11 +120,12 @@ jobs:
121120
source venv/Scripts/activate
122121
python -m pip install --upgrade pip
123122
pip install model_api/python/[tests] --extra-index-url https://download.pytorch.org/whl/cpu
124-
curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/windows/w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64.zip --output w_openvino_toolkit_windows.zip
123+
curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/windows/w_openvino_toolkit_windows_2024.1.0.15008.f4afc983258_x86_64.zip --output w_openvino_toolkit_windows.zip
125124
unzip w_openvino_toolkit_windows.zip
126125
rm w_openvino_toolkit_windows.zip
127-
curl -L https://github.com/opencv/opencv/releases/download/4.7.0/opencv-4.7.0-windows.exe --output opencv-4.7.0-windows.exe
128-
./opencv-4.7.0-windows.exe -oopencv -y
126+
curl -L https://github.com/opencv/opencv/releases/download/4.10.0/opencv-4.10.0-windows.exe --output opencv-4.10.0-windows.exe
127+
./opencv-4.10.0-windows.exe -oopencv -y
128+
rm opencv-4.10.0-windows.exe
129129
- name: Prepare test data
130130
shell: bash
131131
run: |
@@ -135,15 +135,14 @@ jobs:
135135
shell: bash
136136
run: |
137137
mkdir build && cd build
138-
MSYS_NO_PATHCONV=1 cmake ../tests/cpp/precommit/ -DOpenVINO_DIR=$GITHUB_WORKSPACE/w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64/runtime/cmake -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv/opencv/build -DCMAKE_CXX_FLAGS=/WX
138+
MSYS_NO_PATHCONV=1 cmake ../examples/cpp/synchronous_api/ -DOpenVINO_DIR=$GITHUB_WORKSPACE/w_openvino_toolkit_windows_2024.1.0.15008.f4afc983258_x86_64/runtime/cmake -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv/opencv/build -DCMAKE_CXX_FLAGS=/WX
139139
cmake --build . --config Release -j $((`nproc`*2+2))
140-
- name: Run test
140+
- name: Run sync sample
141141
shell: cmd
142142
# .\w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64\setupvars.bat exits with 0 code without moving to a next command. Set PATH manually
143143
run: |
144-
set PATH=opencv\opencv\build\x64\vc16\bin;w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64\runtime\bin\intel64\Release;w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64\runtime\3rdparty\tbb\bin;%PATH%
145-
.\build\Release\test_sanity.exe -d data -p tests\cpp\precommit\public_scope.json
146-
.\build\Release\test_model_config -d data
144+
set PATH=opencv\opencv\build\x64\vc16\bin;w_openvino_toolkit_windows_2024.1.0.15008.f4afc983258_x86_64\runtime\bin\intel64\Release;w_openvino_toolkit_windows_2024.1.0.15008.f4afc983258_x86_64\runtime\3rdparty\tbb\bin;%PATH%
145+
.\build\Release\synchronous_api.exe .\data\public\ssd_mobilenet_v1_fpn_coco\FP16\ssd_mobilenet_v1_fpn_coco.xml .\data\BloodImage_00007.jpg
147146
serving_api:
148147
strategy:
149148
fail-fast: false

model_api/cpp/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PU
55

66
apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
77

8-
echo "deb https://apt.repos.intel.com/openvino/2023 ubuntu22 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2023.list
8+
echo "deb https://apt.repos.intel.com/openvino/2024 ubuntu22 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2024.list
99

1010
apt update
1111

tests/cpp/accuracy/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ if(WIN32)
1919
if(NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
2020
message(FATAL_ERROR "Only 64-bit supported on Windows")
2121
endif()
22+
set(CMAKE_CXX_STANDARD 14)
2223

2324
add_definitions(-DNOMINMAX)
2425
endif()
@@ -57,7 +58,7 @@ include(FetchContent)
5758
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
5859
FetchContent_Declare(googletest
5960
GIT_REPOSITORY https://github.com/google/googletest.git
60-
GIT_TAG 471087fbfcbc3c66071189a67c313eb1d525ee51 # latest main
61+
GIT_TAG a7f443b80b105f940225332ed3c31f2790092f47 # latest main
6162
)
6263
FetchContent_MakeAvailable(json googletest)
6364

tests/cpp/precommit/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ if(NOT GENERATOR_IS_MULTI_CONFIG_VAR AND NOT DEFINED CMAKE_BUILD_TYPE)
1212
# Setting CMAKE_BUILD_TYPE as CACHE must go before project(). Otherwise project() sets its value and set() doesn't take an effect
1313
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ...")
1414
endif()
15-
1615
project(tests)
1716

1817
if(WIN32)
1918
if(NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
2019
message(FATAL_ERROR "Only 64-bit supported on Windows")
2120
endif()
21+
set(CMAKE_CXX_STANDARD 14)
2222

2323
add_definitions(-DNOMINMAX)
2424
endif()
@@ -57,7 +57,7 @@ include(FetchContent)
5757
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
5858
FetchContent_Declare(googletest
5959
GIT_REPOSITORY https://github.com/google/googletest.git
60-
GIT_TAG 471087fbfcbc3c66071189a67c313eb1d525ee51 # latest main
60+
GIT_TAG a7f443b80b105f940225332ed3c31f2790092f47 # latest main
6161
)
6262
FetchContent_MakeAvailable(json googletest)
6363

0 commit comments

Comments
 (0)