From fcc1ffab5d2bf7db8859d772b8eda7c2ea9c1d96 Mon Sep 17 00:00:00 2001 From: dongzhihong Date: Wed, 24 Oct 2018 21:41:39 +0800 Subject: [PATCH 1/3] fix mem opt --- .../paddle/fluid/transpiler/memory_optimization_transpiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index 861bb5fae5..7298bfe16e 100755 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -171,7 +171,7 @@ class ControlFlowGraph(object): self._live_out[i] |= self._live_in[s] self._live_in[i] = self._uses[i] | ( self._live_out[i] - self._defs[i]) - if live_in[i] != self._live_in[i]: + if live_in[i] != set(self._live_in[i]): for d in self._presuccessors[i]: worklist.append(d) From 8ee3bdb66b59e313482f28fb65c97e659951dc72 Mon Sep 17 00:00:00 2001 From: dongzhihong Date: Fri, 26 Oct 2018 11:29:33 +0800 Subject: [PATCH 2/3] "recun ci. test=develop" --- .../paddle/fluid/transpiler/memory_optimization_transpiler.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index 7298bfe16e..b34575d040 100755 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -321,8 +321,7 @@ class ControlFlowGraph(object): if not compare_shape(x_shape, cache_shape, level): continue - # TODO(qijun): actually, we should compare - # dtype_to_size[x_dtype] and dtype_to_size[cache_dtype] + # TODO(qijun): dtype_to_size[x_dtype] and dtype_to_size[cache_dtype] if x_dtype != cache_dtype: continue From 755c04df6e96cd5f7507f55abd58c1c50f970080 Mon Sep 17 00:00:00 2001 From: dongzhihong Date: Mon, 29 Oct 2018 10:14:06 +0800 Subject: [PATCH 3/3] rerun ci. test=develop --- python/paddle/fluid/transpiler/memory_optimization_transpiler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py index b34575d040..c9f1be9347 100755 --- a/python/paddle/fluid/transpiler/memory_optimization_transpiler.py +++ b/python/paddle/fluid/transpiler/memory_optimization_transpiler.py @@ -486,7 +486,6 @@ def memory_optimize(input_program, skip_opt_set = grad_set else: skip_opt_set.update(grad_set) - cfgs = _get_cfgs(input_program) for cfg in cfgs: cfg.memory_optimize(skip_opt_set=skip_opt_set, level=level)