refactor direct

driver/conv.cu

@@ -7,7 +7,6 @@
 #include "constant_tensor_descriptor.cuh"
 #include "device_direct_convolution_1.cuh"
 #include "device_direct_convolution_2.cuh"
-#include "device_winograd_convolution.cuh"
 
 struct GeneratorConstant
 {
@@ -61,10 +60,10 @@ void ostream_ConstantTensorDescriptor(TConstTensorDesc, std::ostream& os = std::
 {
     static_assert(TConstTensorDesc::nDim == 4, "nDim is not 4");
 
-    constexpr auto I0   = Index<0>{};
-    constexpr auto I1   = Index<1>{};
-    constexpr auto I2   = Index<2>{};
-    constexpr auto I3   = Index<3>{};
+    constexpr auto I0   = Number<0>{};
+    constexpr auto I1   = Number<1>{};
+    constexpr auto I2   = Number<2>{};
+    constexpr auto I3   = Number<3>{};
     constexpr auto desc = TConstTensorDesc{};
 
     os << "Lengths: {" << desc.GetLength(I0) << ", " << desc.GetLength(I1) << ", "
@@ -79,10 +78,10 @@ auto make_TensorDescriptor(TConstTensorDesc)
 {
     static_assert(TConstTensorDesc::nDim == 4, "nDim is not 4");
 
-    constexpr auto I0   = Index<0>{};
-    constexpr auto I1   = Index<1>{};
-    constexpr auto I2   = Index<2>{};
-    constexpr auto I3   = Index<3>{};
+    constexpr auto I0   = Number<0>{};
+    constexpr auto I1   = Number<1>{};
+    constexpr auto I2   = Number<2>{};
+    constexpr auto I3   = Number<3>{};
     constexpr auto desc = TConstTensorDesc{};
 
     std::initializer_list<unsigned> lengths = {
@@ -396,7 +395,7 @@ int main()
     Tensor<float> out_host(make_TensorDescriptor(out_desc));
     Tensor<float> out_device(make_TensorDescriptor(out_desc));
 
-#if 0
+#if 1
     std::size_t num_thread = std::thread::hardware_concurrency();
     in.GenerateTensorValue(GeneratorTensor_2{-5, 5}, num_thread);
     wei.GenerateTensorValue(GeneratorTensor_2{-5, 5}, num_thread);
@@ -405,17 +404,17 @@ int main()
     for(int i = 0; i < 20; ++i)
     {
 #if 1
-        device_direct_convolution_2(in_desc, in, wei_desc, wei, out_desc, out_device);
+        device_direct_convolution_1(in_desc, in, wei_desc, wei, out_desc, out_device);
 #else
         device_winograd_convolution(in_desc, in, wei_desc, wei, out_desc, out_device);
 #endif
     }
 
-#if 0
-    host_direct_convolution(in, wei, out_host);
+#if 1
+    host_winograd_3x3_convolution(in, wei, out_host);
     check_error(out_host, out_device);
 #elif 0
-    host_winograd_3x3_convolution(in, wei, out_host);
+    host_direct_convolution(in, wei, out_host);
     check_error(out_host, out_device);
 #endif
 

driver/device_direct_convolution_1.cuh

@@ -16,10 +16,10 @@ void device_direct_convolution_1(
     wei_device_buf.ToDevice(wei.mData.data());
     out_device_buf.ToDevice(out.mData.data());
 
-    constexpr auto I0 = Index<0>{};
-    constexpr auto I1 = Index<1>{};
-    constexpr auto I2 = Index<2>{};
-    constexpr auto I3 = Index<3>{};
+    constexpr auto I0 = Number<0>{};
+    constexpr auto I1 = Number<1>{};
+    constexpr auto I2 = Number<2>{};
+    constexpr auto I3 = Number<3>{};
 
     constexpr auto in_desc          = InDesc{};
     constexpr auto wei_desc         = WeiDesc{};

driver/device_direct_convolution_2.cuh

@@ -16,10 +16,10 @@ void device_direct_convolution_2(
     wei_device_buf.ToDevice(wei.mData.data());
     out_device_buf.ToDevice(out.mData.data());
 
-    constexpr auto I0 = Index<0>{};
-    constexpr auto I1 = Index<1>{};
-    constexpr auto I2 = Index<2>{};
-    constexpr auto I3 = Index<3>{};
+    constexpr auto I0 = Number<0>{};
+    constexpr auto I1 = Number<1>{};
+    constexpr auto I2 = Number<2>{};
+    constexpr auto I3 = Number<3>{};
 
     constexpr auto in_desc          = InDesc{};
     constexpr auto wei_desc         = WeiDesc{};
@@ -36,11 +36,6 @@ void device_direct_convolution_2(
     constexpr unsigned KPerThread = 4;
     constexpr unsigned CPerThread = 2;
 
-    constexpr unsigned NBlockOpLen0 = 1;
-    constexpr unsigned NBlockOpLen1 = 1;
-    constexpr unsigned NBlockOpLen2 = 4;
-    constexpr unsigned NBlockOpLen3 = 32;
-
     constexpr unsigned BlockSize = 128;
 
     constexpr unsigned GridSize = (out_desc.GetLength(I0) / NPerBlock) *
@@ -73,10 +68,6 @@ void device_direct_convolution_2(
                                   NPerThread,
                                   KPerThread,
                                   CPerThread,
-                                  NBlockOpLen0,
-                                  NBlockOpLen1,
-                                  NBlockOpLen2,
-                                  NBlockOpLen3,
                                   BlockSize,
                                   GridSize>
         <<<grid_dim, block_dim>>>(InDesc{},

driver/device_winograd_convolution.cuh

@@ -1,89 +0,0 @@
-#pragma once
-#include "gridwise_winograd_convolution.cuh"
-
-template <class T, class InDesc, class WeiDesc, class OutDesc>
-void device_winograd_convolution(
-    InDesc, const Tensor<T>& in, WeiDesc, const Tensor<T>& wei, OutDesc, Tensor<T>& out)
-{
-    std::size_t data_sz = sizeof(T);
-    DeviceMem in_device_buf(data_sz * in.mDesc.GetElementSpace());
-    DeviceMem wei_device_buf(data_sz * wei.mDesc.GetElementSpace());
-    DeviceMem out_device_buf(data_sz * out.mDesc.GetElementSpace());
-
-    int num_thread = std::thread::hardware_concurrency();
-
-    in_device_buf.ToDevice(in.mData.data());
-    wei_device_buf.ToDevice(wei.mData.data());
-    out_device_buf.ToDevice(out.mData.data());
-
-    constexpr auto I0 = Index<0>{};
-    constexpr auto I1 = Index<1>{};
-    constexpr auto I2 = Index<2>{};
-    constexpr auto I3 = Index<3>{};
-
-    constexpr auto in_desc          = InDesc{};
-    constexpr auto wei_desc         = WeiDesc{};
-    constexpr auto out_desc         = OutDesc{};
-    constexpr unsigned OutTileSizeH = 2;
-    constexpr unsigned OutTileSizeW = 2;
-    constexpr unsigned NPerBlock    = 2;
-    constexpr unsigned KPerBlock    = 16;
-    constexpr unsigned CPerBlock    = 4;
-    constexpr unsigned YPerBlock    = 1;
-    constexpr unsigned XPerBlock    = 16;
-
-    constexpr unsigned NPerThread = 2;
-    constexpr unsigned KPerThread = 2;
-    constexpr unsigned CPerThread = 2;
-
-    constexpr unsigned BlockSize = 128;
-
-    constexpr unsigned GridSize = (out_desc.GetLength(I0) / NPerBlock) *
-                                  (out_desc.GetLength(I1) / KPerBlock) *
-                                  (out_desc.GetLength(I2) / (OutTileSizeH * YPerBlock)) *
-                                  (out_desc.GetLength(I3) / (OutTileSizeW * XPerBlock));
-
-    dim3 block_dim(BlockSize);
-    dim3 grid_dim(GridSize);
-
-    printf("%s: BlockSize %u, GridSize %u \n", __func__, BlockSize, GridSize);
-
-    cudaEvent_t start, stop;
-    float elapsedTime;
-
-    cudaEventCreate(&start);
-    cudaEventRecord(start, 0);
-
-    gridwise_winograd_convolution<T,
-                                  InDesc,
-                                  WeiDesc,
-                                  OutDesc,
-                                  OutTileSizeH,
-                                  OutTileSizeW,
-                                  NPerBlock,
-                                  KPerBlock,
-                                  CPerBlock,
-                                  YPerBlock,
-                                  XPerBlock,
-                                  NPerThread,
-                                  KPerThread,
-                                  CPerThread,
-                                  BlockSize,
-                                  GridSize>
-        <<<grid_dim, block_dim>>>(InDesc{},
-                                  static_cast<T*>(in_device_buf.GetDeviceBuffer()),
-                                  WeiDesc{},
-                                  static_cast<T*>(wei_device_buf.GetDeviceBuffer()),
-                                  OutDesc{},
-                                  static_cast<T*>(out_device_buf.GetDeviceBuffer()));
-
-    cudaEventCreate(&stop);
-    cudaEventRecord(stop, 0);
-    cudaEventSynchronize(stop);
-
-    cudaEventElapsedTime(&elapsedTime, start, stop);
-    printf("Elapsed time : %f ms\n", elapsedTime);
-
-    checkCudaErrors(cudaGetLastError());
-    out_device_buf.FromDevice(out.mData.data());
-}