Skip to content

Commit f456a8a

Browse files
committed
Carrying over partial work from my parameter internals refactoring--this converts the values in Model._param_metrics to a dict rather than a tuple for easier understanding of the code (maybe at some point a namedtuple?) and merged the _param_broadcast_shape attribute into _param_metrics (no reason they should be separate)
1 parent 60b5130 commit f456a8a

3 files changed

Lines changed: 48 additions & 42 deletions

File tree

‎astropy/modeling/core.py‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -879,16 +879,12 @@ def _from_existing(cls, existing, param_names):
879879
self._model_set_axis = existing._model_set_axis
880880
self._parameters = existing._parameters
881881

882-
self._param_metrics = {}
883-
self._param_broadcast_shapes = {}
882+
self._param_metrics = defaultdict(dict)
884883
for param_a, param_b in zip(self.param_names, param_names):
885884
# Take the param metrics info for the giving parameters in the
886885
# existing model, and hand them to the appropriate parameters in
887886
# the new model
888887
self._param_metrics[param_a] = existing._param_metrics[param_b]
889-
if param_b in existing._param_broadcast_shapes:
890-
broadcast = existing._param_broadcast_shapes[param_b]
891-
self._param_broadcast_shape[param_a] = broadcast
892888

893889
self.__init__(*dummy_args)
894890

@@ -1018,6 +1014,9 @@ def _initialize_parameters(self, args, kwargs):
10181014
'{0}.__init__() got an unrecognized parameter '
10191015
'{1!r}'.format(self.__class__.__name__, kwarg))
10201016

1017+
self._model_set_axis = model_set_axis
1018+
self._param_metrics = defaultdict(dict)
1019+
10211020
# Determine the number of model sets: If the model_set_axis is
10221021
# None then there is just one parameter set; otherwise it is determined
10231022
# by the size of that axis on the first parameter--if the other
@@ -1052,25 +1051,20 @@ def _initialize_parameters(self, args, kwargs):
10521051
"same for all input parameter values".format(
10531052
name, n_models, model_set_axis))
10541053

1055-
self._param_broadcast_shapes = self._check_param_broadcast(
1056-
params, max_ndim, model_set_axis)
1054+
self._check_param_broadcast(params, max_ndim)
10571055
else:
10581056
if n_models is None:
10591057
n_models = 1
10601058

1061-
self._param_broadcast_shapes = self._check_param_broadcast(
1062-
params, None, None)
1059+
self._check_param_broadcast(params, None)
10631060

1064-
# First we need to determine how much array space is needed by all the
1065-
# parameters based on the number of parameters, the shape each input
1066-
# parameter, and the param_dim
10671061
self._n_models = n_models
1068-
self._model_set_axis = model_set_axis
1069-
10701062
self._initialize_parameter_values(params)
10711063

10721064
def _initialize_parameter_values(self, params):
1073-
self._param_metrics = {}
1065+
# self._param_metrics should have been initialized in
1066+
# self._initialize_parameters
1067+
param_metrics = self._param_metrics
10741068
total_size = 0
10751069

10761070
for name in self.param_names:
@@ -1093,16 +1087,19 @@ def _initialize_parameter_values(self, params):
10931087
param_shape = np.shape(value)
10941088

10951089
param_slice = slice(total_size, total_size + param_size)
1096-
self._param_metrics[name] = (param_slice, param_shape)
1090+
1091+
param_metrics[name]['slice'] = param_slice
1092+
param_metrics[name]['shape'] = param_shape
10971093
total_size += param_size
10981094

1095+
self._param_metrics = param_metrics
10991096
self._parameters = np.empty(total_size, dtype=np.float64)
11001097
# Now set the parameter values (this will also fill
11011098
# self._parameters)
11021099
for name, value in params.items():
11031100
setattr(self, name, value)
11041101

1105-
def _check_param_broadcast(self, params, max_ndim, model_set_axis):
1102+
def _check_param_broadcast(self, params, max_ndim):
11061103
"""
11071104
This subroutine checks that all parameter arrays can be broadcast
11081105
against each other, and determimes the shapes parameters must have in
@@ -1113,9 +1110,9 @@ def _check_param_broadcast(self, params, max_ndim, model_set_axis):
11131110
single model sets.
11141111
"""
11151112

1116-
broadcast_shapes = {}
11171113
all_shapes = []
11181114
param_names = []
1115+
model_set_axis = self._model_set_axis
11191116

11201117
for name in self.param_names:
11211118
# Previously this just used iteritems(params), but we loop over all
@@ -1151,7 +1148,7 @@ def _check_param_broadcast(self, params, max_ndim, model_set_axis):
11511148
broadcast_shape = (param_shape[:model_set_axis + 1] +
11521149
new_axes +
11531150
param_shape[model_set_axis + 1:])
1154-
broadcast_shapes[name] = broadcast_shape
1151+
self._param_metrics[name]['broadcast_shape'] = broadcast_shape
11551152
all_shapes.append(broadcast_shape)
11561153
else:
11571154
all_shapes.append(param_shape)
@@ -1171,8 +1168,6 @@ def _check_param_broadcast(self, params, max_ndim, model_set_axis):
11711168
"to the broadcasting rules.".format(param_a, shape_a,
11721169
param_b, shape_b))
11731170

1174-
return broadcast_shapes
1175-
11761171
def _param_sets(self, raw=False):
11771172
"""
11781173
Implementation of the Model.param_sets property.
@@ -1187,16 +1182,19 @@ def _param_sets(self, raw=False):
11871182
entirely in the near future.
11881183
"""
11891184

