Add options to conditionally include Python (rusty1s#196)

* Add `WITH_PYTHON` to conditionally link to Python. * Only include `Python.h` when WITH_PYTHON is set. * Avoid including extensions.h as it includes Python.h. * Better way to include `getpid()`. * Define `WITH_PYTHON` when building with setup.py. * Only include Pyinit when building with Python. * Only include Pyinit when building with Python.

Author: dfalbel

CMakeLists.txt

@@ -4,6 +4,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(TORCHSPARSE_VERSION 0.6.12)
 
 option(WITH_CUDA "Enable CUDA support" OFF)
+option(WITH_PYTHON "Link to Python when building" ON)
 
 if(WITH_CUDA)
  enable_language(CUDA)
@@ -12,7 +13,10 @@ if(WITH_CUDA)
  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr")
 endif()
 
-find_package(Python3 COMPONENTS Development)
+if (WITH_PYTHON)
+ add_definitions(-DWITH_PYTHON)
+ find_package(Python3 COMPONENTS Development)
+endif()
 find_package(Torch REQUIRED)
 
 file(GLOB HEADERS csrc/sparse.h)
@@ -22,7 +26,10 @@ if(WITH_CUDA)
 endif()
 
 add_library(${PROJECT_NAME} SHARED ${OPERATOR_SOURCES})
-target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES} Python3::Python)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES})
+if (WITH_PYTHON)
+ target_link_libraries(${PROJECT_NAME} PRIVATE Python3::Python)
+endif()
 set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME TorchSparse)
 
 target_include_directories(${PROJECT_NAME} INTERFACE

csrc/convert.cpp

@@ -1,4 +1,6 @@
+#ifdef WITH_PYTHON
 #include <Python.h>
+#endif
 #include <torch/script.h>
 
 #include "cpu/convert_cpu.h"
@@ -8,12 +10,14 @@
 #endif
 
 #ifdef _WIN32
+#ifdef WITH_PYTHON
 #ifdef WITH_CUDA
 PyMODINIT_FUNC PyInit__convert_cuda(void) { return NULL; }
 #else
 PyMODINIT_FUNC PyInit__convert_cpu(void) { return NULL; }
 #endif
 #endif
+#endif
 
 torch::Tensor ind2ptr(torch::Tensor ind, int64_t M) {
  if (ind.device().is_cuda()) {

csrc/cpu/convert_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 torch::Tensor ind2ptr_cpu(torch::Tensor ind, int64_t M);
 torch::Tensor ptr2ind_cpu(torch::Tensor ptr, int64_t E);

csrc/cpu/diag_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 torch::Tensor non_diag_mask_cpu(torch::Tensor row, torch::Tensor col, int64_t M,
  int64_t N, int64_t k);

csrc/cpu/ego_sample_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 std::tuple<torch::Tensor, torch::Tensor, torch::Tensor, torch::Tensor,
  torch::Tensor, torch::Tensor>

csrc/cpu/hgt_sample_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 typedef std::string node_t;
 typedef std::string rel_t;

csrc/cpu/metis_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 torch::Tensor partition_cpu(torch::Tensor rowptr, torch::Tensor col,
  torch::optional<torch::Tensor> optional_value,

csrc/cpu/neighbor_sample_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 typedef std::string node_t;
 typedef std::tuple<std::string, std::string, std::string> edge_t;

csrc/cpu/relabel_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 std::tuple<torch::Tensor, torch::Tensor> relabel_cpu(torch::Tensor col,
  torch::Tensor idx);

csrc/cpu/rw_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/extension.h>
+#include "../extensions.h"
 
 torch::Tensor random_walk_cpu(torch::Tensor rowptr, torch::Tensor col,
  torch::Tensor start, int64_t walk_length);