Skip to content

Commit 9a7799f

Browse files
committed
Remove unused arguments from formal list.
test=develop
1 parent 82e5670 commit 9a7799f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

paddle/fluid/framework/ir/fusion_group/code_generator.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ limitations under the License. */
1414

1515
#include "paddle/fluid/framework/ir/fusion_group/code_generator.h"
1616
#include <sstream>
17+
#include <unordered_set>
1718
#include "paddle/fluid/framework/ir/fusion_group/code_generator_helper.h"
1819
#include "paddle/fluid/framework/ir/fusion_group/operation.h"
1920

@@ -106,7 +107,9 @@ std::set<int> CodeGenerator::DistilInputIds(
106107
// Use std::set to remove the reptead id and get a ordered list.
107108
for (size_t i = 0; i < expressions.size(); i++) {
108109
for (auto id : expressions[i].GetInputIds()) {
109-
input_ids.insert(id);
110+
if (id >= 0) {
111+
input_ids.insert(id);
112+
}
110113
}
111114
}
112115
return input_ids;

paddle/fluid/framework/ir/fusion_group/code_generator_tester.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ void CheckOutput(const std::vector<OperationExpression>& expressions,
9191
const std::vector<int> output_ids_of_subgraph, int i) {
9292
std::vector<float> var(cpu_tensors.size());
9393
for (auto id : input_ids_of_subgraph) {
94-
var[id] = cpu_tensors[id].data<float>()[i];
94+
if (id >= 0) {
95+
var[id] = cpu_tensors[id].data<float>()[i];
96+
}
9597
}
9698

9799
for (auto expression : expressions) {
@@ -182,10 +184,8 @@ void TestMainImpl(std::string func_name, std::string code_str,
182184
gpu_tensors[id].mutable_data<float>(cpu_tensors[id].dims(), place);
183185
fusion_group::SetupRandomCPUTensor<float>(&cpu_tensors[id]);
184186
TensorCopySync(cpu_tensors[id], place, &gpu_tensors[id]);
185-
} else {
186-
gpu_ptrs[id] = nullptr;
187+
args.push_back(&gpu_ptrs[id]);
187188
}
188-
args.push_back(&gpu_ptrs[id]);
189189
}
190190

191191
for (auto id : output_ids) {
@@ -283,7 +283,7 @@ TEST(code_generator, elementwise_grad) {
283283
// t3 = relu(t2)
284284
// t2' = relu_grad(t2, t3, t3')
285285
// t0', t1' = elementwise_mul_grad(t0, t1, t2, t2')
286-
fusion_group::OperationExpression exp1("relu_grad", {2, 3, 7}, {6});
286+
fusion_group::OperationExpression exp1("relu_grad", {2, -1, 7}, {6});
287287
fusion_group::OperationExpression exp2("elementwise_mul_grad", {0, 1, 2, 6},
288288
{4, 5});
289289
std::vector<fusion_group::OperationExpression> expressions = {exp1, exp2};
@@ -300,7 +300,7 @@ TEST(code_generator, elementwise_grad) {
300300
// Op(relu_grad), inputs:{2,3,7}, outputs:{6}
301301
// Op(elementwise_mul_grad), inputs:{0,1,2,6}, outputs:{4,5}
302302
int n = cpu_tensors[0].numel();
303-
std::vector<int> input_ids = {0, 1, 2, 3, 7};
303+
std::vector<int> input_ids = {0, 1, 2, -1, 7};
304304
std::vector<int> output_ids = {4, 5, 6};
305305
TestMain("elementwise_grad_kernel_0", expressions, cpu_tensors, n, input_ids,
306306
output_ids);

0 commit comments

Comments
 (0)