From 6aa8666be54ce7726654afd3062704555a836161 Mon Sep 17 00:00:00 2001
From: hchandirasekar <f20180523@goa.bits-pilani.ac.in>
Date: Wed, 10 Mar 2021 12:59:04 +0530
Subject: [PATCH] Commits for msvc 16.9

---
 CMakeLists.txt                 |  2 +-
 demo/demo/demo.cpp             |  2 +-
 src/kernels/deformable_conv.cu |  2 +-
 src/utils.cpp                  | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c173eca..77425d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -Wno-deprecated-declara
 endif()
 if(WIN32)
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_FLAGS "/O2 ")
+set(CMAKE_CXX_FLAGS "/O2 /FS ")
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif(WIN32)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/tkDNN)
diff --git a/demo/demo/demo.cpp b/demo/demo/demo.cpp
index 609affe..c622f2b 100644
--- a/demo/demo/demo.cpp
+++ b/demo/demo/demo.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
     signal(SIGINT, sig_handler);
 
 
-    std::string net = "yolo3_berkeley.rt";
+    std::string net = "yolo4tiny_fp32.rt";
     if(argc > 1)
         net = argv[1]; 
     std::string input = "../demo/yolo_test.mp4";
diff --git a/src/kernels/deformable_conv.cu b/src/kernels/deformable_conv.cu
index 592c538..4dbc552 100644
--- a/src/kernels/deformable_conv.cu
+++ b/src/kernels/deformable_conv.cu
@@ -18,7 +18,7 @@ inline int GET_BLOCKS(const int N)
 }
 
 
-__device__ float dmcn_im2col_bilinear(const float *bottom_data, const int data_width,
+__device__ __host__  float dmcn_im2col_bilinear(const float *bottom_data, const int data_width,
   const int height, const int width, float h, float w) {
 int h_low = floor(h);
 int w_low = floor(w);
diff --git a/src/utils.cpp b/src/utils.cpp
index bbdf516..52775df 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -23,14 +23,23 @@ bool fileExist(const char *fname) {
 void downloadWeightsifDoNotExist(const std::string& input_bin, const std::string& test_folder, const std::string& weights_url){
     if(!fileExist(input_bin.c_str())){
         std::string mkdir_cmd = "mkdir " + test_folder; 
-        std::string wget_cmd = "wget " + weights_url + " -O " + test_folder + "/weights.zip"; 
+        std::string wget_cmd = "curl " + weights_url + " --output " + test_folder + "/weights.zip";
+#ifdef __linux__
         std::string unzip_cmd = "unzip " + test_folder + "/weights.zip -d" + test_folder;
         std::string rm_cmd = "rm " + test_folder + "/weights.zip";
+
+#elif _WIN32
+
+        std::string unzip_cmd = "7z x " + test_folder + "/weights.zip -o" + test_folder;
+#endif 
         int err = 0;
         err = system(mkdir_cmd.c_str());
         err = system(wget_cmd.c_str());
         err = system(unzip_cmd.c_str());
+#ifdef __linux__
         err = system(rm_cmd.c_str());
+#endif
+
     }
 }