fix bugs and apply clang

src/ngraph/runtime/gpu/gpu_cuda_context_manager.cpp

@@ -14,8 +14,6 @@
 * limitations under the License.
 *******************************************************************************/
 
-#pragma once
-
 #include <memory>
 #include <string>
 
@@ -27,7 +25,7 @@ namespace ngraph
     {
         namespace gpu
         {
-            static CudaContextManager::CudaContextManager& instance()
+            CudaContextManager& CudaContextManager::instance()
             {
                 static CudaContextManager manager;
                 return manager;

src/ngraph/runtime/gpu/gpu_cuda_function_builder.cpp

@@ -14,11 +14,10 @@
 * limitations under the License.
 *******************************************************************************/
 
-#pragma once
-
 #include <string>
 
 #include "ngraph/runtime/gpu/gpu_cuda_context_manager.hpp"
+#include "ngraph/runtime/gpu/gpu_cuda_function_builder.hpp"
 #include "ngraph/runtime/gpu/gpu_util.hpp"
 
 namespace ngraph
@@ -27,7 +26,7 @@ namespace ngraph
     {
         namespace gpu
         {
-            static std::shared_ptr<CUfunction> CudaFunctionBuilder::get(const std::string& name,
+            std::shared_ptr<CUfunction> CudaFunctionBuilder::get(const std::string& name,
                                                                  const std::string& kernel,
                                                                  int number_of_options,
                                                                  const char** options)
@@ -40,8 +39,7 @@ namespace ngraph
                                                    NULL,   // headers
                                                    NULL)); // includeNames
 
-                nvrtcResult compile_result =
-                    nvrtcCompileProgram(prog, number_of_options, options);
+                nvrtcResult compile_result = nvrtcCompileProgram(prog, number_of_options, options);
 
                 if (compile_result != NVRTC_SUCCESS)
                 {

src/ngraph/runtime/gpu/gpu_cuda_function_builder.hpp

@@ -33,38 +33,7 @@ namespace ngraph
                 static std::shared_ptr<CUfunction> get(const std::string& name,
                                                        const std::string& kernel,
                                                        int number_of_options,
-                                                       const char** options)
-                {
-                    nvrtcProgram prog;
-                    NVRTC_SAFE_CALL(nvrtcCreateProgram(&prog,
-                                                       kernel.c_str(),
-                                                       "op.cu",
-                                                       0,      // numHeaders
-                                                       NULL,   // headers
-                                                       NULL)); // includeNames
-
-                    nvrtcResult compile_result =
-                        nvrtcCompileProgram(prog, number_of_options, options);
-
-                    if (compile_result != NVRTC_SUCCESS)
-                    {
-                        throw std::runtime_error("compile error: \n" + kernel + "\n options");
-                    }
-
-                    size_t ptx_size;
-                    NVRTC_SAFE_CALL(nvrtcGetPTXSize(prog, &ptx_size));
-                    char* ptx = new char[ptx_size];
-                    NVRTC_SAFE_CALL(nvrtcGetPTX(
-                        prog,
-                        ptx)); // Load the generated PTX and get a handle to the parent kernel.
-                    NVRTC_SAFE_CALL(nvrtcDestroyProgram(&prog)); // Destroy the program.
-
-                    CUmodule module;
-                    CUfunction function;
-                    CUDA_SAFE_CALL(cuModuleLoadDataEx(&module, ptx, 0, 0, 0));
-                    CUDA_SAFE_CALL(cuModuleGetFunction(&function, module, name.c_str()));
-                    return std::make_shared<CUfunction>(function);
-                }
+                                                       const char** options);
             };
         }
     }

src/ngraph/runtime/gpu/gpu_cuda_function_pool.cpp

@@ -14,8 +14,6 @@
 * limitations under the License.
 *******************************************************************************/
 
-#pragma once
-
 #include <string>
 #include <unordered_map>
 
@@ -27,7 +25,7 @@ namespace ngraph
     {
         namespace gpu
         {
-            static CudaFunctionPool::CudaFunctionPool& instance()
+            CudaFunctionPool& CudaFunctionPool::instance()
             {
                 static CudaFunctionPool pool;
                 return pool;

src/ngraph/runtime/gpu/gpu_cuda_function_pool.hpp

@@ -38,6 +38,7 @@ namespace ngraph
 
                 void set(std::string& name, std::shared_ptr<CUfunction> function);
                 std::shared_ptr<CUfunction> get(std::string& name);
+
             protected:
                 CudaFunctionPool() {}
                 ~CudaFunctionPool() {}

src/ngraph/runtime/gpu/gpu_cuda_kernel_builder.cpp

@@ -14,8 +14,6 @@
 * limitations under the License.
 *******************************************************************************/
 
-#pragma once
-
 #include "ngraph/runtime/gpu/gpu_cuda_kernel_builder.hpp"
 
 namespace ngraph
@@ -24,15 +22,15 @@ namespace ngraph
     {
         namespace gpu
         {
-            static void CudaKernelBuilder::get_1_element_op(const std::string& name,
+            void CudaKernelBuilder::get_1_element_op(const std::string& name,
                                                      const std::string& data_type,
                                                      const std::string& op,
                                                      std::string& kernel)
             {
                 kernel = R"(  
 extern "C" __global__
-void cuda_)" + name + "(" + data_type +
-                            "* in, " + data_type + "* out, size_t n)\n" + R"({  
+void cuda_)" + name + "(" +
+                         data_type + "* in, " + data_type + "* out, size_t n)\n" + R"({  
 size_t tid = blockIdx.x * blockDim.x + threadIdx.x;  
 if(tid < n) 
 {
@@ -42,7 +40,7 @@ out[tid] =)" + op + "(in[tid]);\n" +
                 return;
             }
 
-            static void CudaKernelBuilder::get_2_element_op(const std::string& name,
+            void CudaKernelBuilder::get_2_element_op(const std::string& name,
                                                      const std::string& data_type,
                                                      const std::string& op,
                                                      std::string& kernel)
@@ -55,13 +53,14 @@ void )" + name + "(" + data_type +
 size_t tid = blockIdx.x * blockDim.x + threadIdx.x;  
 if(tid < n) 
 {
-out[tid] = in1[tid] )" + op + "in2[tid]\n" +
+out[tid] = in1[tid] )" + op +
+                         "in2[tid]\n" +
                          R"(}
 })";
                 return;
             }
 
-            static void CudaKernelBuilder::get_n_element_op(const std::string& name,
+            void CudaKernelBuilder::get_n_element_op(const std::string& name,
                                                      const std::string& data_type,
                                                      const std::vector<std::string>& ops,
                                                      std::string& kernel)

src/ngraph/runtime/gpu/gpu_cuda_kernel_builder.hpp

@@ -17,6 +17,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace ngraph
 {
@@ -41,6 +42,7 @@ namespace ngraph
                                              const std::string& data_type,
                                              const std::vector<std::string>& ops,
                                              std::string& kernel);
+            };
         }
     }
 }

src/ngraph/runtime/gpu/gpu_cuda_kernel_emitters.cpp

@@ -27,10 +27,6 @@ namespace ngraph
     namespace runtime
     {
         namespace gpu
-        {
-            namespace cuda
-            {
-                namespace kernel
         {
             void emit_abs(void* in, void* out, size_t count)
             {
@@ -67,6 +63,4 @@ namespace ngraph
             }
         }
     }
-        }
-    }
 }

