Skip to content

Commit 3696155

Browse files
committed
Adding changes to take off transitions code to save memory
1 parent 2d632a8 commit 3696155

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

demeter/change/expansion.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ def extense_parallel_helper(regix_metix, log, c, allregnumber, allregmet, spat_l
4646
# transitions[reg_met_mask, :, :] += trans_mat
4747

4848
# calculate non-achieved change
49-
transitions[reg_met_mask, :, :] += trans_mat
49+
if transitions.size != 1:
50+
transitions[reg_met_mask, :, :] += trans_mat
5051

5152
non_chg = np.sum(abs(target_change[:, :, :])) / 2.
5253

demeter/change/intensification.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def intense_parallel_helper(regix_metix, spat_region, order_rules, allregnumber,
6363
# arr_reshaped = trans_mat.reshape(trans_mat.shape[0], -1)
6464
# np.savetxt("test.csv", arr_reshaped, delimiter=",")
6565
# log transition
66-
transitions[reg_met_mask, :, :] += trans_mat
66+
if transitions.size != 1:
67+
transitions[reg_met_mask, :, :] += trans_mat
6768

6869
# calculate non-achieved change
6970

demeter/process.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ def prep_step(self):
6464
self.s.lat, self.s.lon, self.step, self.s.kernel_vector,
6565
self.s.weights, self.s.spat_ludataharm)
6666

67-
self.transitions = np.zeros(shape=(self.l_spat_region, self.l_order_rules, self.l_order_rules))
67+
if self.config.save_transitions == 1:
68+
self.transitions = np.zeros(shape=(self.l_spat_region, self.l_order_rules, self.l_order_rules))
69+
else:
70+
self.transitions = np.zeros(shape=1)
6871

6972
def intense_pass(self, pass_num):
7073
"""Conduct the first pass of intensification."""

0 commit comments

Comments
 (0)