Skip to content

CMake fixes #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 22, 2022
Merged

CMake fixes #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
632dae4
cmake fixes
rusty1s Mar 21, 2022
4e9a37b
update
rusty1s Mar 22, 2022
e48418d
update
rusty1s Mar 22, 2022
b396653
update
rusty1s Mar 22, 2022
f7e1b2f
update
rusty1s Mar 22, 2022
9d8aab7
reset
rusty1s Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 2 additions & 3 deletions csrc/extensions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include <torch/torch.h>
#include "sparse.h"
#include "macros.h"
#include <torch/extension.h>

// for getpid()
#ifdef _WIN32
Expand Down
21 changes: 21 additions & 0 deletions csrc/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 1 addition & 19 deletions csrc/sparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion csrc/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down