[CUDA] Renamed CUDAPlugin to NVIDIAPlugin (openvinotoolkit#405)

* Renamed CUDAPlugin to NVIDIA * Renamed cuda_plugin/ forlder to nvidia_plugin/ * Update sanitizer_cuda for testing. Should be removed git status * Add fetch master branch for proper working of Github Actions
sunxiaoxia2022 · Sep 1, 2022 · 103260e · 103260e
1 parent 69c1b7f
commit 103260e
Show file tree

Hide file tree

Showing 608 changed files with 2,922 additions and 2,295 deletions.
diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:
@@ -120,7 +120,7 @@ jobs:
         -DENABLE_SAMPLES=ON
         -DENABLE_INTEL_MYRIAD=OFF
         -DBUILD_java_api=ON
-        -DBUILD_cuda_plugin=OFF
+        -DBUILD_nvidia_plugin=OFF
         -DTHREADING=SEQ
         -DIE_EXTRA_MODULES=$(REPO_DIR)/modules
         $(OPENVINO_REPO_DIR)

diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:
@@ -122,7 +122,7 @@ jobs:
         -DVERBOSE_BUILD=ON
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DNGRAPH_ONNX_IMPORT_ENABLE=OFF
-        -DBUILD_cuda_plugin=OFF
+        -DBUILD_nvidia_plugin=OFF
         -DIE_EXTRA_MODULES=$(REPO_DIR)/modules
         -DENABLE_PYTHON=ON
         -DPYTHON_EXECUTABLE=/usr/bin/python3.8

diff --git a/.ci/azure/linux_arm64.yml b/.ci/azure/linux_arm64.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:
@@ -153,7 +153,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
         -DENABLE_SAMPLES=ON
         -DBUILD_java_api=OFF
-        -DBUILD_cuda_plugin=OFF
+        -DBUILD_nvidia_plugin=OFF
         -DENABLE_INTEL_MYRIAD=OFF
         -DTHREADING=SEQ
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules

diff --git a/.ci/azure/linux_coverity_arm64.yml b/.ci/azure/linux_coverity_arm64.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:

diff --git a/.ci/azure/linux_cuda.yml b/.ci/azure/linux_cuda.yml
@@ -5,7 +5,7 @@ trigger:
     - releases/*
   paths:
     include:
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -14,7 +14,7 @@ pr:
     - releases/*
   paths:
     include:
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:

diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:
@@ -104,7 +104,7 @@ jobs:
       # Disable errors with Ninja
       export CXXFLAGS="-Wno-error=unused-command-line-argument"
       export CFLAGS="-Wno-error=unused-command-line-argument"
-      cmake -GNinja -DVERBOSE_BUILD=ON -DNGRAPH_ONNX_IMPORT_ENABLE=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DBUILD_cuda_plugin=OFF -DIE_EXTRA_MODULES=$(REPO_DIR)/modules $(OPENVINO_REPO_DIR)
+      cmake -GNinja -DVERBOSE_BUILD=ON -DNGRAPH_ONNX_IMPORT_ENABLE=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DBUILD_nvidia_plugin=OFF -DIE_EXTRA_MODULES=$(REPO_DIR)/modules $(OPENVINO_REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 

diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml
@@ -6,7 +6,7 @@ trigger:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 pr:
   branches:
@@ -16,7 +16,7 @@ pr:
   paths:
     exclude:
     - modules/optimum
-    - modules/cuda_plugin
+    - modules/nvidia_plugin
 
 resources:
   repositories:
@@ -103,7 +103,7 @@ jobs:
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DNGRAPH_ONNX_IMPORT_ENABLE=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DBUILD_cuda_plugin=OFF -DIE_EXTRA_MODULES=$(REPO_DIR)/modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(OPENVINO_REPO_DIR)
+      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DNGRAPH_ONNX_IMPORT_ENABLE=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DBUILD_nvidia_plugin=OFF -DIE_EXTRA_MODULES=$(REPO_DIR)/modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(OPENVINO_REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - '**'
-      - '!modules/cuda_plugin/**'
+      - '!modules/nvidia_plugin/**'
   pull_request:
     paths:
       - '**'
-      - '!modules/cuda_plugin/**'
+      - '!modules/nvidia_plugin/**'
 
 jobs:
   Java:

diff --git a/.github/workflows/history_cuda.yml b/.github/workflows/history_cuda.yml
@@ -2,16 +2,18 @@ name: History CUDA
 on:
   push:
     paths:
-      - 'modules/cuda_plugin/**.*'
+      - 'modules/nvidia_plugin/**.*'
   pull_request:
     paths:
-      - 'modules/cuda_plugin/**.*'
+      - 'modules/nvidia_plugin/**.*'
 jobs:
   history:
     runs-on: lohika-ci
     steps:
     - name: checkout master branch
       run: git -C ~/runner/openvino_contrib checkout master
+    - name: fetch master branch
+      run: git -C ~/runner/openvino_contrib pull origin master
     - name: delete temporary branch
       run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
     - name: fetch

diff --git a/.github/workflows/sanitizer_cuda.yml b/.github/workflows/sanitizer_cuda.yml
@@ -4,7 +4,10 @@ on:
     branches:
       - master
     paths:
-      - 'modules/cuda_plugin/**.*'
+      - 'modules/nvidia_plugin/**.*'
+  pull_request:
+    paths:
+      - 'modules/nvidia_plugin/**.*'
   workflow_dispatch:
 
 jobs:
@@ -18,6 +21,8 @@ jobs:
       run: git -C ~/runner/openvino submodule update --init --recursive
     - name: checkout openvino_contrib master branch
       run: git -C ~/runner/openvino_contrib checkout master
+    - name: fetch openvino_contrib master branch
+      run: git -C ~/runner/openvino_contrib pull origin master
     - name: delete openvino_contrib temporary branch
       run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
     - name: fetch openvino_contrib
@@ -29,4 +34,4 @@ jobs:
     - name: ninja
       run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/build_cuda_sanitizer -v CudaFuncTests CudaUnitTests' | 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/cuda_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/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*
diff --git a/.github/workflows/test_cuda.yml b/.github/workflows/test_cuda.yml
@@ -2,10 +2,10 @@ name: Test CUDA
 on:
   push:
     paths:
-      - 'modules/cuda_plugin/**.*'
+      - 'modules/nvidia_plugin/**.*'
   pull_request:
     paths:
-      - 'modules/cuda_plugin/**.*'
+      - 'modules/nvidia_plugin/**.*'
 jobs:
   build:
     runs-on: lohika-ci
@@ -16,14 +16,16 @@ jobs:
       run: git -C ~/runner/openvino submodule update --init --recursive
     - name: checkout openvino_contrib master branch
       run: git -C ~/runner/openvino_contrib checkout master
+    - name: fetch openvino_contrib master branch
+      run: git -C ~/runner/openvino_contrib pull origin master
     - name: delete openvino_contrib temporary branch
       run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
     - name: fetch openvino_contrib
       run: git -C ~/runner/openvino_contrib fetch origin $GITHUB_REF:temporary-ci-branch
     - name: checkout openvino_contrib
       run: git -C ~/runner/openvino_contrib checkout temporary-ci-branch
     - name: format openvino_contrib
-      run: cd ~/runner/openvino_contrib && ./modules/cuda_plugin/utils/check.sh
+      run: cd ~/runner/openvino_contrib && ./modules/nvidia_plugin/utils/check.sh
     - name: cmake
       run: env -C ~/runner ./configrelease.sh
     - name: ninja

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ So, all the new modules should be developed separately, and published in the `op
 This list gives an overview of all modules available inside the contrib repository.
 
 * [**arm_plugin**](./modules/arm_plugin): ARM CPU Plugin -- allows to perform deep neural networks inference on ARM CPUs, using OpenVINO API.
-* [**cuda_plugin**](./modules/cuda_plugin): CUDA GPU Plugin -- allows to perform deep neural networks inference on NVIDIA GPUs using CUDA, using OpenVINO API.
+* [**nvidia_plugin**](./modules/nvidia_plugin): NVIDIA GPU Plugin -- allows to perform deep neural networks inference on NVIDIA GPUs using CUDA, using OpenVINO API.
 * [**java_api**](./modules/java_api): Inference Engine Java API -- provides Java wrappers for Inference Engine public API.
 * [**mo_pytorch**](./modules/mo_pytorch): PyTorch extensions for Model Optimizer -- native PyTorch to OpenVINO IR converter
 * [**optimum**](./modules/optimum): Optimum OpenVINO -- Python extension for Hugging Face [Transformers](https://github.com/huggingface/transformers) including runtime and NNCF quantization.
@@ -35,7 +35,7 @@ $ cmake -DIE_EXTRA_MODULES=<openvino_contrib>/modules -DBUILD_java_api=OFF <open
 Additional build instructions are available for the following modules:
 
 * [**arm_plugin**](./modules/arm_plugin/README.md)
-* [**cuda_plugin**](./modules/cuda_plugin/README.md)
+* [**nvidia_plugin**](./modules/nvidia_plugin/README.md)
 * [**ovms_ai_extension**](./modules/ovms_ai_extension/README.md)
 
 ## Update the repository documentation

diff --git a/modules/cuda_plugin/.clang-format → modules/nvidia_plugin/.clang-format b/modules/cuda_plugin/.clang-format → modules/nvidia_plugin/.clang-format
diff --git a/modules/cuda_plugin/.gitignore → modules/nvidia_plugin/.gitignore b/modules/cuda_plugin/.gitignore → modules/nvidia_plugin/.gitignore
diff --git a/modules/cuda_plugin/CMakeLists.txt → modules/nvidia_plugin/CMakeLists.txt b/modules/cuda_plugin/CMakeLists.txt → modules/nvidia_plugin/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 
 cmake_minimum_required(VERSION 3.13)
-project(InferenceEngineCUDAPlugin CXX CUDA)
+project(InferenceEngineNVIDIAGpuPlugin CXX CUDA)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -20,7 +20,7 @@ if (ENABLE_CUDNN_BACKEND_API)
     add_definitions(-DENABLE_CUDNN_BACKEND_API)
 endif()
 
-set(IE_MAIN_CUDA_PLUGIN_SOURCE_DIR ${InferenceEngineCUDAPlugin_SOURCE_DIR})
+set(IE_MAIN_CUDA_PLUGIN_SOURCE_DIR ${InferenceEngineNVIDIAGpuPlugin_SOURCE_DIR})
 
 find_package(InferenceEngineDeveloperPackage REQUIRED)
 
@@ -78,10 +78,10 @@ find_library(CUTENSOR_PATH
 get_filename_component(CUTENSOR_INCLUDE_DIR "${CUTENSOR_PATH}" DIRECTORY)
 get_filename_component(CUTENSOR_INCLUDE_DIR "${CUTENSOR_INCLUDE_DIR}/../../include" REALPATH)
 
-message("-- [CUDAPlugin] CUTENSOR_PATH ${CUTENSOR_PATH}")
-message("-- [CUDAPlugin] CUTENSOR_INCLUDE_DIR ${CUTENSOR_INCLUDE_DIR}")
-message("-- [CUDAPlugin] CUDNN_PATH ${CUDNN_PATH}")
-message("-- [CUDAPlugin] CUBLAS_PATH ${CUBLAS_PATH}")
+message("-- [nvidia_gpu] CUTENSOR_PATH ${CUTENSOR_PATH}")
+message("-- [nvidia_gpu] CUTENSOR_INCLUDE_DIR ${CUTENSOR_INCLUDE_DIR}")
+message("-- [nvidia_gpu] CUDNN_PATH ${CUDNN_PATH}")
+message("-- [nvidia_gpu] CUBLAS_PATH ${CUBLAS_PATH}")
 
 add_library(CUDA::cudnn SHARED IMPORTED)
 set_target_properties(CUDA::cudnn PROPERTIES IMPORTED_LOCATION "${CUDNN_PATH}")

diff --git a/modules/cuda_plugin/Dockerfile → modules/nvidia_plugin/Dockerfile b/modules/cuda_plugin/Dockerfile → modules/nvidia_plugin/Dockerfile