Fix Windows build in tensor merge PR#9715
Merged
ezyang merged 6 commits intopytorch:tensor-mergefrom Jul 23, 2018
Merged
Conversation
This increases available parallelism, and fixes an MSVC out of heap space error. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
ssnl
reviewed
Jul 23, 2018
| TH_API void THTensor_(narrow)(THTensor *self, THTensor *src, int dimension_, int64_t firstIndex_, int64_t size_); | ||
| TH_API void THTensor_(select)(THTensor *self, THTensor *src, int dimension_, int64_t sliceIndex_); | ||
| TH_API void THTensor_(transpose)(THTensor *self, THTensor *src, int dimension1_, int dimension2_); | ||
| TH_API int THTensor_(isTransposed)(const THTensor *self); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
gchanan
approved these changes
Jul 23, 2018
Contributor
gchanan
left a comment
There was a problem hiding this comment.
If this unblocks us I think it can go in. But these file names are pretty bad. THC has better names and you can just copy them.
ssnl
approved these changes
Jul 23, 2018
Collaborator
ssnl
left a comment
There was a problem hiding this comment.
lgtm to me as well. let's get this in to unblock.
facebook-github-bot
pushed a commit
that referenced
this pull request
Jul 24, 2018
Summary: Constituent PRs: - [x] #9553 Remove unnecessary functions from StorageDerived.h (by cpuhrsch, reviewed by ezyang) - [x] #9588 Use THTensor/Storage for THVoidTensor/Storage (by cpuhrsch , reviewed by gchanan) - [x] #9627 Delete context from tensor (by ezyang, reviewed by gchanan) - [x] #9641 Tensor reorganization (by ezyang, reviewed by gchanan ) - [x] #9647 Remove dim_ from THTensor (by cpuhrsch, reviewed by ezyang) - [x] #9650 Remove context (by cpuhrsch, reviewed by gchanan and ezyang) - [x] #9715 Fix Windows build in tensor merge PR (by ezyang, reviewed by gchanan and SsnL) Upcoming PRs which didn't make this cut: - [x] #9644 Stride move to TensorImpl, and nits (by ezyang, reviewed by gchanan) - [ ] #9652 Native localScalar (by ezyang, **UNREVIEWED AND FAILING TESTS**) - [x] #9710 Devirtualize TensorImpl::toString (by ezyang, reviewed by gchanan) - [ ] #9654 Use int64_t instead of ptrdiff_t for size / Rename flag to resizable_ (by cpuhrsch, **CHANGES REQUESTED AND FAILING TESTS**) Pull Request resolved: #9713 Reviewed By: gchanan Differential Revision: D8960882 Pulled By: ezyang fbshipit-source-id: 99747b2c5462c7ff6809b67aacb4197626408204
jramseyer
pushed a commit
to jramseyer/pytorch
that referenced
this pull request
Jul 30, 2018
Summary: Constituent PRs: - [x] pytorch#9553 Remove unnecessary functions from StorageDerived.h (by cpuhrsch, reviewed by ezyang) - [x] pytorch#9588 Use THTensor/Storage for THVoidTensor/Storage (by cpuhrsch , reviewed by gchanan) - [x] pytorch#9627 Delete context from tensor (by ezyang, reviewed by gchanan) - [x] pytorch#9641 Tensor reorganization (by ezyang, reviewed by gchanan ) - [x] pytorch#9647 Remove dim_ from THTensor (by cpuhrsch, reviewed by ezyang) - [x] pytorch#9650 Remove context (by cpuhrsch, reviewed by gchanan and ezyang) - [x] pytorch#9715 Fix Windows build in tensor merge PR (by ezyang, reviewed by gchanan and SsnL) Upcoming PRs which didn't make this cut: - [x] pytorch#9644 Stride move to TensorImpl, and nits (by ezyang, reviewed by gchanan) - [ ] pytorch#9652 Native localScalar (by ezyang, **UNREVIEWED AND FAILING TESTS**) - [x] pytorch#9710 Devirtualize TensorImpl::toString (by ezyang, reviewed by gchanan) - [ ] pytorch#9654 Use int64_t instead of ptrdiff_t for size / Rename flag to resizable_ (by cpuhrsch, **CHANGES REQUESTED AND FAILING TESTS**) Pull Request resolved: pytorch#9713 Reviewed By: gchanan Differential Revision: D8960882 Pulled By: ezyang fbshipit-source-id: 99747b2c5462c7ff6809b67aacb4197626408204
goodlux
pushed a commit
to goodlux/pytorch
that referenced
this pull request
Aug 15, 2018
Summary: Constituent PRs: - [x] pytorch#9553 Remove unnecessary functions from StorageDerived.h (by cpuhrsch, reviewed by ezyang) - [x] pytorch#9588 Use THTensor/Storage for THVoidTensor/Storage (by cpuhrsch , reviewed by gchanan) - [x] pytorch#9627 Delete context from tensor (by ezyang, reviewed by gchanan) - [x] pytorch#9641 Tensor reorganization (by ezyang, reviewed by gchanan ) - [x] pytorch#9647 Remove dim_ from THTensor (by cpuhrsch, reviewed by ezyang) - [x] pytorch#9650 Remove context (by cpuhrsch, reviewed by gchanan and ezyang) - [x] pytorch#9715 Fix Windows build in tensor merge PR (by ezyang, reviewed by gchanan and SsnL) Upcoming PRs which didn't make this cut: - [x] pytorch#9644 Stride move to TensorImpl, and nits (by ezyang, reviewed by gchanan) - [ ] pytorch#9652 Native localScalar (by ezyang, **UNREVIEWED AND FAILING TESTS**) - [x] pytorch#9710 Devirtualize TensorImpl::toString (by ezyang, reviewed by gchanan) - [ ] pytorch#9654 Use int64_t instead of ptrdiff_t for size / Rename flag to resizable_ (by cpuhrsch, **CHANGES REQUESTED AND FAILING TESTS**) Pull Request resolved: pytorch#9713 Reviewed By: gchanan Differential Revision: D8960882 Pulled By: ezyang fbshipit-source-id: 99747b2c5462c7ff6809b67aacb4197626408204
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Prior to this patch, the Windows build failed saying that it ran out of heap. This fixes the problem.
This is done by splitting up THTensor.cpp into more compilation units; furthermore, THTensorMath.cpp is further split into THTensorMath, THTensorMoreMath, and THTensorEvenMoreMath. Because I'm pressed for time I didn't try to split them based on theme; it's just purely positional based on the original file.