"torchvision/git@developer.sourcefind.cn:OpenDAS/vision.git" did not exist on "a4713054873b0b695246a6d7fc5d5edc2c48052a"
Commit c30d2e13 authored by bowendeng's avatar bowendeng
Browse files

utils to support METIS with adj_wgt

parent ab0cee58
...@@ -6,9 +6,8 @@ ...@@ -6,9 +6,8 @@
#include "utils.h" #include "utils.h"
torch::Tensor partition_cpu(torch::Tensor rowptr, torch::Tensor col, torch::Tensor partition_cpu(torch::Tensor rowptr, torch::Tensor col,int64_t num_parts,
int64_t num_parts, torch::Tensor adjwgt, torch::Tensor edge_wgt, bool recursive) {
bool recursive) {
#ifdef WITH_METIS #ifdef WITH_METIS
CHECK_CPU(rowptr); CHECK_CPU(rowptr);
CHECK_CPU(col); CHECK_CPU(col);
...@@ -18,7 +17,7 @@ torch::Tensor partition_cpu(torch::Tensor rowptr, torch::Tensor col, ...@@ -18,7 +17,7 @@ torch::Tensor partition_cpu(torch::Tensor rowptr, torch::Tensor col,
auto *xadj = rowptr.data_ptr<int64_t>(); auto *xadj = rowptr.data_ptr<int64_t>();
auto *adjncy = col.data_ptr<int64_t>(); auto *adjncy = col.data_ptr<int64_t>();
auto *adjwgt = adjwgt.data_ptr<int64_t>(); auto *adjwgt = edge_wgt.data_ptr<int64_t>();
int64_t ncon = 1; int64_t ncon = 1;
int64_t objval = -1; int64_t objval = -1;
auto part_data = part.data_ptr<int64_t>(); auto part_data = part.data_ptr<int64_t>();
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
PyMODINIT_FUNC PyInit__metis(void) { return NULL; } PyMODINIT_FUNC PyInit__metis(void) { return NULL; }
#endif #endif
torch::Tensor partition(torch::Tensor rowptr, torch::Tensor col, torch::Tensor partition(torch::Tensor rowptr, torch::Tensor col,int64_t num_parts,
int64_t num_parts, bool recursive) { torch::Tensor edge_wgt,bool recursive) {
if (rowptr.device().is_cuda()) { if (rowptr.device().is_cuda()) {
#ifdef WITH_CUDA #ifdef WITH_CUDA
AT_ERROR("No CUDA version supported"); AT_ERROR("No CUDA version supported");
...@@ -16,7 +16,7 @@ torch::Tensor partition(torch::Tensor rowptr, torch::Tensor col, ...@@ -16,7 +16,7 @@ torch::Tensor partition(torch::Tensor rowptr, torch::Tensor col,
AT_ERROR("Not compiled with CUDA support"); AT_ERROR("Not compiled with CUDA support");
#endif #endif
} else { } else {
return partition_cpu(rowptr, col, num_parts, recursive); return partition_cpu(rowptr, col,num_parts, edge_wgt, recursive);
} }
} }
......
...@@ -80,7 +80,7 @@ tests_require = ['pytest', 'pytest-cov'] ...@@ -80,7 +80,7 @@ tests_require = ['pytest', 'pytest-cov']
setup( setup(
name='torch_sparse', name='torch_sparse',
version='0.6.0', version='0.6.1',
author='Matthias Fey', author='Matthias Fey',
author_email='matthias.fey@tu-dortmund.de', author_email='matthias.fey@tu-dortmund.de',
url='https://github.com/rusty1s/pytorch_sparse', url='https://github.com/rusty1s/pytorch_sparse',
......
...@@ -3,15 +3,28 @@ from typing import Tuple ...@@ -3,15 +3,28 @@ from typing import Tuple
import torch import torch
from torch_sparse.tensor import SparseTensor from torch_sparse.tensor import SparseTensor
from torch_sparse.permute import permute from torch_sparse.permute import permute
from torch_sparse.utils import cartesian1d
def metis_wgt(x):
t1, t2 = cartesian1d(x, x)
diff = t1 - t2
diff = diff[diff != 0]
res = diff.abs().min()
bod = x.max() - x.min()
scale = (res / bod).item()
tick, arange = scale.as_integer_ratio()
x_ratio = (x - x.min()) / bod
return (x_ratio * arange + tick).long(), tick, arange
def partition( def partition(
src: SparseTensor, num_parts: int, recursive: bool = False src: SparseTensor, num_parts: int, recursive: bool = False
) -> Tuple[SparseTensor, torch.Tensor, torch.Tensor]: ) -> Tuple[SparseTensor, torch.Tensor, torch.Tensor]:
rowptr, col = src.storage.rowptr().cpu(), src.storage.col().cpu() rowptr, col = src.storage.rowptr().cpu(), src.storage.col().cpu()
adjwgt=src.storage.value().cpu() edge_wgt = src.storage.value().cpu()
cluster = torch.ops.torch_sparse.partition(rowptr, col, num_parts,adjwgt, edge_wgt = metis_wgt(edge_wgt)[0]
cluster = torch.ops.torch_sparse.partition(rowptr, col, num_parts, edge_wgt,
recursive) recursive)
cluster = cluster.to(src.device()) cluster = cluster.to(src.device())
......
from typing import Any from typing import Any
import torch
try: try:
from typing_extensions import Final # noqa from typing_extensions import Final # noqa
...@@ -8,3 +9,9 @@ except ImportError: ...@@ -8,3 +9,9 @@ except ImportError:
def is_scalar(other: Any) -> bool: def is_scalar(other: Any) -> bool:
return isinstance(other, int) or isinstance(other, float) return isinstance(other, int) or isinstance(other, float)
def cartesian1d(x, y):
a1, a2 = torch.meshgrid([x, y])
coos = torch.stack([a1, a2]).T.reshape(-1, 2)
return coos.split(1, dim=1)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment