Skip to content

Simplify THPPointer implementation for Storage. #14897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Simplify THPPointer implementation for Storage. #14897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5322ae6
Simplify THPPointer implementation for Storage.
ezyang Dec 7, 2018
31df151
Merge remote-tracking branch 'origin/master' into ezyang-pr/thppointe…
ezyang Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions torch/csrc/Storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,15 @@
#include <torch/csrc/copy_utils.h>
#include <torch/csrc/DynamicTypes.h>

#ifdef USE_CUDA
#include <THC/THCStorage.hpp>
#endif

#include <torch/csrc/generic/Storage.cpp>
#include <TH/THGenerateAllTypes.h>

#include <torch/csrc/generic/Storage.cpp>
#include <TH/THGenerateHalfType.h>

// NB: If you ever divest libtorch of USE_CUDA, you'll have to virtualize
// the CUDA call.
template<>
void THPPointer<THStorage>::free() {
if (ptr) {
if (ptr->data_ptr().device().is_cpu()) {
THStorage_free(ptr);
} else {
AT_ASSERT(ptr->data_ptr().device().is_cuda());
#ifdef USE_CUDA
THStorage_free(ptr);
#else
AT_ERROR("Cannot free THCStorage when not built with CUDA");
#endif
}
THStorage_free(ptr);
}
}