Skip to content

Commit

Permalink
Merge branch 'master' into segfault_py
Browse files Browse the repository at this point in the history
  • Loading branch information
akuporos authored Sep 20, 2024
2 parents af81cf1 + 423ebd2 commit cf7cb49
Show file tree
Hide file tree
Showing 247 changed files with 13,741 additions and 8,041 deletions.
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26588
pr-26586
14 changes: 7 additions & 7 deletions .github/dockerfiles/ov_build/fedora_29/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RUN chmod +x /install_build_dependencies.sh && \

# Setup Python
RUN cd /usr/src && \
wget https://www.python.org/ftp/python/3.8.9/Python-3.8.9.tar.xz && \
tar xvf Python-3.8.9.tar.xz
RUN cd /usr/src/Python-3.8.9 && \
wget https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz && \
tar xvf Python-3.9.9.tar.xz
RUN cd /usr/src/Python-3.9.9 && \
./configure --enable-optimizations --enable-loadable-sqlite-extensions --prefix=/usr && \
make altinstall

Expand All @@ -46,15 +46,15 @@ RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \

ENV PATH="$SCCACHE_HOME:$PATH"

# Use Python 3.8 as default
RUN python3.8 -m venv venv
# Use Python 3.9 as default
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"
RUN alternatives --install /usr/bin/python python /usr/bin/python3.8 10
RUN alternatives --install /usr/bin/python python /usr/bin/python3.9 10

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3.8 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
Expand Down
13 changes: 12 additions & 1 deletion .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Pythons
python3.9-dev \
python3.9-venv \
python3.9-distutils \
# For Java API
default-jdk \
# Compiler \
Expand Down Expand Up @@ -51,10 +55,17 @@ RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}

ENV PATH="$SCCACHE_HOME:$PATH"

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$SCCACHE_HOME:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/fedora:32
FROM ${REGISTRY}/library/fedora:33

USER root

