From 59bb5406b3cfcedb7272cb74413afbc6e6bf5ec7 Mon Sep 17 00:00:00 2001 From: czkkkkkk Date: Thu, 28 Dec 2023 15:24:49 +0800 Subject: [PATCH] Revert "[Sparse] Fix Windows.h dependency issue (#6741)" (#6843) Co-authored-by: Rhett Ying <85214957+Rhett-Ying@users.noreply.github.com> --- dgl_sparse/include/sparse/sddmm.h | 1 + dgl_sparse/include/sparse/sparse_format.h | 4 ++- dgl_sparse/include/sparse/sparse_matrix.h | 3 ++- dgl_sparse/include/sparse/spmm.h | 1 + dgl_sparse/include/sparse/spspmm.h | 1 + dgl_sparse/include/sparse/torch_headers.h | 30 ----------------------- dgl_sparse/src/elemenwise_op.cc | 1 + dgl_sparse/src/matmul.cc | 2 +- dgl_sparse/src/matmul.h | 1 + dgl_sparse/src/matrix_ops.cc | 1 + dgl_sparse/src/python_binding.cc | 3 ++- dgl_sparse/src/reduction.cc | 2 +- dgl_sparse/src/sddmm.cc | 1 + dgl_sparse/src/softmax.cc | 1 + dgl_sparse/src/sparse_matrix.cc | 2 ++ dgl_sparse/src/spmm.cc | 1 + dgl_sparse/src/spspmm.cc | 1 + dgl_sparse/src/utils.h | 4 ++- 18 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 dgl_sparse/include/sparse/torch_headers.h diff --git a/dgl_sparse/include/sparse/sddmm.h b/dgl_sparse/include/sparse/sddmm.h index 820f6b992b..953b9d3e92 100644 --- a/dgl_sparse/include/sparse/sddmm.h +++ b/dgl_sparse/include/sparse/sddmm.h @@ -7,6 +7,7 @@ #define SPARSE_SDDMM_H_ #include +#include namespace dgl { namespace sparse { diff --git a/dgl_sparse/include/sparse/sparse_format.h b/dgl_sparse/include/sparse/sparse_format.h index 3df3720969..083264e7dc 100644 --- a/dgl_sparse/include/sparse/sparse_format.h +++ b/dgl_sparse/include/sparse/sparse_format.h @@ -8,9 +8,11 @@ // clang-format off #include -#include // clang-format on +#include +#include + #include #include diff --git a/dgl_sparse/include/sparse/sparse_matrix.h b/dgl_sparse/include/sparse/sparse_matrix.h index d5857555bb..81657d3549 100644 --- a/dgl_sparse/include/sparse/sparse_matrix.h +++ b/dgl_sparse/include/sparse/sparse_matrix.h @@ -8,10 +8,11 @@ // clang-format off #include -#include // clang-format on #include +#include +#include #include #include diff --git a/dgl_sparse/include/sparse/spmm.h b/dgl_sparse/include/sparse/spmm.h index deab456441..5ed34d2fe2 100644 --- a/dgl_sparse/include/sparse/spmm.h +++ b/dgl_sparse/include/sparse/spmm.h @@ -7,6 +7,7 @@ #define SPARSE_SPMM_H_ #include +#include namespace dgl { namespace sparse { diff --git a/dgl_sparse/include/sparse/spspmm.h b/dgl_sparse/include/sparse/spspmm.h index 8f9a969990..b4e856bf50 100644 --- a/dgl_sparse/include/sparse/spspmm.h +++ b/dgl_sparse/include/sparse/spspmm.h @@ -7,6 +7,7 @@ #define SPARSE_SPSPMM_H_ #include +#include namespace dgl { namespace sparse { diff --git a/dgl_sparse/include/sparse/torch_headers.h b/dgl_sparse/include/sparse/torch_headers.h deleted file mode 100644 index de48cf2121..0000000000 --- a/dgl_sparse/include/sparse/torch_headers.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2022 by Contributors - * @file sparse/torch_headers.h - * @brief Pytorch headers used in the sparse library. Since Pytorch 2.1.0 - * introduced a dependency on , we need to define NOMINMAX to avoid - * the conflict with std::min/std::max macros before including Pytorch headers. - * See more in - * https://stackoverflow.com/questions/4913922/possible-problems-with-nominmax-on-visual-c. - */ - -#ifndef SPARSE_TORCH_HEADERS_H_ -#define SPARSE_TORCH_HEADERS_H_ - -#ifdef _WIN32 -#ifndef NOMINMAX -#define SPARSE_TORCH_HEADERS_H_NOMINMAX -#define NOMINMAX -#endif // NOMINMAX -#endif // _WIN32 - -#include -#include -#include -#include - -#ifdef SPARSE_TORCH_HEADERS_H_NOMINMAX -#undef NOMINMAX -#endif // SPARSE_TORCH_HEADERS_H_NOMINMAX - -#endif // SPARSE_TORCH_HEADERS_H_ diff --git a/dgl_sparse/src/elemenwise_op.cc b/dgl_sparse/src/elemenwise_op.cc index 544dca0d7c..cae391c446 100644 --- a/dgl_sparse/src/elemenwise_op.cc +++ b/dgl_sparse/src/elemenwise_op.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/dgl_sparse/src/matmul.cc b/dgl_sparse/src/matmul.cc index 2e03c34667..7ed791ae44 100644 --- a/dgl_sparse/src/matmul.cc +++ b/dgl_sparse/src/matmul.cc @@ -7,10 +7,10 @@ // clang-format off #include -#include // clang-format on #include +#include #include "./utils.h" diff --git a/dgl_sparse/src/matmul.h b/dgl_sparse/src/matmul.h index 81ef56201a..c23065f5f6 100644 --- a/dgl_sparse/src/matmul.h +++ b/dgl_sparse/src/matmul.h @@ -7,6 +7,7 @@ #define DGL_SPARSE_MATMUL_H_ #include +#include #include diff --git a/dgl_sparse/src/matrix_ops.cc b/dgl_sparse/src/matrix_ops.cc index 3696ac539a..54aeb9fc19 100644 --- a/dgl_sparse/src/matrix_ops.cc +++ b/dgl_sparse/src/matrix_ops.cc @@ -4,6 +4,7 @@ * @brief DGL C++ matrix operators. */ #include +#include namespace dgl { namespace sparse { diff --git a/dgl_sparse/src/python_binding.cc b/dgl_sparse/src/python_binding.cc index 80f369ac35..e7bedf2e0f 100644 --- a/dgl_sparse/src/python_binding.cc +++ b/dgl_sparse/src/python_binding.cc @@ -5,7 +5,6 @@ */ // clang-format off #include -#include // clang-format on #include @@ -16,6 +15,8 @@ #include #include #include +#include +#include namespace dgl { namespace sparse { diff --git a/dgl_sparse/src/reduction.cc b/dgl_sparse/src/reduction.cc index 88ead6cd70..eccd66c748 100644 --- a/dgl_sparse/src/reduction.cc +++ b/dgl_sparse/src/reduction.cc @@ -5,12 +5,12 @@ */ // clang-format off #include -#include // clang-format on #include #include #include +#include #include #include diff --git a/dgl_sparse/src/sddmm.cc b/dgl_sparse/src/sddmm.cc index feba7a7aba..810583e01a 100644 --- a/dgl_sparse/src/sddmm.cc +++ b/dgl_sparse/src/sddmm.cc @@ -5,6 +5,7 @@ */ #include #include +#include #include diff --git a/dgl_sparse/src/softmax.cc b/dgl_sparse/src/softmax.cc index 7aef3d4449..2c5bef5ff3 100644 --- a/dgl_sparse/src/softmax.cc +++ b/dgl_sparse/src/softmax.cc @@ -6,6 +6,7 @@ #include #include +#include #include "./matmul.h" #include "./utils.h" diff --git a/dgl_sparse/src/sparse_matrix.cc b/dgl_sparse/src/sparse_matrix.cc index 24cc3209b9..9da43233c3 100644 --- a/dgl_sparse/src/sparse_matrix.cc +++ b/dgl_sparse/src/sparse_matrix.cc @@ -7,8 +7,10 @@ #include // clang-format on +#include #include #include +#include #include "./utils.h" diff --git a/dgl_sparse/src/spmm.cc b/dgl_sparse/src/spmm.cc index e96176b8be..3af11267c0 100644 --- a/dgl_sparse/src/spmm.cc +++ b/dgl_sparse/src/spmm.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/dgl_sparse/src/spspmm.cc b/dgl_sparse/src/spspmm.cc index 036a7bfef8..367747f49b 100644 --- a/dgl_sparse/src/spspmm.cc +++ b/dgl_sparse/src/spspmm.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include "./matmul.h" #include "./utils.h" diff --git a/dgl_sparse/src/utils.h b/dgl_sparse/src/utils.h index 4d0a6833ab..83073e5507 100644 --- a/dgl_sparse/src/utils.h +++ b/dgl_sparse/src/utils.h @@ -8,10 +8,12 @@ // clang-format off #include -#include // clang-format on +#include #include +#include +#include namespace dgl { namespace sparse {