1190-
if raw:
1191-
values = [getattr(self, name)._raw_value
1192-
for name in self.param_names]
1193-
else:
1194-
values = [getattr(self, name).value for name in self.param_names]
1185+
param_metrics = self._param_metrics
1186+
values = []
1187+
for name in self.param_names:
1188+
if raw:
1189+
value = getattr(self, name)._raw_value
1190+
else:
1191+
value = getattr(self, name).value
11951192

1196-
# Ensure parameter values are broadcastable
1197-
for name, shape in six.iteritems(self._param_broadcast_shapes):
1198-
idx = self._param_orders[name]
1199-
values[idx] = values[idx].reshape(shape)
1193+
broadcast_shape = param_metrics[name].get('broadcast_shape')
1194+
if broadcast_shape is not None:
1195+
value = value.reshape(broadcast_shape)
1196+
1197+
values.append(value)
12001198

12011199
shapes = [np.shape(value) for value in values]
12021200

‎astropy/modeling/fitting.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -685,9 +685,10 @@ def _model_to_fit_params(self):
685685
for model in self.models:
686686
params = [p.flatten() for p in model.parameters]
687687
joint_params = self.jointparams[model]
688+
param_metrics = model._param_metrics
688689
for param_name in joint_params:
689-
slc = model._param_metrics[param_name][0]
690-
del params[slc]
690+
slice_ = param_metrics[param_name]['slice']
691+
del params[slice_]
691692
fparams.extend(params)
692693
return fparams
693694

@@ -724,15 +725,16 @@ def objective_function(self, fps, *args):
724725
del fitparams[:numfp]
725726
# recreate the model parameters
726727
mparams = []
728+
param_metrics = model._param_metrics
727729
for param_name in model.param_names:
728730
if param_name in joint_params:
729731
index = joint_params.index(param_name)
730732
# should do this with slices in case the
731733
# parameter is not a number
732734
mparams.extend([jointfitparams[index]])
733735
else:
734-
slc = model._param_metrics[param_name][0]
735-
plen = slc.stop - slc.start
736+
slice_ = param_metrics[param_name]['slice']
737+
plen = slice_.stop - slice_.start
736738
mparams.extend(mfparams[:plen])
737739
del mfparams[:plen]
738740
modelfit = model.evaluate(margs[:-1], *mparams)
@@ -782,15 +784,16 @@ def __call__(self, *args):
782784
del fparams[:numfp]
783785
# recreate the model parameters
784786
mparams = []
787+
param_metrics = model._param_metrics
785788
for param_name in model.param_names:
786789
if param_name in joint_params:
787790
index = joint_params.index(param_name)
788791
# should do this with slices in case the parameter
789792
# is not a number
790793
mparams.extend([jointfitparams[index]])
791794
else:
792-
slc = model._param_metrics[param_name][0]
793-
plen = slc.stop - slc.start
795+
slice_ = param_metrics[param_name]['slice']
796+
plen = slice_.stop - slice_.start
794797
mparams.extend(mfparams[:plen])
795798
del mfparams[:plen]
796799
model.parameters = np.array(mparams)
@@ -863,11 +866,13 @@ def _fitter_to_model_params(model, fps):
863866

864867
fit_param_indices = set(fit_param_indices)
865868
offset = 0
869+
param_metrics = model._param_metrics
866870
for idx, name in enumerate(model.param_names):
867871
if idx not in fit_param_indices:
868872
continue
869873

870-
slice_, shape = model._param_metrics[name]
874+
slice_ = param_metrics[name]['slice']
875+
shape = param_metrics[name]['shape']
871876
# This is determining which range of fps (the fitted parameters) maps
872877
# to parameters of the model
873878
size = reduce(operator.mul, shape, 1)
@@ -893,7 +898,7 @@ def _fitter_to_model_params(model, fps):
893898
for idx, name in enumerate(model.param_names):
894899
if model.tied[name] != False:
895900
value = model.tied[name](model)
896-
slice_ = model._param_metrics[name][0]
901+
slice_ = param_metrics[name]['slice']
897902
model.parameters[slice_] = value
898903

899904

@@ -911,10 +916,11 @@ def _model_to_fit_params(model):
911916
fitparam_indices = list(range(len(model.param_names)))
912917
if any(model.fixed.values()) or any(model.tied.values()):
913918
params = list(model.parameters)
919+
param_metrics = model._param_metrics
914920
for idx, name in list(enumerate(model.param_names))[::-1]:
915921
if model.fixed[name] or model.tied[name]:
916-
sl = model._param_metrics[name][0]
917-
del params[sl]
922+
slice_ = param_metrics[name]['slice']
923+
del params[slice_]
918924
del fitparam_indices[idx]
919925
return (np.array(params), fitparam_indices)
920926
else:

‎astropy/modeling/parameters.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,8 @@ def _get_model_value(self, model):
477477

478478
# Use the _param_metrics to extract the parameter value from the
479479
# _parameters array
480-
param_slice, param_shape = model._param_metrics[self._name]
480+
param_slice = model._param_metrics[self._name]['slice']
481+
param_shape = model._param_metrics[self._name]['shape']
481482
value = model._parameters[param_slice]
482483
if param_shape:
483484
value = value.reshape(param_shape)
@@ -496,7 +497,8 @@ def _set_model_value(self, model, value):
496497
"""
497498

498499
# TODO: Maybe handle exception on invalid input shape
499-
param_slice, param_shape = model._param_metrics[self._name]
500+
param_slice = model._param_metrics[self._name]['slice']
501+
param_shape = model._param_metrics[self._name]['shape']
500502
param_size = np.prod(param_shape)
501503

502504
if np.size(value) != param_size:

0 commit comments

Comments
 (0)