Merge branch 'main' into feature/analyze_dataset

Author: jaagut

.github/pull_request_template.md

@@ -10,4 +10,4 @@
 
 - [ ] Write documentation
 - [ ] Create issues for future work
-- [ ] This PR is on our `DDLitLab` project board
+- [ ] This PR is on our [SoccerDiffusion](https://github.com/orgs/bit-bots/projects/26) project board

.github/workflows/test-dataset.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Setup DB with alembic migrations
         run: |
-          cd ./ddlitlab2024/dataset
+          cd ./soccer_diffusion/dataset
           poetry run alembic upgrade head
 
       - name: Populate DB with dummy data

.gitignore

@@ -210,7 +210,7 @@ ENV/
 *.pth
 
 # Wandb Logs
-ddlitlab2024/ml/training/wandb/
+soccer_diffusion/ml/training/wandb/
 
 # Input data
 input/

.vscode/launch.json

@@ -4,7 +4,7 @@
       "type": "debugpy",
       "request": "launch",
       "name": "Launch Bit-Bots import",
-      "program": "${workspaceFolder}/ddlitlab2024/dataset/cli/run.py",
+      "program": "${workspaceFolder}/soccer_diffusion/dataset/cli/run.py",
       "args": [
         "import",
         "bit-bots",
@@ -15,7 +15,7 @@
       "type": "debugpy",
       "request": "launch",
       "name": "Launch B-Human import",
-      "program": "${workspaceFolder}/ddlitlab2024/dataset/cli/run.py",
+      "program": "${workspaceFolder}/soccer_diffusion/dataset/cli/run.py",
       "args": [
         "import",
         "b-human",

.vscode/settings.json

@@ -3,16 +3,19 @@
     "bigendian",
     "dateutil",
     "ddlitlab",
+    "denoising",
     "dtype",
     "dtypes",
     "frombuffer",
+    "gamestate",
     "ignoretz",
     "mcap",
     "nanosec",
     "ndarray",
     "ndim",
     "nullable",
     "ollama",
+    "pretraining",
     "pybh",
     "rclpy",
     "resampler",

README.md

@@ -1,12 +1,11 @@
-# DDLitLab2024 Project Hamburg Bit-Bots
+# SoccerDiffusion
 
-End-to-end machine learning for soccer-playing robots. We are experimenting with diffusion-models to generate robot motions based on recent sensor measurements.
+> Toward Learning End-to-End Humanoid Robot Soccer from Gameplay Recordings
 
-> [!IMPORTANT]
-> This is still an ongioing research project.
+Find our (preprint) paper and more information about the project on our [website](https://bit-bots.github.io/SoccerDiffusion/).
 
-> [!NOTE]
-> This repository contains the source code for our [DDLitLab project](https://www.isa.uni-hamburg.de/ddlitlab.html) [Fußballspielende Roboter: Ende-zu-Ende-KI für Wahrnehmung und Steuerung im RoboCup](https://www.isa.uni-hamburg.de/ddlitlab/data-literacy-studierendenprojekte/vierte-foerderrunde/e2e-robot-soccer.html) for the fourth funding round.
+> [!IMPORTANT]
+> This is still an ongoing research project.
 
 ## Getting Started
 
@@ -19,13 +18,13 @@ End-to-end machine learning for soccer-playing robots. We are experimenting with
 1. Download this repo:
 
     ```shell
-    git clone https://github.com/bit-bots/ddlitlab2024.git
+    git clone https://github.com/bit-bots/SoccerDiffusion.git
     ```
 
 2. Go into the downloaded directory:
 
     ```shell
-    cd ddlitlab2024
+    cd soccer_diffusion
     ```
 
 3. Install dependencies using [poetry](https://python-poetry.org/docs/#installation):
@@ -55,3 +54,11 @@ Some tools contained in this repository require additional system-dependencies.
     ```
 
     Then build the Python package as described in [this document](https://docs.b-human.de/master/python-bindings/#local-build).
+
+## Acknowledgements
+
+We gratefully acknowledge funding and support from the project [*Digital and Data Literacy in Teaching Lab (DDLitLab)*](https://www.hcl.uni-hamburg.de/ddlitlab.html) at the University of Hamburg and the [*Stiftung Innovation in der Hochschullehre*](https://stiftung-hochschullehre.de/) foundation.
+We extend our special thanks to the members of the [*Hamburg Bit-Bots*](https://bit-bots.de/) RoboCup team for their continuous support and for providing data and computational resources.
+We also thank the RoboCup teams [*B-Human*](https://b-human.de/) and [*HULKs*](https://hulks.de/) for generously sharing their data for this research.
+Additionally, we are grateful to the [*Technical Aspects of Multimodal Systems (TAMS)*](https://tams.informatik.uni-hamburg.de/) research group at the University of Hamburg for providing computational resources.
+This research was partially funded by the Ministry of Science, Research and Equalities of Hamburg, as well as the German Research Foundation (DFG) and the National Science Foundation of China (NSFC) through the project [*Crossmodal Learning*](https://www.crossmodal-learning.org/home.html) (TRR-169).

poetry.lock

@@ -3,10 +3,10 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-name = "ddlitlab2024"
-version = "0.0.1"
+name = "soccer_diffusion"
+version = "1.0.0"
 readme = "README.md"
-repository = "https://github.com/bit-bots/ddlitlab2024"
+repository = "https://github.com/bit-bots/SoccerDiffusion"
 authors = ["Florian Vahl", "Jan Gutsche", "Joern Griepenburg"]
 description = ""
 
@@ -61,4 +61,4 @@ line-length = 120
 select = ["F", "E", "B", "W", "I", "N", "UP"]
 
 [tool.poetry.scripts]
-cli = "ddlitlab2024.dataset.cli.run:main"
+cli = "soccer_diffusion.dataset.cli.run:main"

pyproject.toml

@@ -4,13 +4,13 @@
 from pathlib import Path
 from uuid import UUID, uuid4
 
-_project_name: str = "ddlitlab2024"
+_project_name: str = "soccer_diffusion"
 __version__: str = importlib.metadata.version(_project_name)
 
 # Craft LOGGING PATH
 # Get the log directory from the environment variable or use the default
 _logging_dir: str = os.path.abspath(
-    os.environ.get("DDLITLAB_LOG_DIR", os.path.join(os.path.dirname(__file__), "..", "logs"))
+    os.environ.get("SOCCER_DIFFUSION_LOG_DIR", os.path.join(os.path.dirname(__file__), "..", "logs"))
 )
 
 # Verify that the log directory exists and create it if it doesn't
@@ -40,7 +40,9 @@
 
 SESSION_ID: UUID = uuid4()
 
-DB_PATH: Path = Path(os.environ.get("DDLITLAB_DB_PATH", Path.joinpath(Path(__file__).parent, "dataset", "db.sqlite3")))
+DB_PATH: Path = Path(
+    os.environ.get("SOCCER_DIFFUSION_DB_PATH", Path.joinpath(Path(__file__).parent, "dataset", "db.sqlite3"))
+)
 
 DEFAULT_RESAMPLE_RATE_HZ = 50
 IMAGE_MAX_RESAMPLE_RATE_HZ = 10

ddlitlab2024/__init__.py renamed to soccer_diffusion/__init__.py

@@ -3,7 +3,7 @@
 
 from rich.logging import RichHandler
 
-from ddlitlab2024 import LOGGING_PATH, SESSION_ID
+from soccer_diffusion import LOGGING_PATH, SESSION_ID
 
 MODULE_NAME: str = "dataset"