]> rtime.felk.cvut.cz Git - hercules2020/kcf.git/commitdiff
Removed unused cuda streams in cufft.
authorShanigen <vkaraf@gmail.com>
Thu, 19 Apr 2018 09:33:55 +0000 (11:33 +0200)
committerShanigen <vkaraf@gmail.com>
Thu, 19 Apr 2018 09:33:55 +0000 (11:33 +0200)
src/fft_cufft.cpp
src/fft_cufft.h

index 4e0142625b7ba0daebc20ca51d8878d280572d42..3d953aa3d79586f5765621a62b093738d15eb65e 100644 (file)
@@ -71,9 +71,6 @@ static const char *_cudaGetErrorEnum(cufftResult error)
     } \
 }
 
-cuFFT::cuFFT(): m_num_of_streams(4)
-{}
-
 void cuFFT::init(unsigned width, unsigned height, unsigned num_of_feats, unsigned num_of_scales, bool big_batch_mode)
 {
     m_width = width;
@@ -88,8 +85,6 @@ void cuFFT::init(unsigned width, unsigned height, unsigned num_of_feats, unsigne
         std::cerr << "Image dimension after forward FFT are too big for CUDA kernels." << std::endl;
         std::exit(EXIT_FAILURE);
     }
-
-    for (unsigned i = 0; i < m_num_of_streams; i++) cudaStreamCreate(&streams[i]);
     
     //FFT forward one scale
     {
@@ -314,8 +309,6 @@ cv::Mat cuFFT::inverse(const ComplexMat &inputf)
 
 cuFFT::~cuFFT()
 {
-
-  for(unsigned i = 0; i < m_num_of_streams; i++) cudaStreamDestroy(streams[i]);
   
   cufftDestroy(plan_f);
   cufftDestroy(plan_f_all_scales);
index a31285b434cdca33a2ac91e96e67a7ce8ecef35b..2ed9b94d3d49bf1d8851564529bda21506f7fefb 100644 (file)
@@ -18,7 +18,6 @@
 class cuFFT : public Fft
 {
 public:
-    cuFFT();
     void init(unsigned width, unsigned height, unsigned num_of_feats, unsigned num_of_scales, bool big_batch_mode) override;
     void set_window(const cv::Mat &window) override;
     ComplexMat forward(const cv::Mat &input) override;
@@ -27,9 +26,8 @@ public:
     ~cuFFT() override;
 private:
     cv::Mat m_window;
-    unsigned m_width, m_height, m_num_of_feats, m_num_of_scales, m_num_of_streams;
+    unsigned m_width, m_height, m_num_of_feats, m_num_of_scales;
     bool m_big_batch_mode;
-    cudaStream_t streams[4];
     cufftHandle plan_f, plan_f_all_scales, plan_fw, plan_fw_all_scales, plan_i_features,
      plan_i_features_all_scales, plan_i_1ch, plan_i_1ch_all_scales;
     float *data_f, *data_f_all_scales, *data_fw, *data_fw_d, *data_fw_all_scales, *data_fw_all_scales_d, *data_i_features, *data_i_features_d,