src/ngraph/runtime/gpu/gpu_cuda_kernel_emitters.hpp

@@ -24,14 +24,8 @@ namespace ngraph
     namespace runtime
     {
         namespace gpu
-        {
-            namespace cuda
-            {
-                namespace kernel
         {
             void emit_abs(void* in, void* out, size_t count);
         }
     }
-        }
-    }
 }

src/ngraph/runtime/gpu/gpu_emitter.cpp

@@ -90,8 +90,8 @@ void runtime::gpu::GPU_Emitter::EmitAbs(codegen::CodeWriter& writer,
     writer.indent++;
     writer << "int count = " << out[0].get_size() << ";\n";
     writer << "if(count == 0) return;\n";
-    writer << "ngraph::runtime::gpu::cuda::kernel::emit_abs((void*) " << args[0].get_name()
-           << ", (void*) " << out[0].get_name() << ", count);\n";
+    writer << "ngraph::runtime::gpu::emit_abs((void*) " << args[0].get_name() << ", (void*) "
+           << out[0].get_name() << ", count);\n";
     writer.indent--;
     writer << "}\n";
 }

src/ngraph/runtime/gpu/gpu_util.hpp

@@ -16,6 +16,11 @@
 
 #pragma once
 
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
 #include <cublas_v2.h>
 #include <cuda.h>
 #include <cuda_runtime.h>