Skip to content

Commit d2c1fac

Browse files
committed
Merge branch 'dev_add_random_crop_op' of https://github.com/JiayiFeng/Paddle into dev_add_random_crop_op
2 parents a6c11a5 + 3165ffa commit d2c1fac

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

paddle/fluid/framework/operator.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ class RuntimeInferShapeContext : public InferShapeContext {
466466
protected:
467467
DDim GetDim(const std::string& name) const override {
468468
Variable* var = scope_.FindVar(name);
469+
PADDLE_ENFORCE_NOT_NULL(var);
469470
if (var->IsType<LoDTensor>()) {
470471
return var->Get<LoDTensor>().dims();
471472
} else if (var->IsType<SelectedRows>()) {

python/paddle/fluid/layers/nn.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3996,13 +3996,19 @@ def random_crop(input, shape, seed=1):
39963996
out = helper.create_tmp_variable(dtype)
39973997
if isinstance(seed, int):
39983998
seed_value = seed
3999-
seed = helper.create_global_variable(
4000-
persistable=True, shape=[1], dtype="int32")
4001-
helper.set_variable_initializer(
4002-
var=seed, initializer=Constant(value=seed_value))
3999+
seed = helper.create_tmp_variable(dtype="int64")
4000+
helper.append_op(
4001+
type="fill_constant",
4002+
inputs={},
4003+
outputs={"Out": seed},
4004+
attrs={
4005+
"dtype": seed.dtype,
4006+
"shape": [1],
4007+
"value": float(seed_value)
4008+
})
40034009
elif not isinstance(seed, Variable):
40044010
raise ValueError("'seed' must be a Variable or an int.")
4005-
seed_out = helper.create_tmp_variable(dtype="int32")
4011+
seed_out = helper.create_tmp_variable(dtype="int64")
40064012
helper.append_op(
40074013
type="random_crop",
40084014
inputs={"X": input,

tools/codestyle/docstring_checker.pyc

11.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)