Merge branch 'release/pypipub'

Author: cnheider

.github/workflows/publish-to-test-pypi.yml

@@ -0,0 +1,45 @@
+name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+
+on: push
+
+  #on:
+  #push:
+#branches: [master]
+
+jobs:
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Install pep517
+        run: >-
+              python -m
+              pip install
+              pep517
+              --user
+      - name: Build a binary wheel and a source tarball
+        run: >-
+              python -m
+              pep517.build
+              --source
+              --binary
+              --out-dir dist/
+              .
+      - name: Publish distribution 📦 to Test PyPI
+        if: endsWith(github.ref, 'master')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.test_pypi_password }}
+          repository_url: https://test.pypi.org/legacy/
+      - name: Publish distribution 📦 to PyPI
+        if: startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.pypi_password }}
+          #verbose: true
+          #skip_existing: true

neodroidagent/utilities/exploration/intrinsic_signals/torch_isp/curiosity/icm.py

@@ -124,7 +124,7 @@ def __init__(
         signal_space: SignalSpace,
         policy_weight: float,
         weight: float,
-        intrinsic_reward_integration: float,
+        intrinsic_signal_factor: float,
         hidden_dim: int = 128,
     ):
         """
@@ -134,7 +134,7 @@ def __init__(
 :param signal_space: used for scaling the intrinsic reward returned by this module. Can be used to control how
 the fluctuation scale of the intrinsic signal
 :param weight: balances the importance between forward and inverse model
-:param intrinsic_reward_integration: balances the importance between extrinsic and intrinsic signal.
+:param intrinsic_signal_factor: balances the importance between extrinsic and intrinsic signal.
 """
 
         assert (
@@ -148,7 +148,7 @@ def __init__(
         self.policy_weight = policy_weight
         self.reward_scale = signal_space.span
         self.weight = weight
-        self.intrinsic_signal_integration = intrinsic_reward_integration
+        self.intrinsic_signal_factor = intrinsic_signal_factor
 
         self.encoder = nn.Sequential(
             nn.Linear(observation_space.shape[0], hidden_dim),
@@ -233,8 +233,8 @@ def sample(
             writer.scalar("icm/signal", intrinsic_signal.mean().item())
 
         return (
-            1.0 - self.intrinsic_signal_integration
-        ) * signals + self.intrinsic_signal_integration * intrinsic_signal
+            1.0 - self.intrinsic_signal_factor
+        ) * signals + self.intrinsic_signal_factor * intrinsic_signal
 
     def loss(
         self,

neodroidagent/utilities/transformation/processing.py

@@ -95,3 +95,6 @@ def gray_downscale(state, configuration):
     downsized_img = transform.resize(gray_img, (84, 84), mode="constant")
     state = torch.from_numpy(downsized_img).type(StateTensorType)  # 2D image tensor
     return torch.stack([state], 0).unsqueeze(0)
+
+if __name__ == '__main__':
+    gray_downscale()

requirements.txt

@@ -1,5 +1,4 @@
 devpack
-gym
 Neodroid
 trolls
 numpy
@@ -18,3 +17,5 @@ pip
 scipy
 numba
 tensorboard
+#pybullet
+#gym

samples/experimental/grasping.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = 'Christian Heider Nielsen'
+__doc__ = r'''
+
+           Created on 19-10-2020
+           '''
+
+if __name__ == '__main__':
+
+
+  def main():
+    from pybullet_envs.bullet.kuka_diverse_object_gym_env import (    KukaDiverseObjectEnv      )
+
+    env = KukaDiverseObjectEnv(
+        isDiscrete=True,
+        renders=True,
+        height=84,
+        width=84,
+        maxSteps=2000,
+        isTest=True,
+        )
+    # Disable file caching to keep memory usage small
+    env._p.setPhysicsEngineParameter(enableFileCaching=False)
+
+  main()

tests/test_sanity.py

@@ -5,7 +5,10 @@
 import pytest
 
 __author__ = "Christian Heider Nielsen"
+__doc__ = r"""
 
+           Created on 01/08/2020
+           """
 
 def test_sanity():
     assert True
@@ -21,7 +24,7 @@ def test_print(capsys):
     print(text)
     sys.stderr.write("world")
     captured = capsys.readouterr()
-    assert text in captured.head
+    assert text in captured.out
     assert err in captured.err