Merge latest master into v0.3

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -38,7 +38,7 @@ Steps to reproduce the behavior:
 - How you installed MARO (`pip`, `source`):
 - OS (`Linux`, `Windows`, `macOS`):
 - Python version (`3.6`, `3.7`):
-- Docker image (e.g., arthursjiang/maro:cpu[5f36ed]):
+- Docker image (e.g., maro2020/maro:latest):
 - CPU/GPU:
 - Any other relevant information:
 

.github/workflows/deploy_docker_image.yml

@@ -30,7 +30,7 @@ jobs:
       run: |
         pip install -r ./maro/requirements.build.txt
         cython ./maro/backends/backend.pyx ./maro/backends/np_backend.pyx ./maro/backends/raw_backend.pyx ./maro/backends/frame.pyx --cplus -3 -E NODES_MEMORY_LAYOUT=ONE_BLOCK -X embedsignature=True
-        cat ./maro/__misc__.py | grep __version__ | egrep -o [0-9].[0-9].[0-9,a-z]+ | { read version; docker build -f ./docker_files/cpu.play.df . -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:cpu -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:latest -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:cpu-$version; }
+        cat ./maro/__misc__.py | grep __version__ | egrep -o [0-9].[0-9].[0-9,a-z]+ | { read version; docker build -f ./docker_files/cpu.playground.df . -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:cpu -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:latest -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:cpu-$version; }
 
     - name: Login docker hub
       run: |

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
         matrix:
           os: [ubuntu-16.04, ubuntu-18.04, windows-latest, macos-latest]
-          python-version: [3.6, 3.7]
+          python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
     - name: Install torch on Windows
       if: runner.os == 'Windows'
       run: |
-        pip install torch===1.6.0 torchvision===0.7.0 -f https://download.pytorch.org/whl/torch_stable.html
+        pip install torch===1.7.1 torchvision===0.8.2 -f https://download.pytorch.org/whl/torch_stable.html
 
     - name: Install test dependencies
       run: |

.gitignore

@@ -22,4 +22,7 @@ data/
 maro_venv/
 pyvenv.cfg
 htmlcov/
+*supply_chain_*/
+examples/supply_chain/docker-compose.yml
 .coverage
+.coveragerc

README.md

