Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Traverser and copy #8

Merged
merged 5 commits into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions nevergrad/parametrization/choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,6 @@ def mutate(self) -> None:
for ind in indices:
self.choices[ind].mutate()

def _internal_spawn_child(self: C) -> C:
child = self.__class__(
choices=self.choices.spawn_child(),
deterministic=self._deterministic,
repetitions=self._repetitions,
)
child._content["weights"] = self.weights.spawn_child()
return child


class TransitionChoice(BaseChoice):
"""Ordered categorical parameter, choosing one of the provided choice options as a value, with continuous transitions.
Expand Down Expand Up @@ -325,9 +316,3 @@ def mutate(self) -> None:
indices = set(self.indices)
for ind in indices:
self.choices[ind].mutate()

def _internal_spawn_child(self: T) -> T:
child = self.__class__(choices=self.choices.spawn_child(), repetitions=self._repetitions)
child._content["positions"] = self.positions.spawn_child()
child._content["transitions"] = self.transitions.spawn_child()
return child
32 changes: 19 additions & 13 deletions nevergrad/parametrization/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# LICENSE file in the root directory of this source tree.

import uuid
import copy
import warnings
import operator
import functools
Expand Down Expand Up @@ -358,14 +359,25 @@ def spawn_child(self: P, new_value: tp.Optional[tp.Any] = None) -> P:
Optionally, a new value will be set after creation
"""
rng = self.random_state # make sure to create one before spawning
child = self._internal_spawn_child()
child._set_random_state(rng)
child._constraint_checkers = list(self._constraint_checkers)
child._generation = self.generation + 1
child._descriptors = self._descriptors
child._name = self._name
child.parents_uids.append(self.uid)
child = copy.copy(self)
child.uid = uuid.uuid4().hex
child._frozen = False
child._generation += 1
child.parents_uids = [self.uid]
child.heritage = dict(self.heritage)
child._treecall = self._treecall.new(child)
child._meta = {}
child.loss = None
child._losses = None
child._constraint_checkers = list(self._constraint_checkers)
attribute = self._treecall.attribute
container = getattr(child, self._treecall.attribute)
if attribute != "__dict__": # make a copy of the container if different from __dict__
container = dict(container) if isinstance(container, dict) else list(container)
setattr(child, attribute, container)
for key, val in self._treecall._subitems():
container[key] = val.spawn_child()
child._set_random_state(rng)
if new_value is not None:
child.value = new_value
return child
Expand Down Expand Up @@ -397,7 +409,6 @@ def copy(self: P) -> P: # TODO test (see former instrumentation_copy test)
This is used to run multiple experiments
"""
child = self.spawn_child()
child._name = self._name
child.random_state = None
return child

Expand Down Expand Up @@ -581,11 +592,6 @@ def sample(self: D) -> D:
child.heritage["lineage"] = child.uid
return child

def _internal_spawn_child(self: D) -> D:
child = self.__class__()
child._content = {k: v.spawn_child() for k, v in self._content.items()}
return child


class Dict(Container):
"""Dictionary-valued parameter. This Parameter can contain other Parameters,
Expand Down
19 changes: 8 additions & 11 deletions nevergrad/parametrization/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,16 +341,6 @@ def _internal_set_standardized_data(
if reference.bound_transform is not None:
self._value = reference.bound_transform.forward(self._value)

def _internal_spawn_child(self: D) -> D:
child = self.__class__(init=self.value)
child.parameters._content = {
k: v.spawn_child() if isinstance(v, core.Parameter) else v
for k, v in self.parameters._content.items()
}
for name in ["integer", "exponent", "bounds", "bound_transform", "full_range_sampling"]:
setattr(child, name, getattr(self, name))
return child

def _internal_get_standardized_data(self: D, reference: D) -> np.ndarray:
return reference._to_reduced_space(self._value) - reference._get_ref_data() # type: ignore

Expand Down Expand Up @@ -388,6 +378,13 @@ def recombine(self: D, *others: D) -> None:
else:
raise ValueError(f'Unknown recombination "{recomb}"')

def spawn_child(self: D, new_value: tp.Optional[tp.Any] = None) -> D:
child = super().spawn_child() # dont forward the value
child._value = np.array(self._value, copy=True)
if new_value is not None:
child.value = new_value
return child


class Array(Data):

Expand Down Expand Up @@ -428,7 +425,7 @@ class Scalar(Data):
upper: optional float
maximum value if any
mutable_sigma: bool
whether the mutation standard deviation must mutate as well (for mutation based algorithms)
wheter the mutation standard deviation must mutate as well (for mutation based algorithms)

Notes
-----
Expand Down
1 change: 1 addition & 0 deletions nevergrad/parametrization/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def split_as_data_parameters(
# analyze results
data = copied.get_standardized_data(reference=ref)
order: tp.List[int] = []
print(data)
for val, _ in itertools.groupby(data):
num = int(np.round(val))
if num in order:
Expand Down
3 changes: 3 additions & 0 deletions nevergrad/parametrization/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ def __init__(self, obj: tp.Any, cls: tp.Type[tp.Any], attribute: str = "__dict__
self.cls = cls
self.attribute = attribute

def new(self, obj: tp.Any) -> "Treecall":
return Treecall(obj, cls=self.cls, attribute=self.attribute)

def _subitems(self) -> tp.Iterator[tp.Tuple[tp.Any, tp.Any]]:
container = getattr(self.obj, self.attribute)
if not isinstance(container, (list, dict)):
Expand Down