-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
fix compile errors in tensor #2706
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
696ba1d
init tensor_test.cc
JiayiFeng 9f408df
fix some compile error
JiayiFeng e146fe8
fix compile errors and add assert test
JiayiFeng d054a5e
re-submit
JiayiFeng 2d1f95d
fix a compile error
JiayiFeng e48e21d
remove unnecessary include
JiayiFeng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
#include "paddle/framework/tensor.h" | ||
#include <gtest/gtest.h> | ||
#include <string> | ||
|
||
TEST(Tensor, ASSERT) { | ||
paddle::framework::Tensor cpu_tensor; | ||
|
||
bool caught = false; | ||
try { | ||
const double* p __attribute__((unused)) = cpu_tensor.data<double>(); | ||
} catch (paddle::framework::EnforceNotMet err) { | ||
caught = true; | ||
std::string msg = "Tensor::data must be called after Tensor::mutable_data."; | ||
const char* what = err.what(); | ||
for (size_t i = 0; i < msg.length(); ++i) { | ||
ASSERT_EQ(what[i], msg[i]); | ||
} | ||
} | ||
ASSERT_TRUE(caught); | ||
} | ||
|
||
/* mutable_data() is not tested at present | ||
because Memory::Alloc() and Memory::Free() have not been ready. | ||
|
||
TEST(Tensor, MutableData) { | ||
using namespace paddle::framework; | ||
using namespace paddle::platform; | ||
{ | ||
Tensor cpu_tensor; | ||
float* p1 = nullptr; | ||
float* p2 = nullptr; | ||
// initialization | ||
p1 = cpu_tensor.mutable_data<float>(make_ddim({1, 2, 3}), CPUPlace()); | ||
EXPECT_NE(p1, nullptr); | ||
// set cpu_tensor a new dim with large size | ||
// momery is supposed to be re-allocated | ||
p2 = cpu_tensor.mutable_data<float>(make_ddim({3, 4})); | ||
EXPECT_NE(p2, nullptr); | ||
EXPECT_NE(p1, p2); | ||
// set cpu_tensor a new dim with same size | ||
// momery block is supposed to be unchanged | ||
p1 = cpu_tensor.mutable_data<float>(make_ddim({2, 2, 3})); | ||
EXPECT_EQ(p1, p2); | ||
// set cpu_tensor a new dim with smaller size | ||
// momery block is supposed to be unchanged | ||
p2 = cpu_tensor.mutable_data<float>(make_ddim({2, 2})); | ||
EXPECT_EQ(p1, p2); | ||
} | ||
|
||
{ | ||
Tensor gpu_tensor; | ||
float* p1 = nullptr; | ||
float* p2 = nullptr; | ||
// initialization | ||
p1 = gpu_tensor.mutable_data<float>(make_ddim({1, 2, 3}), GPUPlace()); | ||
EXPECT_NE(p1, nullptr); | ||
// set gpu_tensor a new dim with large size | ||
// momery is supposed to be re-allocated | ||
p2 = gpu_tensor.mutable_data<float>(make_ddim({3, 4})); | ||
EXPECT_NE(p2, nullptr); | ||
EXPECT_NE(p1, p2); | ||
// set gpu_tensor a new dim with same size | ||
// momery block is supposed to be unchanged | ||
p1 = gpu_tensor.mutable_data<float>(make_ddim({2, 2, 3})); | ||
EXPECT_EQ(p1, p2); | ||
// set gpu_tensor a new dim with smaller size | ||
// momery block is supposed to be unchanged | ||
p2 = gpu_tensor.mutable_data<float>(make_ddim({2, 2})); | ||
EXPECT_EQ(p1, p2); | ||
} | ||
} | ||
*/ |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that
Deleter
is pretty generally useful -- as long as memory blocks are allocated usingpaddle::memory::Alloc
,Deleter
can free it. How about we moveDeleter
to bepaddle::memory::Deleter
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it!