IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CONFORMANCE] Remove old-named conformance exec files (#21128)

Browse Source 
* [CONFORMANCE] Remove old-named conformance exec files

* fix_GHA
This commit is contained in:
Irina Efode 2023-11-21 17:06:05 +04:00 committed by GitHub
parent aaddfb3a00
commit 4237de6bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux.yml vendored
View File

@ -833,7 +833,7 @@ jobs:
- name: Template OpImpl tests
run: |
source ${INSTALL_DIR}/setupvars.sh
${INSTALL_TEST_DIR}/conformanceTests --gtest_print_time=1 --device=TEMPLATE --gtest_filter=*OpImpl*\
${INSTALL_TEST_DIR}/ov_op_conformance_tests --gtest_print_time=1 --device=TEMPLATE --gtest_filter=*OpImpl*\
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-OpImplTests.xml
- name: AUTO unit tests

2
.github/workflows/mac.yml vendored
View File

@ -466,7 +466,7 @@ jobs:
- name: Template OpImpl tests
run: |
source ${{ env.INSTALL_DIR }}/setupvars.sh
${{ env.INSTALL_TEST_DIR }}/conformanceTests --gtest_print_time=1 --device=TEMPLATE --gtest_filter="*OpImpl*" \
${{ env.INSTALL_TEST_DIR }}/ov_op_conformance_tests --gtest_print_time=1 --device=TEMPLATE --gtest_filter="*OpImpl*" \
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-TemplateOpImplTests.xml
- name: AUTO unit tests

2
.github/workflows/windows.yml vendored
View File

@ -607,7 +607,7 @@ jobs:
- name: Template OpImpl tests
shell: cmd
run: |
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/conformanceTests --gtest_print_time=1 --gtest_filter="*OpImpl*" --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-TemplateOpImplTests.xml
call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/ov_op_conformance_tests --gtest_print_time=1 --gtest_filter="*OpImpl*" --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-TemplateOpImplTests.xml
- name: GNA plugin unit tests
shell: cmd

21
src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt
View File

@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
#
set(OLD_TARGET_NAME subgraphsDumper)
set(TARGET_NAME ov_subgraphs_dumper)
list(APPEND LIBRARIES
@ -27,25 +26,6 @@ ov_add_test_target(
ADD_CPPLINT
)
# todo: remove the changes as the product config will be changed
# add subgraphs_dumpers tool
ov_add_test_target(
NAME ${OLD_TARGET_NAME}
TYPE EXECUTABLE
ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src
INCLUDES
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
LINK_LIBRARIES
PRIVATE
${LIBRARIES}
DEPENDENCIES
ov_frontends
${LIBRARIES}
ADD_CPPLINT
)
# add subgraphs_dumpers lib to get API
ov_add_target(
NAME "${TARGET_NAME}_util"
@ -67,4 +47,3 @@ ov_add_target(
)
ov_build_target_faster(${TARGET_NAME} UNITY)
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)

17
src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt
View File

@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
#
set(OLD_TARGET_NAME subgraphsDumperTests)
set(TARGET_NAME ov_subgraphs_dumper_tests)
ov_add_test_target(
@ -19,20 +18,4 @@ ov_add_test_target(
OV UNIT
)
# todo: remove as product config will be updated
ov_add_test_target(
NAME ${OLD_TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}/
LINK_LIBRARIES
PRIVATE
ov_subgraphs_dumper_util
func_test_utils
ADD_CPPLINT
LABELS
OV UNIT
)
ov_build_target_faster(${TARGET_NAME} UNITY)
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)

17
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt
View File

@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
#
set(OLD_TARGET_NAME apiConformanceTests)
set(TARGET_NAME ov_api_conformance_tests)
ov_add_test_target(
@ -19,20 +18,4 @@ ov_add_test_target(
OV API_CONFORMANCE
)
# todo: remove this target after merge to product config
ov_add_test_target(
NAME ${OLD_TARGET_NAME}
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/src"
ADD_CPPLINT
INCLUDES
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/include"
LINK_LIBRARIES
PUBLIC
conformance_shared
LABELS
OV API_CONFORMANCE
)
ov_build_target_faster(${TARGET_NAME} UNITY)
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)

18
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt
View File

@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
#
set(OLD_TARGET_NAME conformanceTests)
set(TARGET_NAME ov_op_conformance_tests)
ov_add_test_target(
@ -20,21 +19,4 @@ ov_add_test_target(
OV OP_CONFORMANCE
)
# todo: remove this target after merge to product config
ov_add_test_target(
NAME ${OLD_TARGET_NAME}
ROOT "${CMAKE_CURRENT_SOURCE_DIR}/src"
INCLUDES
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/include"
ADD_CPPLINT
LINK_LIBRARIES
PUBLIC
conformance_shared
op_conformance_utils
LABELS
OV OP_CONFORMANCE
)
ov_build_target_faster(${TARGET_NAME} UNITY)
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)

8
src/tests/test_utils/functional_test_utils/layer_tests_summary/run_conformance.py
View File

@ -29,7 +29,7 @@ except:
API_CONFORMANCE_BIN_NAME = "ov_api_conformance_tests"
OP_CONFORMANCE_BIN_NAME = "ov_op_conformance_tests"
SUBGRAPH_DUMPER_BIN_NAME = "ov_subgraphs_dumper_tests"
SUBGRAPH_DUMPER_BIN_NAME = "ov_subgraphs_dumper"
SCRIPT_DIR_PATH, SCRIPT_NAME = os.path.split(os.path.abspath(__file__))
NO_MODEL_CONSTANT = os.path.join(SCRIPT_DIR_PATH, "data", "models.lst")
@ -166,12 +166,12 @@ class Conformance:
self._model_path = file_utils.prepare_filelist(self._model_path,
constants.SUPPORTED_MODEL_EXTENSION)
logger.info(f"Stating model dumping from {self._model_path}")
cmd = f'{subgraph_dumper_path} --input_folders="{self._model_path}" --output_folder="{conformance_ir_path}"'
log_path = os.path.join(self._working_dir, "ov_subgraphs_dumper.log")
logger.info(f"ov_subgraphs_dumper.log will be saved to: {log_path}")
cmd = f'{subgraph_dumper_path} --input_folders="{self._model_path}" --output_folder="{conformance_ir_path}" > {log_path}'
process = Popen(cmd, shell=True)
out, err = process.communicate()
if err is None:
for line in str(out).split('\n'):
logger.info(line)
logger.info(f"Conformance IRs were saved to {conformance_ir_path}")
else:
logger.error(err)