CMake fixes (rusty1s#213)

* cmake fixes * update * update * update * update * reset

Author: rusty1s

CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 find_package(Torch REQUIRED)
 
 file(GLOB HEADERS csrc/sparse.h)
-file(GLOB OPERATOR_SOURCES csrc/cpu/*.h csrc/cpu/*.cpp csrc/*.cpp)
+file(GLOB OPERATOR_SOURCES csrc/*.* csrc/cpu/*.*)
 if(WITH_CUDA)
  file(GLOB OPERATOR_SOURCES ${OPERATOR_SOURCES} csrc/cuda/*.h csrc/cuda/*.cu)
 endif()

csrc/extensions.h

@@ -1,6 +1,5 @@
-
-#include <torch/torch.h>
-#include "sparse.h"
+#include "macros.h"
+#include <torch/extension.h>
 
 // for getpid()
 #ifdef _WIN32

csrc/macros.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifdef _WIN32
+#if defined(torchsparse_EXPORTS)
+#define SPARSE_API __declspec(dllexport)
+#else
+#define SPARSE_API __declspec(dllimport)
+#endif
+#else
+#define SPARSE_API
+#endif
+
+#if (defined __cpp_inline_variables) || __cplusplus >= 201703L
+#define SPARSE_INLINE_VARIABLE inline
+#else
+#ifdef _MSC_VER
+#define SPARSE_INLINE_VARIABLE __declspec(selectany)
+#else
+#define SPARSE_INLINE_VARIABLE __attribute__((weak))
+#endif
+#endif

csrc/sparse.h

@@ -2,25 +2,7 @@
 
 #include <torch/extension.h>
 
-#ifdef _WIN32
-#if defined(torchsparse_EXPORTS)
-#define SPARSE_API __declspec(dllexport)
-#else
-#define SPARSE_API __declspec(dllimport)
-#endif
-#else
-#define SPARSE_API
-#endif
-
-#if (defined __cpp_inline_variables) || __cplusplus >= 201703L
-#define SPARSE_INLINE_VARIABLE inline
-#else
-#ifdef _MSC_VER
-#define SPARSE_INLINE_VARIABLE __declspec(selectany)
-#else
-#define SPARSE_INLINE_VARIABLE __attribute__((weak))
-#endif
-#endif
+#include "macros.h"
 
 namespace sparse {
 SPARSE_API int64_t cuda_version() noexcept;

csrc/version.cpp

@@ -1,13 +1,14 @@
 #ifdef WITH_PYTHON
 #include <Python.h>
 #endif
-#include "sparse.h"
 #include <torch/script.h>
 
 #ifdef WITH_CUDA
 #include <cuda.h>
 #endif
 
+#include "macros.h"
+
 #ifdef _WIN32
 #ifdef WITH_PYTHON
 #ifdef WITH_CUDA