[NVIDIA] Rename test binaries (openvinotoolkit#684)

sunxiaoxia2022 · Jul 17, 2023 · db0566f · db0566f
1 parent 7a4782d
commit db0566f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/.ci/azure/linux_cuda.yml b/.ci/azure/linux_cuda.yml
@@ -103,7 +103,7 @@ jobs:
     displayName: 'Install dependencies'
 
   - script: >
-      sudo docker pull openvino.azurecr.io/openvino_ci/cuda-ubuntu2004:2022.1 && 
+      sudo docker pull openvino.azurecr.io/openvino_ci/cuda-ubuntu2004:2022.1 &&
       sudo docker run --volume $(REPO_DIR)/../:/root/repos --volume $(WORK_DIR):/root/w
       openvino.azurecr.io/openvino_ci/cuda-ubuntu2004:2022.1
       bash -c "
@@ -125,7 +125,7 @@ jobs:
       -DENABLE_NVIDIA=ON
       -DENABLE_TESTS=ON
       /root/repos/openvino &&
-      /root/w/ninja -v CudaFuncTests CudaUnitTests"
+      /root/w/ninja -v ov_nvidia_func_tests ov_nvidia_unit_tests"
     workingDirectory: $(WORK_DIR)
     displayName: 'Docker build Lin'
 

diff --git a/.github/workflows/sanitizer_cuda.yml b/.github/workflows/sanitizer_cuda.yml
@@ -29,6 +29,6 @@ jobs:
     - name: cmake
       run: env -C ~/runner ./configure_cuda_sanitizer.sh
     - name: ninja
-      run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/build_cuda_sanitizer -v CudaFuncTests CudaUnitTests' | make -j`nproc` -f-
+      run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/build_cuda_sanitizer -v ov_nvidia_func_tests ov_nvidia_unit_tests' | make -j`nproc` -f-
     - name: functional tests
-      run: env -C ~/runner PATH=/usr/local/cuda-11.2/bin:/usr/local/cuda-11.4/bin:/usr/local/cuda-11.7/bin:$PATH ./openvino_contrib/modules/nvidia_plugin/utils/cuda-sanitizer.sh ./build_cuda_sanitizer/bin/intel64/CudaFuncTests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*:smoke_GRU*:smoke_LSTM*:smoke_TensorIterator*:*ConvBiasFusion*:*smoke*OVExecGraphImportExportTest.importExportedIENetwork*:*smoke*OVClassBasicTestP.registerNewPluginNoThrows*:*smoke*OVHoldersTest.Orders*:*smoke*IEClassBasicTestP.registerNewPluginNoThrows*:*smoke*IEClassBasicTestP.smoke_registerPluginsXMLUnicodePath*
+      run: env -C ~/runner PATH=/usr/local/cuda-11.2/bin:/usr/local/cuda-11.4/bin:/usr/local/cuda-11.7/bin:$PATH ./openvino_contrib/modules/nvidia_plugin/utils/cuda-sanitizer.sh ./build_cuda_sanitizer/bin/intel64/ov_nvidia_func_tests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*:smoke_GRU*:smoke_LSTM*:smoke_TensorIterator*:*ConvBiasFusion*:*smoke*OVExecGraphImportExportTest.importExportedIENetwork*:*smoke*OVClassBasicTestP.registerNewPluginNoThrows*:*smoke*OVHoldersTest.Orders*:*smoke*IEClassBasicTestP.registerNewPluginNoThrows*:*smoke*IEClassBasicTestP.smoke_registerPluginsXMLUnicodePath*
diff --git a/.github/workflows/test_cuda.yml b/.github/workflows/test_cuda.yml
@@ -29,19 +29,19 @@ jobs:
     - name: cmake
       run: env -C ~/runner ./configrelease.sh
     - name: ninja
-      run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/buildrelease -v CudaFuncTests CudaUnitTests benchmark_app' | make -j`nproc` -f-
+      run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/buildrelease -v ov_nvidia_func_tests ov_nvidia_unit_tests benchmark_app' | make -j`nproc` -f-
     - name: functional tests
-      run: source ~/runner/sanitizer-env.sh; ~/runner/buildrelease/bin/intel64/CudaFuncTests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*
+      run: source ~/runner/sanitizer-env.sh; ~/runner/buildrelease/bin/intel64/ov_nvidia_func_tests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*
     - name: unit tests
-      run: source ~/runner/sanitizer-env.sh; ~/runner/buildrelease/bin/intel64/CudaUnitTests
+      run: source ~/runner/sanitizer-env.sh; ~/runner/buildrelease/bin/intel64/ov_nvidia_unit_tests
     - name: networks regression
       run: source ~/runner/sanitizer-env.sh; ~/runner/run_all_models.sh
     - name: cmake 440
       run: ~/docker/e440.sh ./configrelease-440.sh
     - name: ninja 440
-      run: ~/docker/e440.sh ./buildrelease-440.sh CudaUnitTests
+      run: ~/docker/e440.sh ./buildrelease-440.sh ov_nvidia_unit_tests
     - name: unit tests 440
-      run: ~/docker/e440.sh buildrelease-440/bin/intel64/CudaUnitTests
+      run: ~/docker/e440.sh buildrelease-440/bin/intel64/ov_nvidia_unit_tests
 # many functional tests use missing operations, just skip everything for now
 #    - name: functional tests
-#      run: ~/docker/e440.sh buildrelease-440/bin/intel64/CudaFuncTests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*
+#      run: ~/docker/e440.sh buildrelease-440/bin/intel64/ov_nvidia_func_tests --gtest_filter=*smoke*:-*dynamic*:*Dynamic*
diff --git a/modules/nvidia_plugin/build.sh b/modules/nvidia_plugin/build.sh
@@ -9,7 +9,7 @@ fi
 
 BUILD_JOBS=${BUILD_JOBS:-$(nproc)}
 BUILD_TYPE=${BUILD_TYPE:-Release}
-BUILD_TARGETS=${BUILD_TARGETS:-"CudaFuncTests CudaUnitTests openvino_nvidia_gpu_plugin benchmark_app"}
+BUILD_TARGETS=${BUILD_TARGETS:-"ov_nvidia_func_tests ov_nvidia_unit_tests openvino_nvidia_gpu_plugin benchmark_app"}
 WHEEL_VERSION=${WHEEL_VERSION:-"2022.3.0"}
 ENABLE_TESTS=${ENABLE_TESTS:-"ON"}
 

diff --git a/modules/nvidia_plugin/tests/functional/CMakeLists.txt b/modules/nvidia_plugin/tests/functional/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 
 # [cmake:functional_tests]
-set(TARGET_NAME CudaFuncTests)
+set(TARGET_NAME ov_nvidia_func_tests)
 
 if (ENABLE_INTEL_CPU)
     set(OPENVINO_ADDITIONAL_DEPENDENCIES openvino_intel_cpu_plugin)

diff --git a/modules/nvidia_plugin/tests/unit/CMakeLists.txt b/modules/nvidia_plugin/tests/unit/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(TARGET_NAME CudaUnitTests)
+set(TARGET_NAME ov_nvidia_unit_tests)
 
 set(EXCLUDED_SOURCE_PATHS)
 if(${CUDAToolkit_VERSION_MAJOR} EQUAL 10)

diff --git a/modules/nvidia_plugin/utils/lsan-suppressions.txt b/modules/nvidia_plugin/utils/lsan-suppressions.txt
@@ -34,7 +34,7 @@ leak:site-packages/google/protobuf
 # THIS SECTION defines all other exceptions including those required by nvidia_gpu.
 #
 
-# The folowing are reproduced running CudaUnitTests
+# The folowing are reproduced running ov_nvidia_unit_tests
 leak:libtbb.so
 leak:InferenceEngine::CPUStreamsExecutor
 

diff --git a/modules/nvidia_plugin/utils/pre-push-impl.sh b/modules/nvidia_plugin/utils/pre-push-impl.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # cmake build targets / test suities to run
-SUITES=(CudaUnitTests CudaFuncTests)
-declare -A SUITES_ARGS=( ["CudaFuncTests"]='--gtest_filter=*smoke_*:-*Hetero*')
+SUITES=(ov_nvidia_unit_tests ov_nvidia_func_tests)
+declare -A SUITES_ARGS=( ["ov_nvidia_func_tests"]='--gtest_filter=*smoke_*:-*Hetero*')
 
 # $EXIT_CODE variable
 EXIT_CODE=0