added msvc support

Author: EJShim

.gitignore

@@ -10,4 +10,4 @@ th/gpu/build
 doc/generated_doc/
 example/**/*.pyc
 example/**/*.ply
-
+.vscode/

core/CMakeLists.txt

@@ -60,8 +60,11 @@ set(OCTREE_CPU_SRCS
   src/volumetric_upsampling.cpp
 )
 
+if(MSVC)
+add_library(octnet_core STATIC ${OCTREE_CPU_SRCS})
+else(MSVC)
 add_library(octnet_core SHARED ${OCTREE_CPU_SRCS})
-
+endif(MSVC)
 add_executable(test_octree test/test_octree.cpp)
 target_link_libraries(test_octree octnet_core)
 

core/include/octnet/core/core.h

@@ -36,8 +36,11 @@
 #include <cstdio>
 #include <cmath>
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 #include <smmintrin.h>
-
+#endif
 
 #ifdef __CUDA_ARCH__
 #define OCTREE_FUNCTION __host__ __device__

core/src/io.cpp

@@ -305,11 +305,11 @@ void octree_read_batch_cpu(int n_paths, char** paths, int n_threads, octree* gri
   // for(int path_idx = 0; path_idx < n_paths; ++path_idx) {
   //   printf("  path: '%s'\n", paths[path_idx]);
   // }
-
+  
   //determine necessary memory
   ot_size_t n;
-  ot_size_t n_leafs[n_paths];
-  ot_size_t n_blocks[n_paths];
+  std::vector<ot_size_t> n_leafs(n_paths);
+  std::vector<ot_size_t> n_blocks(n_paths);
 
   FILE* fp = fopen(paths[0], "rb");
   int magic_number = -1;
@@ -323,7 +323,7 @@ void octree_read_batch_cpu(int n_paths, char** paths, int n_threads, octree* gri
   sfread(&(grid_h->grid_height), sizeof(ot_size_t), 1, fp);
   sfread(&(grid_h->grid_width), sizeof(ot_size_t), 1, fp);
   sfread(&(grid_h->feature_size), sizeof(ot_size_t), 1, fp);
-  sfread(n_leafs, sizeof(ot_size_t), 1, fp);
+  sfread(n_leafs.data(), sizeof(ot_size_t), 1, fp);
   n_blocks[0] = n * grid_h->grid_depth * grid_h->grid_height * grid_h->grid_width;
   fclose(fp);
 
@@ -347,7 +347,7 @@ void octree_read_batch_cpu(int n_paths, char** paths, int n_threads, octree* gri
     sfread(&(tmp_grid_height), sizeof(ot_size_t), 1, fp);
     sfread(&(tmp_grid_width), sizeof(ot_size_t), 1, fp);
     sfread(&(tmp_feature_size), sizeof(ot_size_t), 1, fp);
-    sfread(n_leafs + path_idx, sizeof(ot_size_t), 1, fp);
+    sfread(n_leafs.data() + path_idx, sizeof(ot_size_t), 1, fp);
     fclose(fp);
 
     n += tmp_n;
@@ -419,7 +419,7 @@ void dense_read_prealloc_batch_cpu(int n_paths, char** paths, int n_threads, int
     offset *= dims[dim_idx];
   }
 
-  int dims_single[n_dim];
+  std::vector<int> dims_single(n_dim);
   dims_single[0] = 1;
   for(int dim_idx = 1; dim_idx < n_dim; ++dim_idx) {
     dims_single[dim_idx] = dims[dim_idx];
@@ -430,7 +430,7 @@ void dense_read_prealloc_batch_cpu(int n_paths, char** paths, int n_threads, int
   #endif
   #pragma omp parallel for
   for(int path_idx = 0; path_idx < n_paths; ++path_idx) {
-    dense_read_prealloc_cpu(paths[path_idx], n_dim, dims_single, data + path_idx * offset);
+    dense_read_prealloc_cpu(paths[path_idx], n_dim, dims_single.data(), data + path_idx * offset);
   }
 }
 

core/test/test_octree.cpp

@@ -27,7 +27,9 @@
 #include <sstream>
 #include <vector>
 #include <string.h>
-
+#ifdef _MSC_VER
+#include <time.h>
+#endif
 #include "octnet/test/objects.h"
 
 #include "octnet/cpu/cpu.h"
@@ -201,7 +203,7 @@ void test_split_rec_surf() {
 }
 
 int main() {
-  srand(time(NULL));
+  srand((unsigned)time(NULL));
 
   test_split_grid_idx();
   test_cdhw_to_octree();