Skip to content

Commit 103260e

Browse files
lohika-denis-kotovlohika-denis-kotov
authored
[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
1 parent 69c1b7f commit 103260e

File tree

608 files changed

+2922
-2295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

608 files changed

+2922
-2295
lines changed

‎.ci/azure/android_arm64.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:
@@ -120,7 +120,7 @@ jobs:
120120
-DENABLE_SAMPLES=ON
121121
-DENABLE_INTEL_MYRIAD=OFF
122122
-DBUILD_java_api=ON
123-
-DBUILD_cuda_plugin=OFF
123+
-DBUILD_nvidia_plugin=OFF
124124
-DTHREADING=SEQ
125125
-DIE_EXTRA_MODULES=$(REPO_DIR)/modules
126126
$(OPENVINO_REPO_DIR)

‎.ci/azure/linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:
@@ -122,7 +122,7 @@ jobs:
122122
-DVERBOSE_BUILD=ON
123123
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
124124
-DNGRAPH_ONNX_IMPORT_ENABLE=OFF
125-
-DBUILD_cuda_plugin=OFF
125+
-DBUILD_nvidia_plugin=OFF
126126
-DIE_EXTRA_MODULES=$(REPO_DIR)/modules
127127
-DENABLE_PYTHON=ON
128128
-DPYTHON_EXECUTABLE=/usr/bin/python3.8

‎.ci/azure/linux_arm64.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:
@@ -153,7 +153,7 @@ jobs:
153153
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
154154
-DENABLE_SAMPLES=ON
155155
-DBUILD_java_api=OFF
156-
-DBUILD_cuda_plugin=OFF
156+
-DBUILD_nvidia_plugin=OFF
157157
-DENABLE_INTEL_MYRIAD=OFF
158158
-DTHREADING=SEQ
159159
-DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules

‎.ci/azure/linux_coverity_arm64.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:

‎.ci/azure/linux_cuda.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
- releases/*
66
paths:
77
include:
8-
- modules/cuda_plugin
8+
- modules/nvidia_plugin
99

1010
pr:
1111
branches:
@@ -14,7 +14,7 @@ pr:
1414
- releases/*
1515
paths:
1616
include:
17-
- modules/cuda_plugin
17+
- modules/nvidia_plugin
1818

1919
resources:
2020
repositories:

‎.ci/azure/mac.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:
@@ -104,7 +104,7 @@ jobs:
104104
# Disable errors with Ninja
105105
export CXXFLAGS="-Wno-error=unused-command-line-argument"
106106
export CFLAGS="-Wno-error=unused-command-line-argument"
107-
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)
107+
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)
108108
workingDirectory: $(BUILD_DIR)
109109
displayName: 'CMake'
110110

‎.ci/azure/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
paths:
77
exclude:
88
- modules/optimum
9-
- modules/cuda_plugin
9+
- modules/nvidia_plugin
1010

1111
pr:
1212
branches:
@@ -16,7 +16,7 @@ pr:
1616
paths:
1717
exclude:
1818
- modules/optimum
19-
- modules/cuda_plugin
19+
- modules/nvidia_plugin
2020

2121
resources:
2222
repositories:
@@ -103,7 +103,7 @@ jobs:
103103
104104
- script: |
105105
set PATH=$(WORK_DIR)\ninja-win;%PATH%
106-
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)
106+
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)
107107
workingDirectory: $(BUILD_DIR)
108108
displayName: 'CMake'
109109

‎.github/workflows/code_style.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
push:
44
paths:
55
- '**'
6-
- '!modules/cuda_plugin/**'
6+
- '!modules/nvidia_plugin/**'
77
pull_request:
88
paths:
99
- '**'
10-
- '!modules/cuda_plugin/**'
10+
- '!modules/nvidia_plugin/**'
1111

1212
jobs:
1313
Java:

‎.github/workflows/history_cuda.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ name: History CUDA
22
on:
33
push:
44
paths:
5-
- 'modules/cuda_plugin/**.*'
5+
- 'modules/nvidia_plugin/**.*'
66
pull_request:
77
paths:
8-
- 'modules/cuda_plugin/**.*'
8+
- 'modules/nvidia_plugin/**.*'
99
jobs:
1010
history:
1111
runs-on: lohika-ci
1212
steps:
1313
- name: checkout master branch
1414
run: git -C ~/runner/openvino_contrib checkout master
15+
- name: fetch master branch
16+
run: git -C ~/runner/openvino_contrib pull origin master
1517
- name: delete temporary branch
1618
run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
1719
- name: fetch

‎.github/workflows/sanitizer_cuda.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ on:
44
branches:
55
- master
66
paths:
7-
- 'modules/cuda_plugin/**.*'
7+
- 'modules/nvidia_plugin/**.*'
8+
pull_request:
9+
paths:
10+
- 'modules/nvidia_plugin/**.*'
811
workflow_dispatch:
912

1013
jobs:
@@ -18,6 +21,8 @@ jobs:
1821
run: git -C ~/runner/openvino submodule update --init --recursive
1922
- name: checkout openvino_contrib master branch
2023
run: git -C ~/runner/openvino_contrib checkout master
24+
- name: fetch openvino_contrib master branch
25+
run: git -C ~/runner/openvino_contrib pull origin master
2126
- name: delete openvino_contrib temporary branch
2227
run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
2328
- name: fetch openvino_contrib
@@ -29,4 +34,4 @@ jobs:
2934
- name: ninja
3035
run: echo 'all:; +NINJA_STATUS="[%u/%r/%f] " ninja -C ~/runner/build_cuda_sanitizer -v CudaFuncTests CudaUnitTests' | make -j`nproc` -f-
3136
- name: functional tests
32-
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*
37+
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*

‎.github/workflows/test_cuda.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Test CUDA
22
on:
33
push:
44
paths:
5-
- 'modules/cuda_plugin/**.*'
5+
- 'modules/nvidia_plugin/**.*'
66
pull_request:
77
paths:
8-
- 'modules/cuda_plugin/**.*'
8+
- 'modules/nvidia_plugin/**.*'
99
jobs:
1010
build:
1111
runs-on: lohika-ci
@@ -16,14 +16,16 @@ jobs:
1616
run: git -C ~/runner/openvino submodule update --init --recursive
1717
- name: checkout openvino_contrib master branch
1818
run: git -C ~/runner/openvino_contrib checkout master
19+
- name: fetch openvino_contrib master branch
20+
run: git -C ~/runner/openvino_contrib pull origin master
1921
- name: delete openvino_contrib temporary branch
2022
run: git -C ~/runner/openvino_contrib branch -D temporary-ci-branch | echo 1
2123
- name: fetch openvino_contrib
2224
run: git -C ~/runner/openvino_contrib fetch origin $GITHUB_REF:temporary-ci-branch
2325
- name: checkout openvino_contrib
2426
run: git -C ~/runner/openvino_contrib checkout temporary-ci-branch
2527
- name: format openvino_contrib
26-
run: cd ~/runner/openvino_contrib && ./modules/cuda_plugin/utils/check.sh
28+
run: cd ~/runner/openvino_contrib && ./modules/nvidia_plugin/utils/check.sh
2729
- name: cmake
2830
run: env -C ~/runner ./configrelease.sh
2931
- name: ninja

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ So, all the new modules should be developed separately, and published in the `op
99
This list gives an overview of all modules available inside the contrib repository.
1010

1111
* [**arm_plugin**](./modules/arm_plugin): ARM CPU Plugin -- allows to perform deep neural networks inference on ARM CPUs, using OpenVINO API.
12-
* [**cuda_plugin**](./modules/cuda_plugin): CUDA GPU Plugin -- allows to perform deep neural networks inference on NVIDIA GPUs using CUDA, using OpenVINO API.
12+
* [**nvidia_plugin**](./modules/nvidia_plugin): NVIDIA GPU Plugin -- allows to perform deep neural networks inference on NVIDIA GPUs using CUDA, using OpenVINO API.
1313
* [**java_api**](./modules/java_api): Inference Engine Java API -- provides Java wrappers for Inference Engine public API.
1414
* [**mo_pytorch**](./modules/mo_pytorch): PyTorch extensions for Model Optimizer -- native PyTorch to OpenVINO IR converter
1515
* [**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
3535
Additional build instructions are available for the following modules:
3636

3737
* [**arm_plugin**](./modules/arm_plugin/README.md)
38-
* [**cuda_plugin**](./modules/cuda_plugin/README.md)
38+
* [**nvidia_plugin**](./modules/nvidia_plugin/README.md)
3939
* [**ovms_ai_extension**](./modules/ovms_ai_extension/README.md)
4040

4141
## Update the repository documentation

‎modules/cuda_plugin/.clang-format ‎modules/nvidia_plugin/.clang-format

File renamed without changes.

‎modules/cuda_plugin/.gitignore ‎modules/nvidia_plugin/.gitignore

File renamed without changes.

‎modules/cuda_plugin/CMakeLists.txt ‎modules/nvidia_plugin/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
cmake_minimum_required(VERSION 3.13)
6-
project(InferenceEngineCUDAPlugin CXX CUDA)
6+
project(InferenceEngineNVIDIAGpuPlugin CXX CUDA)
77

88
set(CMAKE_CXX_STANDARD 17)
99
set(CMAKE_CXX_EXTENSIONS OFF)
@@ -20,7 +20,7 @@ if (ENABLE_CUDNN_BACKEND_API)
2020
add_definitions(-DENABLE_CUDNN_BACKEND_API)
2121
endif()
2222

23-
set(IE_MAIN_CUDA_PLUGIN_SOURCE_DIR ${InferenceEngineCUDAPlugin_SOURCE_DIR})
23+
set(IE_MAIN_CUDA_PLUGIN_SOURCE_DIR ${InferenceEngineNVIDIAGpuPlugin_SOURCE_DIR})
2424

2525
find_package(InferenceEngineDeveloperPackage REQUIRED)
2626

@@ -78,10 +78,10 @@ find_library(CUTENSOR_PATH
7878
get_filename_component(CUTENSOR_INCLUDE_DIR "${CUTENSOR_PATH}" DIRECTORY)
7979
get_filename_component(CUTENSOR_INCLUDE_DIR "${CUTENSOR_INCLUDE_DIR}/../../include" REALPATH)
8080

81-
message("-- [CUDAPlugin] CUTENSOR_PATH ${CUTENSOR_PATH}")
82-
message("-- [CUDAPlugin] CUTENSOR_INCLUDE_DIR ${CUTENSOR_INCLUDE_DIR}")
83-
message("-- [CUDAPlugin] CUDNN_PATH ${CUDNN_PATH}")
84-
message("-- [CUDAPlugin] CUBLAS_PATH ${CUBLAS_PATH}")
81+
message("-- [nvidia_gpu] CUTENSOR_PATH ${CUTENSOR_PATH}")
82+
message("-- [nvidia_gpu] CUTENSOR_INCLUDE_DIR ${CUTENSOR_INCLUDE_DIR}")
83+
message("-- [nvidia_gpu] CUDNN_PATH ${CUDNN_PATH}")
84+
message("-- [nvidia_gpu] CUBLAS_PATH ${CUBLAS_PATH}")
8585

8686
add_library(CUDA::cudnn SHARED IMPORTED)
8787
set_target_properties(CUDA::cudnn PROPERTIES IMPORTED_LOCATION "${CUDNN_PATH}")

‎modules/cuda_plugin/Dockerfile ‎modules/nvidia_plugin/Dockerfile

File renamed without changes.

0 commit comments

Comments
 (0)