Skip to content

Commit da8d861

Browse files
chunksize > 0 !
1 parent 78da7ef commit da8d861

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

climada/engine/unsequa/calc_cost_benefit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def uncertainty(self, unc_data, pool=None, **cost_benefit_kwargs):
198198
with log_level(level='ERROR', name_prefix='climada'):
199199
if pool:
200200
LOGGER.info('Using %s CPUs.', pool.ncpus)
201-
chunksize = min(unc_data.n_samples // pool.ncpus, 100)
201+
chunksize = max(min(unc_data.n_samples // pool.ncpus, 100), 1)
202202
cb_metrics = pool.map(partial(self._map_costben_calc, **cost_benefit_kwargs),
203203
samples_df.iterrows(),
204204
chunksize=chunksize)

climada/engine/unsequa/calc_impact.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def uncertainty(self,
205205
with log_level(level='ERROR', name_prefix='climada'):
206206
if pool:
207207
LOGGER.info('Using %s CPUs.', pool.ncpus)
208-
chunksize = min(unc_sample.n_samples // pool.ncpus, 100)
208+
chunksize = max(min(unc_sample.n_samples // pool.ncpus, 100), 1)
209209
imp_metrics = pool.map(self._map_impact_calc,
210210
samples_df.iterrows(),
211211
chunksize=chunksize)

climada/hazard/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def from_raster(cls, files_intensity, files_fraction=None, attrs=None,
365365
files_intensity[0], src_crs=src_crs, window=window, geometry=geometry, dst_crs=dst_crs,
366366
transform=transform, width=width, height=height, resampling=resampling)
367367
if pool:
368-
chunksize = min(len(files_intensity) // pool.ncpus, 1000)
368+
chunksize = max(min(len(files_intensity) // pool.ncpus, 1000), 1)
369369
inten_list = pool.map(
370370
centroids.values_from_raster_files,
371371
[[f] for f in files_intensity],

climada/hazard/tc_tracks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ def equal_timestep(self, time_step_h=1, land_params=False, pool=None):
11151115
land_geom = None
11161116

11171117
if pool:
1118-
chunksize = min(self.size // pool.ncpus, 1000)
1118+
chunksize = max(min(self.size // pool.ncpus, 1000), 1)
11191119
self.data = pool.map(
11201120
self._one_interp_data,
11211121
self.data,

climada/hazard/tc_tracks_synth.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def calc_perturbed_trajectories(tracks,
193193
for track in tracks.data]
194194

195195
if pool:
196-
chunksize = min(tracks.size // pool.ncpus, 1000)
196+
chunksize = max(min(tracks.size // pool.ncpus, 1000), 1)
197197
new_ens = pool.map(_one_rnd_walk, tracks.data,
198198
itertools.repeat(nb_synth_tracks, tracks.size),
199199
itertools.repeat(max_shift_ini, tracks.size),
@@ -592,7 +592,7 @@ def _calc_land_decay(hist_tracks, land_geom, s_rel=True, check_plot=False,
592592
if pool:
593593
dec_val = pool.map(_decay_values, hist_tracks, itertools.repeat(land_geom),
594594
itertools.repeat(s_rel),
595-
chunksize=min(len(hist_tracks) // pool.ncpus, 1000))
595+
chunksize=max(min(len(hist_tracks) // pool.ncpus, 1000), 1))
596596
else:
597597
dec_val = [_decay_values(track, land_geom, s_rel) for track in hist_tracks]
598598

@@ -646,7 +646,7 @@ def _apply_land_decay(tracks, v_rel, p_rel, land_geom, s_rel=True,
646646
orig_pres.append(np.copy(track.central_pressure.values))
647647

648648
if pool:
649-
chunksize = min(len(tracks) // pool.ncpus, 1000)
649+
chunksize = max(min(len(tracks) // pool.ncpus, 1000), 1)
650650
tracks = pool.map(_apply_decay_coeffs, tracks,
651651
itertools.repeat(v_rel), itertools.repeat(p_rel),
652652
itertools.repeat(land_geom), itertools.repeat(s_rel),

climada/hazard/trop_cyclone.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def from_tracks(
299299
LOGGER.info('Mapping %s tracks to %s coastal centroids.', str(tracks.size),
300300
str(coastal_idx.size))
301301
if pool:
302-
chunksize = min(num_tracks // pool.ncpus, 1000)
302+
chunksize = max(min(num_tracks // pool.ncpus, 1000), 1)
303303
tc_haz_list = pool.map(
304304
cls.from_single_track, tracks.data,
305305
itertools.repeat(centroids, num_tracks),

0 commit comments

Comments
 (0)