@@ -2,13 +2,13 @@
 [![Platform](https://raw.githubusercontent.com/microsoft/maro/master/docs/source/images/badges/platform.svg)](https://pypi.org/project/pymaro/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/pymaro.svg?logo=python&logoColor=white)](https://pypi.org/project/pymaro/#files)
 [![Code Size](https://img.shields.io/github/languages/code-size/microsoft/maro)](https://github.com/microsoft/maro)
-[![Docker Size](https://img.shields.io/docker/image-size/arthursjiang/maro)](https://hub.docker.com/repository/docker/arthursjiang/maro/tags?page=1)
+[![Docker Size](https://img.shields.io/docker/image-size/maro2020/maro)](https://hub.docker.com/repository/docker/maro2020/maro/tags?page=1)
 [![Issues](https://img.shields.io/github/issues/microsoft/maro)](https://github.com/microsoft/maro/issues)
 [![Pull Requests](https://img.shields.io/github/issues-pr/microsoft/maro)](https://github.com/microsoft/maro/pulls)
 [![Dependencies](https://img.shields.io/librariesio/github/microsoft/maro)](https://libraries.io/pypi/pymaro)
 [![test](https://github.com/microsoft/maro/workflows/test/badge.svg)](https://github.com/microsoft/maro/actions?query=workflow%3Atest)
 [![build](https://github.com/microsoft/maro/workflows/build/badge.svg)](https://github.com/microsoft/maro/actions?query=workflow%3Abuild)
-[![docker](https://github.com/microsoft/maro/workflows/docker/badge.svg)](https://hub.docker.com/repository/docker/arthursjiang/maro)
+[![docker](https://github.com/microsoft/maro/workflows/docker/badge.svg)](https://hub.docker.com/repository/docker/maro2020/maro)
 [![docs](https://readthedocs.org/projects/maro/badge/?version=latest)](https://maro.readthedocs.io/)
 [![PypI Versions](https://img.shields.io/pypi/v/pymaro)](https://pypi.org/project/pymaro/#files)
 [![Wheel](https://img.shields.io/pypi/wheel/pymaro)](https://pypi.org/project/pymaro/#files)
@@ -23,8 +23,8 @@
 [![Lint](https://github.com/microsoft/maro/workflows/lint/badge.svg)](https://github.com/microsoft/maro/actions?query=workflow%3Alint)
 [![Coverage](https://img.shields.io/codecov/c/github/microsoft/maro)](https://codecov.io/gh/microsoft/maro)
 [![Downloads](https://img.shields.io/pypi/dm/pymaro)](https://pypi.org/project/pymaro/#files)
-[![Docker Pulls](https://img.shields.io/docker/pulls/arthursjiang/maro)](https://hub.docker.com/repository/docker/arthursjiang/maro)
-[![Play with MARO](https://raw.githubusercontent.com/microsoft/maro/master/docs/source/images/badges/play_with_maro.svg)](https://hub.docker.com/r/arthursjiang/maro)
+[![Docker Pulls](https://img.shields.io/docker/pulls/maro2020/maro)](https://hub.docker.com/repository/docker/maro2020/maro)
+[![Play with MARO](https://raw.githubusercontent.com/microsoft/maro/master/docs/source/images/badges/play_with_maro.svg)](https://hub.docker.com/r/maro2020/maro)
 
 # [![MARO LOGO](./docs/source/images/logo.svg)](https://maro.readthedocs.io/en/latest/)
 
@@ -58,6 +58,8 @@ of user-defined functions for message auto-handling, cluster provision, and job
 | `examples`  | Showcase of MARO.                                                                                 |
 | `notebooks` | MARO quick-start notebooks.                                                                       |
 
+*Try [MARO playground](#run-playground) to have a quick experience.*
+
 ## Install MARO from [PyPI](https://pypi.org/project/pymaro/#files)
 
 *Notes: The CLI commands (including the visualization tool) are not included in pymaro package. To enable these support, you need to install from source.*
@@ -185,14 +187,16 @@ maro inspector dashboard --source_path ./dump_data/YOUR_SNAPSHOT_DUMP_FOLDER
 
 ## Run Playground
 
-- Pull from [Docker Hub](https://hub.docker.com/repository/registry-1.docker.io/arthursjiang/maro/tags?page=1)
+- Pull from [Docker Hub](https://hub.docker.com/r/maro2020/playground)
 
   ```sh
+  # Pull the docker image from docker hub
+  docker pull maro2020/playground
+
   # Run playground container.
   # Redis commander (GUI for redis) -> http://127.0.0.1:40009
-  # Local host docs -> http://127.0.0.1:40010
-  # Jupyter lab with maro -> http://127.0.0.1:40011
-  docker run -p 40009:40009 -p 40010:40010 -p 40011:40011 arthursjiang/maro:cpu
+  # Jupyter lab with maro -> http://127.0.0.1:40010
+  docker run -p 40009:40009 -p 40010:40010 maro2020/playground
   ```
 
 - Build from source
@@ -204,9 +208,8 @@ maro inspector dashboard --source_path ./dump_data/YOUR_SNAPSHOT_DUMP_FOLDER
 
     # Run playground container.
     # Redis commander (GUI for redis) -> http://127.0.0.1:40009
-    # Local host docs -> http://127.0.0.1:40010
-    # Jupyter lab with maro -> http://127.0.0.1:40011
-    docker run -p 40009:40009 -p 40010:40010 -p 40011:40011 maro/playground:cpu
+    # Jupyter lab with maro -> http://127.0.0.1:40010
+    docker run -p 40009:40009 -p 40010:40010 maro2020/playground
     ```
 
   - Windows
@@ -217,9 +220,8 @@ maro inspector dashboard --source_path ./dump_data/YOUR_SNAPSHOT_DUMP_FOLDER
 
     # Run playground container.
     # Redis commander (GUI for redis) -> http://127.0.0.1:40009
-    # Local host docs -> http://127.0.0.1:40010
-    # Jupyter lab with maro -> http://127.0.0.1:40011
-    docker run -p 40009:40009 -p 40010:40010 -p 40011:40011 maro/playground:cpu
+    # Jupyter lab with maro -> http://127.0.0.1:40010
+    docker run -p 40009:40009 -p 40010:40010 maro2020/playground
     ```
 
 ## Contributing

docker_files/cpu.play.df → docker_files/cpu.playground.df

@@ -1,20 +1,8 @@
-FROM python:3.6
+FROM python:3.7
 
 WORKDIR /maro_playground
 
-# Setup notebook
-ADD ./notebooks ./notebooks
-RUN /usr/local/bin/python -m pip install --upgrade pip
-RUN pip install -r ./notebooks/requirements.nb.txt
-RUN jupyter contrib nbextension install --system
-RUN jt -t onedork -fs 95 -altp -tfs 11 -nfs 115 -cellw 88% -T
-
-
-# Install redis
-RUN wget http://download.redis.io/releases/redis-6.0.6.tar.gz; tar xzf redis-6.0.6.tar.gz; cd redis-6.0.6; make
-RUN rm redis-6.0.6.tar.gz
-
-# Install others
+# Install zsh and other packages for the terminal usage
 RUN apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
 RUN apt-get install -y zsh
 RUN apt-get install -y htop
@@ -23,42 +11,36 @@ RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -
 RUN chsh -s `which zsh` && wget https://raw.githubusercontent.com/ArthurJiang/config/master/.zshrc -O ~/.zshrc
 RUN apt-get install -y npm
 RUN rm -rf /var/lib/apt/lists/*
+
+# Install redis
+RUN wget http://download.redis.io/releases/redis-6.0.6.tar.gz; tar xzf redis-6.0.6.tar.gz; cd redis-6.0.6; make
+RUN rm redis-6.0.6.tar.gz
 RUN npm install -g redis-commander
 
+# Setup notebook
+ADD ./notebooks ./notebooks
+RUN /usr/local/bin/python -m pip install --upgrade pip
+RUN pip install -r ./notebooks/requirements.nb.txt
+RUN jupyter contrib nbextension install --system
+RUN jt -t onedork -fs 95 -altp -tfs 11 -nfs 115 -cellw 88% -T
+RUN rm ./notebooks/*.txt
+RUN rm ./notebooks/*.sh
+
 # Add examples
 ADD ./examples ./examples
+ADD ./examples/requirements.ex.txt ./examples/requirements.ex.txt
+RUN pip install -r ./examples/requirements.ex.txt
+RUN rm ./examples/requirements.ex.txt
 
-# Add local docs
-ADD ./docs ./docs
-ADD ./maro ./maro
-ADD setup.py setup.py
-ADD ./scripts ./scripts
-RUN bash scripts/install_maro.sh
-RUN pip install -U -r ./docs/requirements.docs.txt
-RUN cd docs; make html
-RUN rm -rf ./maro
-RUN rm setup.py
-RUN rm -rf ./scripts
+# Install MARO
+RUN pip install pymaro
+ENV PYTHONPATH ./
 
 # Add run cmd
 ADD ./scripts/run_playground.sh ./run.sh
 
-# Add readme
+# Add README
 ADD ./playground.md ./README.md
 
-# Clean
-RUN rm ./notebooks/*.txt
-RUN rm ./notebooks/*.sh
-RUN rm -r ./docs/source
-RUN rm ./docs/make.bat
-RUN rm ./docs/Makefile
-RUN rm ./docs/README.md
-RUN rm ./docs/requirements.docs.txt
-RUN rm -rf ./build
-RUN rm -rf ./pymaro.egg-info
-
-# Install maro
-RUN pip install pymaro
-
 # Start service
 CMD ["/bin/bash", "./run.sh"]

docs/source/apidoc/maro.utils.rst

@@ -45,10 +45,10 @@ maro.utils.exception.communication\_exception
    :undoc-members:
    :show-inheritance:
 
-maro.utils.exception.data\_lib\_exeption
+maro.utils.exception.data\_lib\_exception
 --------------------------------------------------------------------------------
 
-.. automodule:: maro.utils.exception.data_lib_exeption
+.. automodule:: maro.utils.exception.data_lib_exception
    :members:
    :undoc-members:
    :show-inheritance:

docs/source/examples/greedy_policy_citi_bike.rst

@@ -76,4 +76,4 @@ This environment is driven by `real trip history data <https://s3.amazonaws.com/
 
 .. note::
 
-  All related code snippets are supported in `maro playground <https://hub.docker.com/r/arthursjiang/maro>`_.
+  All related code snippets are supported in `maro playground <https://hub.docker.com/r/maro2020/playground>`_.