Expand Down
11 changes: 11 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Python
python3.9-dev \
python3.9-venv \
python3.9-distutils \
libhdf5-dev \
&& \
rm -rf /var/lib/apt/lists/*
Expand All @@ -36,6 +40,13 @@ RUN chmod +x /install_openvino_dependencies.sh && \
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
ENV PIP_INSTALL_PATH=/venv/lib/python3.9/site-packages
8 changes: 8 additions & 0 deletions .github/scripts/workflow_rerun/errors_to_look_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,13 @@
{
"error_text": "Unable to make request: ECONNRESET",
"ticket": 148702
},
{
"error_text": "json.decoder.JSONDecodeError: Unterminated string starting at",
"ticket": 151796
},
{
"error_text": "lost communication with the server",
"ticket": 152565
}
]
6 changes: 3 additions & 3 deletions .github/workflows/fedora_29.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fedora 29 (RHEL 8.4), Python 3.8
name: Fedora 29 (RHEL 8.4), Python 3.9
on:
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
with:
images: |
ov_build/fedora_29
ov_test/fedora_32
ov_test/fedora_33
registry: 'openvinogithubactions.azurecr.io'
dockerfiles_root_dir: '.github/dockerfiles'
changed_components: ${{ needs.smart_ci.outputs.changed_components }}
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
shell: bash
runs-on: aks-linux-4-cores-16gb
container:
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.fedora_32 }}
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.fedora_33 }}
env:
RPM_PACKAGES_DIR: /__w/openvino/packages/

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
${{ env.OPENVINO_REPO }}
${{ env.OPENVINO_CONTRIB_REPO }}
product_type: ${{ env.PRODUCT_TYPE }}
target_arch: 'intel64'
target_arch: ${{ inputs.arch }}
build_type: 'release'
save_to: ${{ env.MANIFEST_PATH }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/job_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
${{ env.OPENVINO_REPO }}
${{ env.OPENVINO_CONTRIB_REPO }}
product_type: ${{ env.PRODUCT_TYPE }}
target_arch: 'intel64'
target_arch: 'x86_64'
build_type: ${{ inputs.build-type }}
save_to: ${{ env.MANIFEST_PATH }}

Expand Down Expand Up @@ -156,10 +156,10 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ runner.arch }}-ccache
- name: Configure Developer Command Prompt for Microsoft Visual C++
- name: Configure Developer Command Prompt for Microsoft Visual C++ (2019)
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.40
toolset: 14.29

- name: Set SSL_CERT_FILE for model downloading for unit tests
run: echo SSL_CERT_FILE=$(python3 -m certifi) >> $env:GITHUB_ENV
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/job_cxx_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ permissions: read-all
jobs:
CXX_Unit_Tests:
name: C++ unit tests
timeout-minutes: ${{ contains(inputs.runner, 'win') && 50 || 30 }}
timeout-minutes: ${{ contains(inputs.runner, 'win') && 50 || 35 }}
runs-on: ${{ inputs.runner }}
container:
image: ${{ inputs.image }}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
pushd $INSTALL_TEST_DIR
tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
popd
- name: Extract OpenVINO packages (Windows)
if: ${{ runner.os == 'Windows' }}
run: |
Expand All @@ -79,7 +79,7 @@ jobs:
pushd ${{ env.INSTALL_TEST_DIR }}
Expand-Archive openvino_tests.zip -DestinationPath "${{ env.INSTALL_DIR }}"
popd
#
# Tests
#
Expand All @@ -106,7 +106,7 @@ jobs:
if: fromJSON(inputs.affected-components).LP_transformations.test
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_lp_transformations_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-LpTransformations.xml
- name: OpenVINO Conditional compilation tests
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
- name: TensorFlow Common frontend tests
if: fromJSON(inputs.affected-components).TF_FE.test ||
fromJSON(inputs.affected-components).TFL_FE.test &&
fromJSON(inputs.affected-components).TFL_FE.test &&
(runner.os != 'macOS' && runner.arch != 'ARM64')
run: |
${{ env.SETUPVARS_COMMAND }}
Expand All @@ -145,7 +145,7 @@ jobs:
if: fromJSON(inputs.affected-components).TF_FE.test
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-TensorFlowFrontend.xml
- name: TensorFlow Lite frontend tests
Expand All @@ -158,7 +158,7 @@ jobs:
if: ${{ fromJSON(inputs.affected-components).transformations.test && runner.arch != 'ARM64' }} # Ticket: 126281
run: |
${{ env.SETUPVARS_COMMAND }}
${{ env.INSTALL_TEST_DIR }}/ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-Transformations.xml
- name: Common test utils tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_openvino_js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Setup Node ${{ env.NODE_VERSION }}
if: runner.os != 'Linux' # Node is already installed in the Docker image
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: ${{ env.NODE_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_python_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ jobs:

- name: TensorFlow Lite Layer Tests - TFL FE
if: fromJSON(inputs.affected-components).TFL_FE.test
run: python3 -m pytest ${LAYER_TESTS_INSTALL_DIR}/tensorflow_lite_tests/ --junitxml=${INSTALL_TEST_DIR}/TEST-tfl_fe.xml
run: python3 -m pytest ${LAYER_TESTS_INSTALL_DIR}/tensorflow_lite_tests/ -n logical --junitxml=${INSTALL_TEST_DIR}/TEST-tfl_fe.xml
env:
TEST_DEVICE: CPU
TEST_PRECISION: FP16
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/job_samples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ jobs:
version: '3.11'
should-setup-pip-paths: 'false'

- name: Build cpp samples - GCC
- name: Configure Developer Command Prompt for Microsoft Visual C++ (2022)
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.40

- name: Build cpp samples
run: $INSTALL_DIR/samples/cpp/build_samples.sh -i $INSTALL_DIR -b $BUILD_DIR/cpp_samples
env:
CMAKE_COMPILE_WARNING_AS_ERROR: 'ON'
Expand Down
Loading

0 comments on commit cf7cb49

Please sign in to comment.