Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
torch-cluster
Commits
16eb9e1d
Commit
16eb9e1d
authored
Apr 06, 2018
by
rusty1s
Browse files
smarter cumDegree
parent
bd050f90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
aten/THC/THCDegree.cuh
aten/THC/THCDegree.cuh
+1
-0
aten/THC/THCGraclus.cu
aten/THC/THCGraclus.cu
+1
-1
aten/THC/generic/THCDegree.cuh
aten/THC/generic/THCDegree.cuh
+1
-1
No files found.
aten/THC/THCDegree.cuh
View file @
16eb9e1d
...
@@ -8,6 +8,7 @@ template<typename T>
...
@@ -8,6 +8,7 @@ template<typename T>
__global__
void
cumDegreeKernel
(
T
*
self
,
int64_t
*
index
,
ptrdiff_t
nEdges
)
{
__global__
void
cumDegreeKernel
(
T
*
self
,
int64_t
*
index
,
ptrdiff_t
nEdges
)
{
KERNEL_LOOP
(
i
,
nEdges
)
{
KERNEL_LOOP
(
i
,
nEdges
)
{
int64_t
r
=
index
[
i
];
int64_t
r
=
index
[
i
];
if
(
i
+
1
==
nEdges
)
{
self
[
r
]
=
ScalarConvert
<
int
,
T
>::
to
(
nEdges
);;
continue
;
}
if
(
r
!=
index
[
i
+
1
])
{
self
[
r
]
=
ScalarConvert
<
int
,
T
>::
to
(
i
+
1
);
}
if
(
r
!=
index
[
i
+
1
])
{
self
[
r
]
=
ScalarConvert
<
int
,
T
>::
to
(
i
+
1
);
}
}
}
}
}
...
...
aten/THC/THCGraclus.cu
View file @
16eb9e1d
...
@@ -20,7 +20,7 @@ void THCTensor_graclus(THCState *state, THCudaLongTensor *self, THCudaLongTensor
...
@@ -20,7 +20,7 @@ void THCTensor_graclus(THCState *state, THCudaLongTensor *self, THCudaLongTensor
THCudaLongTensor_degree
(
state
,
degree
,
row
);
THCudaLongTensor_degree
(
state
,
degree
,
row
);
THCudaLongTensor
*
cumDegree
=
THCudaLongTensor_newWithSize1d
(
state
,
nNodes
);
THCudaLongTensor
*
cumDegree
=
THCudaLongTensor_newWithSize1d
(
state
,
nNodes
);
THCudaLongTensor_cumDegree
(
state
,
cumDegree
,
row
);
THCudaLongTensor_cumDegree
(
state
,
self
,
row
);
while
(
!
THCTensor_color
(
state
,
self
))
{
while
(
!
THCTensor_color
(
state
,
self
))
{
THCTensor_propose
(
state
,
self
,
prop
,
row
,
col
,
degree
,
cumDegree
);
THCTensor_propose
(
state
,
self
,
prop
,
row
,
col
,
degree
,
cumDegree
);
...
...
aten/THC/generic/THCDegree.cuh
View file @
16eb9e1d
...
@@ -20,7 +20,7 @@ void THCTensor_(cumDegree)(THCState *state, THCTensor *self, THCudaLongTensor *i
...
@@ -20,7 +20,7 @@ void THCTensor_(cumDegree)(THCState *state, THCTensor *self, THCudaLongTensor *i
real
*
selfData
=
THCTensor_
(
data
)(
state
,
self
);
real
*
selfData
=
THCTensor_
(
data
)(
state
,
self
);
int64_t
*
indexData
=
THCudaLongTensor_data
(
state
,
index
);
int64_t
*
indexData
=
THCudaLongTensor_data
(
state
,
index
);
KERNEL_RUN
(
cumDegreeKernel
,
nEdges
-
1
,
selfData
,
indexData
);
KERNEL_RUN
(
cumDegreeKernel
,
nEdges
,
selfData
,
indexData
);
}
}
#endif // THC_GENERIC_FILE
#endif // THC_GENERIC_FILE
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment