[CONFORMANCE] Remove old-named conformance exec files (#21128)
* [CONFORMANCE] Remove old-named conformance exec files * fix_GHA
This commit is contained in:
parent
aaddfb3a00
commit
4237de6bf1
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -833,7 +833,7 @@ jobs:
|
|||||||
- name: Template OpImpl tests
|
- name: Template OpImpl tests
|
||||||
run: |
|
run: |
|
||||||
source ${INSTALL_DIR}/setupvars.sh
|
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
|
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-OpImplTests.xml
|
||||||
|
|
||||||
- name: AUTO unit tests
|
- name: AUTO unit tests
|
||||||
|
2
.github/workflows/mac.yml
vendored
2
.github/workflows/mac.yml
vendored
@ -466,7 +466,7 @@ jobs:
|
|||||||
- name: Template OpImpl tests
|
- name: Template OpImpl tests
|
||||||
run: |
|
run: |
|
||||||
source ${{ env.INSTALL_DIR }}/setupvars.sh
|
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
|
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-TemplateOpImplTests.xml
|
||||||
|
|
||||||
- name: AUTO unit tests
|
- name: AUTO unit tests
|
||||||
|
2
.github/workflows/windows.yml
vendored
2
.github/workflows/windows.yml
vendored
@ -607,7 +607,7 @@ jobs:
|
|||||||
- name: Template OpImpl tests
|
- name: Template OpImpl tests
|
||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
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
|
- name: GNA plugin unit tests
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
set(OLD_TARGET_NAME subgraphsDumper)
|
|
||||||
set(TARGET_NAME ov_subgraphs_dumper)
|
set(TARGET_NAME ov_subgraphs_dumper)
|
||||||
|
|
||||||
list(APPEND LIBRARIES
|
list(APPEND LIBRARIES
|
||||||
@ -27,25 +26,6 @@ ov_add_test_target(
|
|||||||
ADD_CPPLINT
|
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
|
# add subgraphs_dumpers lib to get API
|
||||||
ov_add_target(
|
ov_add_target(
|
||||||
NAME "${TARGET_NAME}_util"
|
NAME "${TARGET_NAME}_util"
|
||||||
@ -67,4 +47,3 @@ ov_add_target(
|
|||||||
)
|
)
|
||||||
|
|
||||||
ov_build_target_faster(${TARGET_NAME} UNITY)
|
ov_build_target_faster(${TARGET_NAME} UNITY)
|
||||||
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)
|
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
set(OLD_TARGET_NAME subgraphsDumperTests)
|
|
||||||
set(TARGET_NAME ov_subgraphs_dumper_tests)
|
set(TARGET_NAME ov_subgraphs_dumper_tests)
|
||||||
|
|
||||||
ov_add_test_target(
|
ov_add_test_target(
|
||||||
@ -19,20 +18,4 @@ ov_add_test_target(
|
|||||||
OV UNIT
|
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(${TARGET_NAME} UNITY)
|
||||||
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)
|
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
set(OLD_TARGET_NAME apiConformanceTests)
|
|
||||||
set(TARGET_NAME ov_api_conformance_tests)
|
set(TARGET_NAME ov_api_conformance_tests)
|
||||||
|
|
||||||
ov_add_test_target(
|
ov_add_test_target(
|
||||||
@ -19,20 +18,4 @@ ov_add_test_target(
|
|||||||
OV API_CONFORMANCE
|
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(${TARGET_NAME} UNITY)
|
||||||
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)
|
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
set(OLD_TARGET_NAME conformanceTests)
|
|
||||||
set(TARGET_NAME ov_op_conformance_tests)
|
set(TARGET_NAME ov_op_conformance_tests)
|
||||||
|
|
||||||
ov_add_test_target(
|
ov_add_test_target(
|
||||||
@ -20,21 +19,4 @@ ov_add_test_target(
|
|||||||
OV OP_CONFORMANCE
|
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(${TARGET_NAME} UNITY)
|
||||||
ov_build_target_faster(${OLD_TARGET_NAME} UNITY)
|
|
||||||
|
@ -29,7 +29,7 @@ except:
|
|||||||
|
|
||||||
API_CONFORMANCE_BIN_NAME = "ov_api_conformance_tests"
|
API_CONFORMANCE_BIN_NAME = "ov_api_conformance_tests"
|
||||||
OP_CONFORMANCE_BIN_NAME = "ov_op_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__))
|
SCRIPT_DIR_PATH, SCRIPT_NAME = os.path.split(os.path.abspath(__file__))
|
||||||
NO_MODEL_CONSTANT = os.path.join(SCRIPT_DIR_PATH, "data", "models.lst")
|
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,
|
self._model_path = file_utils.prepare_filelist(self._model_path,
|
||||||
constants.SUPPORTED_MODEL_EXTENSION)
|
constants.SUPPORTED_MODEL_EXTENSION)
|
||||||
logger.info(f"Stating model dumping from {self._model_path}")
|
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)
|
process = Popen(cmd, shell=True)
|
||||||
out, err = process.communicate()
|
out, err = process.communicate()
|
||||||
if err is None:
|
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}")
|
logger.info(f"Conformance IRs were saved to {conformance_ir_path}")
|
||||||
else:
|
else:
|
||||||
logger.error(err)
|
logger.error(err)
|
||||||
|
Loading…
Reference in New Issue
Block a user