Skip to content

Commit

Permalink
update github woorkflow config
Browse files Browse the repository at this point in the history
  • Loading branch information
Jinyu Wang authored and Jinyu Wang committed Jun 1, 2022
1 parent 0973783 commit d25ebf4
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/---bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ Steps to reproduce the behavior:
## Environment

- MARO version (e.g., v0.1.1a1):
- MARO scenario (`CIM`, `Citi Bike`):
- MARO scenario (`CIM`, `Citi Bike`, `VM Scheduling`):
- MARO component (`Simulation`, `RL`, `Distributed Training`):
- Orchestration platform (`GraSS on Azure`, `AKS on Azure`):
- How you installed MARO (`pip`, `source`):
- OS (`Linux`, `Windows`, `macOS`):
- Python version (`3.6`, `3.7`):
- Python version (`3.7`, `3.8`, `3.9`):
- Docker image (e.g., maro2020/maro:latest):
- CPU/GPU:
- Any other relevant information:
Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ Please also add other related information/contexts/dependencies here.
- [ ] Mac OS
- [ ] Linux
- Python version:
- [ ] 3.6
- [ ] 3.7
- [ ] 3.8
- [ ] 3.9
- Key information snapshot(s):

## Needs Follow Up Actions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6, 3.7]
python-version: [3.7, 3.8, 3.9]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Set up Python 3.6
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7

- name: Build image
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: test

on:
Expand All @@ -14,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_with_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: test_with_cli

on:
pull_request_review:
branches: [ master, v0.1, v0.2, v0.3 ]
types: [ submitted ]
workflow_dispatch:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ in local private network and run your training job in On-Premises distributed en
Prerequisites
-------------

* Linux with Python 3.6+
* Linux with Python 3.7+
* `Install Powershell <https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.1>`_ if you are using Windows Server
* For master node vm, need install flask, gunicorn, and redis.

Expand Down Expand Up @@ -96,4 +96,4 @@ grass-on-premises-join-cluster
config:
install_node_runtime: true
install_node_gpu_support: false
install_node_gpu_support: false
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ the multi-processes in the localhost environment.

Prerequisites
-------------
* Linux with Python 3.6+
* Linux with Python 3.7+
* Redis

Cluster Management
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation/pip_install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Install MARO from Source (\ `Editable Mode <https://pip.pypa.io/en/stable/refere

* Prerequisites

* `Python >= 3.6, < 3.8 <https://www.python.org/downloads/>`_
* `Python >= 3.7 <https://www.python.org/downloads/>`_
* C++ Compiler

* Linux or Mac OS X: ``gcc``
Expand Down
12 changes: 6 additions & 6 deletions docs/source/key_components/geographic_visualization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local mode for the finished epoch under real-time mode.
Dependency
----------

Env-geographic's startup depends on **docker** and **docker-compose**.
Env-geographic's startup depends on **docker** and **docker-compose**.
Therefore, users need to install docker on the machine and ensure that it can run normally.
User could get docker through `Docker installation <https://docs.docker.com/get-docker/>`_.

Expand Down Expand Up @@ -44,7 +44,7 @@ Firstly, user need to start the local database with command:
----

After the command is executed successfully, user
could view the local data with localhost:9000 by default.
could view the local data with localhost:9000 by default.
If the default port is occupied, user could obtain the access port of each container
through the following command:

Expand Down Expand Up @@ -91,7 +91,7 @@ To send data to database, there are 2 compulsory steps:

User needs to set the value of the environment variable
"MARO_STREAMIT_ENABLED" to "true". If user wants to specify the experiment name,
set the environment variable "MARO_STREAMIT_EXPERIMENT_NAME". If user does not
set the environment variable "MARO_STREAMIT_EXPERIMENT_NAME". If user does not
set this value, a unique experiment name would be processed automatically. User
could check the experiment name through database. It should be noted that when
selecting a topology, user must select a topology with specific geographic
Expand All @@ -118,7 +118,7 @@ package **streamit** with following code before environment initialization:
# Initialize environment and send basic information of experiment to database.
env = Env(scenario="cim", topology="global_trade.22p_l0.1",
start_tick=0, durations=100)
for ep in range(EPISODE_NUMBER):
# Send experimental data to database by episode.
streamit.episode(ep)
Expand All @@ -144,8 +144,8 @@ command:
----

Generally, the backend service runs on a local machine, occupying port 5000.
If port 5000 is already occupied, the program would find another free port starting from 5000.
Generally, the backend service runs on a local machine, occupying port 5000.
If port 5000 is already occupied, the program would find another free port starting from 5000.

To be specific, if user would like to run the backend service in docker rather on a local machine, please
run the shell script run_docker.sh under the folder maro\maro\cli\maro_real_time_vis. It should be noted that
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_manylinux.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

# this script used build maro packages for linux
# this script used build maro packages for linux

cd "$(dirname $(readlink -f $0))/.."

bash ./scripts/compile_cython.sh

# NOTE: currently we only support python3.6 and 3.7, need to be clearfy the python and packages version
# about manylinux: https://github.com/pypa/manylinux
docker run --rm -v "$PWD":/maro quay.io/pypa/manylinux2010_x86_64 bash /maro/scripts/build_wheel.sh
docker run --rm -v "$PWD":/maro quay.io/pypa/manylinux2010_x86_64 bash /maro/scripts/build_wheel.sh
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,11 @@
'Operating System :: Unix',
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Topic :: Scientific/Engineering :: Artificial Intelligence"],
python_requires=">=3.6",
python_requires=">=3.7",
setup_requires=[
"numpy<1.20.0",
],
Expand Down

0 comments on commit d25ebf4

Please sign in to comment.