Commit 6fb9f07c authored by Benjamin Thomas Graham's avatar Benjamin Thomas Graham
Browse files

Merge branch 'master' of github.com:facebookresearch/SparseConvNet

parents 032d6fde 609224df
...@@ -257,3 +257,4 @@ pip install git+https://github.com/pytorch/tnt.git@master ...@@ -257,3 +257,4 @@ pip install git+https://github.com/pytorch/tnt.git@master
6. [Kaggle Diabetic Retinopathy Detection, 2015](https://www.kaggle.com/c/diabetic-retinopathy-detection/) First place in the Kaggle Diabetic Retinopathy Detection competition. 6. [Kaggle Diabetic Retinopathy Detection, 2015](https://www.kaggle.com/c/diabetic-retinopathy-detection/) First place in the Kaggle Diabetic Retinopathy Detection competition.
7. [Submanifold Sparse Convolutional Networks, 2017](https://arxiv.org/abs/1706.01307) Introduces deep 'submanifold' SparseConvNets. 7. [Submanifold Sparse Convolutional Networks, 2017](https://arxiv.org/abs/1706.01307) Introduces deep 'submanifold' SparseConvNets.
8. [Workshop on Learning to See from 3D Data, 2017](https://shapenet.cs.stanford.edu/iccv17workshop/) First place in the [semantic segmentation](https://shapenet.cs.stanford.edu/iccv17/) competition. [Report](https://arxiv.org/pdf/1710.06104) 8. [Workshop on Learning to See from 3D Data, 2017](https://shapenet.cs.stanford.edu/iccv17workshop/) First place in the [semantic segmentation](https://shapenet.cs.stanford.edu/iccv17/) competition. [Report](https://arxiv.org/pdf/1710.06104)
9. [3D Semantic Segmentation with Submanifold Sparse Convolutional Networks, 2017](https://arxiv.org/abs/1711.10275) Semantic segmentation for the ShapeNet Core55 and NYU-DepthV2 datasets
...@@ -221,7 +221,7 @@ void scn_ARCH_REAL_DIMENSIONMaxPooling_updateGradInput( ...@@ -221,7 +221,7 @@ void scn_ARCH_REAL_DIMENSIONMaxPooling_updateGradInput(
// SparseToDense // SparseToDense
void scn_ARCH_REAL_DIMENSIONSparseToDense_updateOutput( void scn_ARCH_REAL_DIMENSIONSparseToDense_updateOutput(
THLongTensor *inputSize, void **m, THTensor *input_features, THLongTensor *inputSize, void **m, THTensor *input_features,
THTensor *output_features, THITensor *rulesBuffer); THTensor *output_features, THITensor *rulesBuffer, long nPlanes);
void scn_ARCH_REAL_DIMENSIONSparseToDense_updateGradInput( void scn_ARCH_REAL_DIMENSIONSparseToDense_updateGradInput(
THLongTensor *inputSize, void **m, THTensor *input_features, THLongTensor *inputSize, void **m, THTensor *input_features,
THTensor *d_input_features, THTensor *d_output_features, THTensor *d_input_features, THTensor *d_output_features,
......
...@@ -36,7 +36,7 @@ return function(sparseconvnet) ...@@ -36,7 +36,7 @@ return function(sparseconvnet)
input.features:cdata(), input.features:cdata(),
self.output:cdata(), self.output:cdata(),
self.shared.rulesBuffer and self.shared.rulesBuffer:cdata(), self.shared.rulesBuffer and self.shared.rulesBuffer:cdata(),
self.nPlanes or input.features.size(2)) self.nPlanes or input.features:size(2))
return self.output return self.output
end end
......
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