Skip to content

Commit edd963e

Browse files
committed
Merge branch 'development'
2 parents fed27c4 + deb2f6b commit edd963e

File tree

141 files changed

+1596
-1183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1596
-1183
lines changed

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1+
*venv/
12
docs/analysis/*
23
MUJOCO_LOG.TXT
34

4-
dexterity/monitor/static/experiments/
5+
angorapy/monitor/static/experiments/
56
storage/
67
!storage/saved_models
78
storage/saved_models/*
89
!/storage/saved_models/*.zip
910

10-
dexterity/analysis/monitor/experiments/
11-
dexterity/analysis/storage/
11+
angorapy/analysis/monitor/experiments/
12+
angorapy/analysis/storage/
1213

1314
docs/monitor/experiments/
1415
docs/benchmarks/backup/*
1516
docs/benchmarks/*.pdf
1617
docs/storage/
17-
dexterity/monitor/experiments/
18+
angorapy/monitor/experiments/
1819
rnnconstruction/firsttrainhistory
1920
rnnconstruction/saved/
2021

README.md

Lines changed: 90 additions & 141 deletions
Large diffs are not rendered by default.

angorapy/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import angorapy.agent
2+
from angorapy.common.wrappers import make_env
3+
from angorapy.models import get_model_builder
4+
from angorapy.utilities.monitoring import Monitor

angorapy/agent/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from angorapy.agent.ppo_agent import PPOAgent
2+
from angorapy.agent.gather import BaseGatherer, Gatherer, EpsilonGreedyGatherer

dexterity/agent/core.py renamed to angorapy/agent/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import tensorflow as tf
88
from scipy.signal import lfilter
99

10-
from dexterity.common.const import NP_FLOAT_PREC
10+
from angorapy.common.const import NP_FLOAT_PREC
1111

1212

1313
def get_discounted_returns(reward_trajectory, discount_factor: float):

dexterity/agent/dataio.py renamed to angorapy/agent/dataio.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import tensorflow as tf
1111
from mpi4py import MPI
1212

13-
from dexterity.common.const import STORAGE_DIR
14-
from dexterity.common.senses import Sensation
15-
from dexterity.utilities.datatypes import StatBundle
16-
from dexterity.common.data_buffers import ExperienceBuffer, TimeSequenceExperienceBuffer
13+
from angorapy.common.const import STORAGE_DIR
14+
from angorapy.common.senses import Sensation
15+
from angorapy.utilities.datatypes import StatBundle
16+
from angorapy.common.data_buffers import ExperienceBuffer, TimeSequenceExperienceBuffer
1717

1818

1919
def _float_feature(value):

dexterity/agent/gather.py renamed to angorapy/agent/gather.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
import tensorflow as tf
1010
from gym.spaces import Box
1111

12-
from dexterity.agent.core import estimate_episode_advantages
13-
from dexterity.agent.dataio import tf_serialize_example, make_dataset_and_stats, serialize_sample
14-
from dexterity.common.data_buffers import ExperienceBuffer, TimeSequenceExperienceBuffer
15-
from dexterity.common.policies import BasePolicyDistribution
16-
from dexterity.common.senses import Sensation
17-
from dexterity.common.wrappers import BaseWrapper, make_env
18-
from dexterity.common.const import STORAGE_DIR, DETERMINISTIC
19-
from dexterity.utilities.datatypes import StatBundle
20-
from dexterity.utilities.model_utils import is_recurrent_model
21-
from dexterity.utilities.util import add_state_dims, flatten, env_extract_dims
12+
from angorapy.agent.core import estimate_episode_advantages
13+
from angorapy.agent.dataio import tf_serialize_example, make_dataset_and_stats, serialize_sample
14+
from angorapy.common.data_buffers import ExperienceBuffer, TimeSequenceExperienceBuffer
15+
from angorapy.common.policies import BasePolicyDistribution
16+
from angorapy.common.senses import Sensation
17+
from angorapy.common.wrappers import BaseWrapper, make_env
18+
from angorapy.common.const import STORAGE_DIR, DETERMINISTIC
19+
from angorapy.utilities.datatypes import StatBundle
20+
from angorapy.utilities.model_utils import is_recurrent_model
21+
from angorapy.utilities.util import add_state_dims, flatten, env_extract_dims
2222

2323

2424
class BaseGatherer(abc.ABC):
File renamed without changes.
File renamed without changes.

dexterity/agent/ppo/optim.py renamed to angorapy/agent/ppo/optim.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import tensorflow as tf
44

5-
from dexterity.agent.core import extract_discrete_action_probabilities
6-
from dexterity.agent.ppo import loss
7-
from dexterity.common.policies import BasePolicyDistribution
8-
from dexterity.common.senses import Sensation
5+
from angorapy.agent.core import extract_discrete_action_probabilities
6+
from angorapy.agent.ppo import loss
7+
from angorapy.common.policies import BasePolicyDistribution
8+
from angorapy.common.senses import Sensation
99

1010

1111
def learn_on_batch(batch,

0 commit comments

Comments
 (0)