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

V0.1 #78

Merged
merged 77 commits into from
Sep 23, 2020
Merged

V0.1 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3fb488c
setup v0.1
Sep 18, 2020
8db3ca0
rm \n in comments
Sep 18, 2020
0739290
QuickStart added for docs.scenarios
Sep 21, 2020
d93905b
experiment result of citi bike update to 1-month version
Sep 21, 2020
870a4b3
V0.1 issues installation (#38)
ArthurJiang Sep 21, 2020
a50085d
notebook link added for scenarios
Sep 21, 2020
9aed86e
fix: add missing licenses, refine long lines (#36)
romickid Sep 21, 2020
36baa90
scenario notebook update (#39)
Jinyu-W Sep 21, 2020
f9fdb06
scenario doc modified according to comments
Sep 22, 2020
f90b861
doc correction
Sep 22, 2020
1c1f571
scenario doc modified according to comments
Sep 22, 2020
59d148a
merge with v0.1
Sep 22, 2020
fc8f4a1
remove examples
Sep 22, 2020
a30d5d4
rl toolkit refactoring (#42)
ArthurJiang Sep 22, 2020
5efc96d
fix issue during building playground images (#44)
kaiqli Sep 22, 2020
67e7271
citibike doc modified according to comments
Sep 22, 2020
1420f6d
citibike doc update
Sep 22, 2020
cefc787
scenario experiment result table changed
Sep 22, 2020
e6ca9ad
Merge branch 'v0.1' into v0.1_docs_scenario
Sep 22, 2020
4b1537b
Merge branch 'v0.1' into v0.1_doc_correction
Sep 22, 2020
61a14b2
Merge pull request #40 from microsoft/v0.1_doc_correction
Jinyu-W Sep 22, 2020
6d4fab9
annotate the empty experiment results
Sep 22, 2020
7a945a5
Merge branch 'v0.1' into v0.1_docs_scenario
Sep 22, 2020
6041a04
Merge pull request #37 from microsoft/v0.1_docs_scenario
Jinyu-W Sep 22, 2020
dc7d24c
merge master into v0.1 for later merging (#47)
chaosddp Sep 22, 2020
24e9a5e
Merge branch 'master' into v0.1
ArthurJiang Sep 22, 2020
07a232c
Merge branch 'master' into v0.1
Sep 22, 2020
181526f
refine readme
Sep 22, 2020
ba91712
Merge branch 'master' into v0.1
Sep 22, 2020
4dd87ac
fix: recursive copy instead of plain copy (#45)
romickid Sep 22, 2020
e68ddb9
update maro overall image
Sep 22, 2020
6ada59f
Merge branch 'v0.1' of https://github.com/microsoft/maro into v0.1
Sep 22, 2020
75736df
typo
Sep 22, 2020
47f5d62
add key components
Sep 22, 2020
3d5065f
fix deployment issue in multi envs (#49)
zhawan Sep 22, 2020
a651bb8
typo
Sep 22, 2020
36e6cfa
refine introduction
Sep 22, 2020
ebc8618
fix typo
Sep 22, 2020
8637a68
Merge branch 'master' into v0.1
Sep 22, 2020
5ecb207
fix readme
Sep 22, 2020
7fbeae7
Merge branch 'master' into v0.1
ArthurJiang Sep 22, 2020
5131133
refine readme
Sep 22, 2020
5a2bd1a
Merge branch 'v0.1' of https://github.com/microsoft/maro into v0.1
Sep 22, 2020
4911874
refine readme
Sep 22, 2020
aa682dc
Merge branch 'master' into v0.1
ArthurJiang Sep 22, 2020
f2ad3e9
update readme docs link
Sep 22, 2020
f2b811f
fix ~/.maro not exist issue in build (#52)
zhawan Sep 22, 2020
4be8c8f
refine logo
Sep 22, 2020
1586d35
fix toctree
Sep 22, 2020
0737f5a
fix & feat: invalid filename & maro grass status (#51)
romickid Sep 22, 2020
fca949c
refine
Sep 22, 2020
b714a15
refine
Sep 22, 2020
6257882
Merge branch 'v0.1' of https://github.com/microsoft/maro into v0.1
Sep 22, 2020
33641ce
Merge branch 'master' into v0.1
ArthurJiang Sep 22, 2020
ef485fa
V0.1 test store update (#58)
ysqyang Sep 23, 2020
1a5da08
rename ecr 2 cim (#62)
chaosddp Sep 23, 2020
79c5a7e
V0.1 rename to cim in example (#63)
ysqyang Sep 23, 2020
4e0c8ef
fix ut issue under window, now all runpass (#64)
chaosddp Sep 23, 2020
41296bc
V0.1 ecr rename (#65)
Jinyu-W Sep 23, 2020
9e921dd
temporarily disable weather, fix station id issue (#66)
zhawan Sep 23, 2020
9065110
V0.1 ecr rename (#67)
Jinyu-W Sep 23, 2020
823c8b4
change the keys in metrics (#68)
chaosddp Sep 23, 2020
c90ee62
update setup
Sep 23, 2020
0541786
Merge branch 'master' into v0.1
Sep 23, 2020
c52ab3a
Update build_wheel.yml
ArthurJiang Sep 23, 2020
84b10ab
Update build_wheel.yml
ArthurJiang Sep 23, 2020
9084b66
Update build_wheel.yml
ArthurJiang Sep 23, 2020
db0091f
Update build_wheel.yml
ArthurJiang Sep 23, 2020
030c4e7
rm install from PyPi
Sep 23, 2020
0a8699c
Merge branch 'master' into v0.1
Sep 23, 2020
8f94f4b
V0.1 cim nb (#70)
ysqyang Sep 23, 2020
b33786c
the font size of doc diagrams is enlarged (#73)
Jinyu-W Sep 23, 2020
fdaa133
str() and repr() of DecisionEvent and Action added; notebook output u…
Jinyu-W Sep 23, 2020
cf75a87
Update deploy_gh_pages.yml
ArthurJiang Sep 23, 2020
dd952c5
fix docker build
Sep 23, 2020
ac05707
V0.1 feature docker ci (#77)
ArthurJiang Sep 23, 2020
0e4c9ff
Merge branch 'master' into v0.1
ArthurJiang Sep 23, 2020
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
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.ignore
Dockerfile
README.md
maro_cli/
examples/**/*.log
examples/**/*.csv
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: install dependencies
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install wheel twine
Expand All @@ -42,26 +42,26 @@ jobs:
run: |
cython ./maro/backends/backend.pyx ./maro/backends/np_backend.pyx ./maro/backends/raw_backend.pyx ./maro/backends/frame.pyx -3 -E FRAME_BACKEND=NUMPY,NODES_MEMORY_LAYOUT=ONE_BLOCK -X embedsignature=True

- name: build wheel on Windows and macOS
- name: Build wheel on Windows and macOS
if: runner.os == 'Windows' || runner.os == 'macOS'
run: |
python setup.py bdist_wheel

- name: build manylinux wheel
- name: Build manylinux wheel
if: runner.os == 'Linux' && matrix.python-version == '3.6'
uses: RalfG/python-wheels-manylinux-build@v0.3.1-manylinux2010_x86_64
with:
python-versions: 'cp36-cp36m cp37-cp37m'
build-requirements: 'numpy'
pip-wheel-args: '-w ./wheelhouse' # save wheel packages to wheelhouse folder

- name: move valid packages to dist folder for manylinux
- name: Move valid packages to dist folder for manylinux
if: runner.os == 'Linux' && matrix.python-version == '3.6'
run: |
mkdir -p dist
cp wheelhouse/maro-*-manylinux*.whl dist

- name: build source package on linux
- name: Build source package on linux
if: runner.os == 'Linux' && matrix.python-version == '3.6'
run: |
python setup.py sdist
Expand Down
45 changes: 19 additions & 26 deletions .github/workflows/deploy_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,23 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Set up Python 3.6
uses: actions/setup-python@v2
with:
python-version: 3.6

- name: Build and push Docker images
# You may pin to the exact commit or the version.
# uses: docker/build-push-action@ab83648e2e224cfeeab899e23b639660765c3a89
uses: docker/build-push-action@v1.1.1
with:
# Username used to log in to a Docker registry. If not set then no login will occur
username: ${{ secrets.DOCKER_HUB_USERNAME }}
# Password or personal access token used to log in to a Docker registry. If not set then no login will occur
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
# Server address of Docker registry. If not set then will default to Docker Hub
registry: https://hub.docker.com/repository/docker/arthursjiang/maro
# Docker repository to tag the image with
repository: latest
# Comma-delimited list of tags. These will be added to the registry/repository to form the image's tags
tags: citi-bike, inventory-management, operations-research, reinforcement-learning, resource-optimization, simulator
# Automatically tags the built image with the git reference as per the readme
# Path to the build context
path: .
# Path to the Dockerfile (Default is '{path}/Dockerfile')
dockerfile: docker_files/cpu.play.df
# Sets the target stage to build
target: maro/playground:cpu
# Whether to push the image
push: true
- name: Build image
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 -3 -E FRAME_BACKEND=NUMPY,NODES_MEMORY_LAYOUT=ONE_BLOCK -X embedsignature=True
docker build -f ./docker_files/cpu.play.df . -t ${{ secrets.DOCKER_HUB_USERNAME }}/maro:cpu

- name: Login docker hub
run: |
docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password ${{ secrets.DOCKER_HUB_PASSWORD }}

- name: Push image
run: |
docker push ${{ secrets.DOCKER_HUB_USERNAME }}/maro
2 changes: 1 addition & 1 deletion .github/workflows/deploy_gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
logLevel:
description: 'package version'
required: true
default: '0.0.1a0'
default: '0.1.1a0'

jobs:
build:
Expand Down
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Contributing to MARO

MARO is newborn for Reinforcement learning as a Service (RaaS) in the resource optimization domain. Your contribution is precious to make RaaS come true.

- [Open issues](https://github.com/microsoft/maro/issues) for reporting bugs and requesting new features.
- Contribute to [examples](https://github.com/microsoft/maro/tree/master/examples) to share your problem modeling to others.
- Contribute to [scenarios](https://github.com/microsoft/maro/tree/master/maro/simulator/scenarios) to provide more meaningful environments.
- Contribute to [topologies](https://github.com/microsoft/maro/tree/master/maro/simulator/scenarios/citi_bike/topologies) to enhance existing MARO scenarios.
- Contribute to [algorithms](https://github.com/microsoft/maro/tree/master/maro/rl/algorithms) to enrich MARO RL libraries.
- Contribute to [orchestration](https://github.com/microsoft/maro/tree/master/maro/cli) to broad MARO supported cloud services.
- Contribute to [communication](https://github.com/microsoft/maro/tree/master/maro/communication) to enhance MARO distributed training capacity.
- Contribute to [tests](https://github.com/microsoft/maro/tree/master/tests) to make it more reliable and stable.
- Contribute to [documentation](https://github.com/microsoft/maro/tree/master/maro) to make it straightforward for everyone.
2 changes: 2 additions & 0 deletions docker_files/cpu.play.df
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ FROM quay.io/pypa/manylinux2010_x86_64 as ext_build
WORKDIR /maro_build

ADD ./maro ./maro
ADD README.md ./README.md
ADD LICENSE ./LICENSE
ADD setup.py ./setup.py
RUN PYBIN="/opt/python/cp36-cp36m/bin"; "${PYBIN}/pip" install -r maro/requirements.build.txt; "${PYBIN}/python" setup.py bdist_wheel --plat-name manylinux2010_x86_64

Expand Down
8 changes: 5 additions & 3 deletions docker_files/cpu.runtime.df
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ WORKDIR /maro_build
# Build wheels
ADD ./maro ./maro
ADD setup.py ./setup.py
ADD README.md ./README.md
ADD LICENSE ./LICENSE
RUN PYBIN="/opt/python/cp36-cp36m/bin"; "${PYBIN}/pip" install -r maro/requirements.build.txt; "${PYBIN}/python" setup.py bdist_wheel --plat-name manylinux2010_x86_64


Expand Down Expand Up @@ -36,6 +38,6 @@ RUN pip install psutil==5.7.2
RUN pip install deepdiff==5.0.2

# Install maro
COPY --from=ext_build /maro_build/dist/maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl ./maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN pip install maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN rm maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
COPY --from=ext_build /maro_build/dist/maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl ./maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN pip install maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN rm maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
8 changes: 5 additions & 3 deletions docker_files/gpu.runtime.df
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ WORKDIR /maro_build
# Build wheels
ADD ./maro ./maro
ADD setup.py ./setup.py
ADD README.md ./README.md
ADD LICENSE ./LICENSE
RUN PYBIN="/opt/python/cp36-cp36m/bin"; "${PYBIN}/pip" install -r maro/requirements.build.txt; "${PYBIN}/python" setup.py bdist_wheel --plat-name manylinux2010_x86_64


Expand Down Expand Up @@ -41,6 +43,6 @@ RUN pip install psutil==5.7.2
RUN pip install deepdiff==5.0.2

# Install maro
COPY --from=ext_build /maro_build/dist/maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl ./maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN pip install maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN rm maro-0.0.1a0-cp36-cp36m-manylinux2010_x86_64.whl
COPY --from=ext_build /maro_build/dist/maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl ./maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN pip install maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
RUN rm maro-0.1.1a0-cp36-cp36m-manylinux2010_x86_64.whl
4 changes: 2 additions & 2 deletions docs/source/apidoc/maro.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maro package
MARO Package
============

Subpackages
Expand All @@ -13,7 +13,7 @@ Subpackages
maro.simulator
maro.utils

Module contents
Module Contents
---------------

.. automodule:: maro
Expand Down
5 changes: 3 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
from recommonmark.parser import CommonMarkParser
sys.path.insert(0, os.path.abspath('../..'))

os.environ["APIDOC_GEN"] = os.environ.get("APIDOC_GEN") or "True"
# TODO: improve API Docs
os.environ["APIDOC_GEN"] = os.environ.get("APIDOC_GEN", "False")
# -- Project information -----------------------------------------------------

project = 'maro'
project = 'MARO'
copyright = '2020 Microsoft'
author = 'MARO Team'

Expand Down
Loading