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

Update requirements. #552

Merged
merged 10 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,16 @@ of user-defined functions for message auto-handling, cluster provision, and job

```sh
# Install MARO from source.
bash scripts/install_maro.sh
bash scripts/install_maro.sh;
pip install -r ./requirements.dev.txt;
```

- Windows

```powershell
# Install MARO from source.
.\scripts\install_maro.bat
.\scripts\install_maro.bat;
pip install -r ./requirements.dev.txt;
```

- *Notes: If your package is not found, remember to set your PYTHONPATH*
Expand Down
7 changes: 6 additions & 1 deletion examples/requirements.ex.txt
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
PuLP==2.1
maro
matplotlib>=3.1.2
pulp>=2.1.0
pymaro.egg==info
lihuoran marked this conversation as resolved.
Show resolved Hide resolved
PyYAML>=5.4.1
tweepy>=4.10.0
2 changes: 1 addition & 1 deletion maro/cli/inspector/cim_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def start_cim_dashboard(source_path: str, epoch_num: int, prefix: str):
--ports.csv: Record ports' attributes in this file.
--vessel.csv: Record vessels' attributes in this file.
--matrices.csv: Record transfer volume information in this file.
………………
......
--epoch_{epoch_num-1}
--manifest.yml: Record basic info like scenario name, name of index_name_mapping file.
--config.yml: Record the relationship between ports' index and name.
Expand Down
2 changes: 1 addition & 1 deletion maro/cli/inspector/citi_bike_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def start_citi_bike_dashboard(source_path: str, epoch_num: int, prefix: str):
--stations.csv: Record stations' attributes in this file.
--matrices.csv: Record transfer volume information in this file.
--stations_summary.csv: Record the summary data of current epoch.
………………
......
--epoch_{epoch_num-1}
--manifest.yml: Record basic info like scenario name, name of index_name_mapping file.
--full_stations.json: Record the relationship between ports' index and name.
Expand Down
2 changes: 1 addition & 1 deletion maro/cli/inspector/env_data_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def start_vis(source_path: str, force: str, **kwargs: dict):
-input_file_folder_path
--epoch_0 : Data of current epoch.
--holder_info.csv: Attributes of current epoch.
………………
......
--epoch_{epoch_num-1}
--manifest.yml: Record basic info like scenario name, name of index_name_mapping file.
--index_name_mapping file: Record the relationship between an index and its name.
Expand Down
4 changes: 2 additions & 2 deletions maro/requirements.build.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pyjwt
PyJWT>=2.4.0
numpy<1.20.0
Cython>=0.29.14
cython>=0.29.14
altair>=4.1.0
streamlit>=0.69.1
tqdm>=4.51.0
2 changes: 1 addition & 1 deletion maro/rl/model/fc_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(
self._name = name

def forward(self, x: torch.Tensor) -> torch.Tensor:
out = self._net(x)
out = self._net(x.float())
if self._skip_connection:
out += x
return self._softmax(out) if self._softmax else out
Expand Down
2 changes: 1 addition & 1 deletion maro/simulator/scenarios/citi_bike/station.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Station(NodeBase):
# avg temp
temperature = NodeAttribute("i2")

# 0: sunny, 1: rainy, 2: snowy 3: sleet
# 0: sunny, 1: rainy, 2: snowy, 3: sleet
weather = NodeAttribute("i2")

# 0: holiday, 1: not holiday
Expand Down
21 changes: 8 additions & 13 deletions notebooks/requirements.nb.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
jupyter==1.0.0
autopep8>=1.4.4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark

ipython-genutils>=0.2.0
ipython>=7.16.3
jupyter-client
jupyter-console
jupyter-contrib-core
Expand All @@ -7,18 +9,11 @@ jupyter-core
jupyter-highlight-selected-word
jupyter-latex-envs
jupyter-nbextensions-configurator
jupyter>=1.0.0
jupyterlab
jupyterlab-server
jupyterthemes
isort==4.3.21
autopep8==1.4.4
isort==4.3.21
pandas==0.25.3
matplotlib==3.1.2
seaborn==0.9.0
ipython==7.16.3
ipython-genutils==0.2.0
shap==0.32.1
seaborn==0.9.0
numpy<1.20.0
numba==0.46.0
maro
matplotlib>=3.1.2
seaborn>=0.9.0
shap>=0.32.1
93 changes: 32 additions & 61 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,69 +1,40 @@
add-trailing-comma
altair==4.1.0
aria2p==0.9.1
astroid==2.3.3
altair>=4.1.0
aria2p>=0.11.2
autopep8>=1.4.4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark

azure-identity
azure-mgmt-authorization
azure-mgmt-containerservice
azure-mgmt-resource
azure-mgmt-storage
azure-storage-file-share
black==22.3.0
certifi==2019.9.11
cryptography==36.0.1
cycler==0.10.0
Cython==0.29.14
deepdiff==5.7.0
coverage>=6.4.1
cryptography>=36.0.1
deepdiff>=5.7.0
docker
editorconfig-checker==2.4.0
flake8==4.0.1
flask-cors==3.0.10
flask==1.1.2
flask_cors==3.0.10
flask_socketio==5.2.0
flloat==0.3.0
geopy==2.0.0
guppy3==3.0.9
holidays==0.10.3
isort==4.3.21
jinja2==2.11.3
kiwisolver==1.1.0
kubernetes==21.7.0
lazy-object-proxy==1.4.3
markupsafe==2.0.1
matplotlib==3.5.2
mccabe==0.6.1
networkx==2.4
networkx==2.4
Flask>=2.1.2
flask_cors>=3.0.10
flask_socketio>=5.2.0
geopy>=2.2.0
holidays>=0.12
Jinja2>=3.0.3
kubernetes>=21.7.0
numba>=0.46.0
numpy<1.20.0
palettable==3.3.0
pandas==0.25.3
pre-commit==2.19.0
prompt_toolkit==2.0.10
psutil==5.8.0
ptvsd==4.3.2
pulp==2.6.0
pyaml==20.4.0
PyJWT==2.4.0
pyparsing==2.4.5
python-dateutil==2.8.1
PyYAML==5.4.1
pyzmq==19.0.2
recommonmark~=0.6.0
redis==3.5.3
requests==2.25.1
scipy==1.7.0
setuptools==58.0.4
six==1.13.0
sphinx==1.8.6
sphinx_rtd_theme==1.0.0
streamlit==0.69.1
stringcase==1.2.0
tabulate==0.8.5
termgraph==0.5.3
torch==1.6.0
torchsummary==1.5.1
tqdm==4.51.0
urllib3==1.26.5
wrapt==1.11.2
zmq==0.0.0
pandas>=0.25.0
paramiko>=2.9.2
pre-commit>=2.19.0
prompt_toolkit>=3.0.24
psutil>=5.8.0
ptvsd>=4.3.2
PyJWT>=2.4.0
pytest>=7.1.2
python_dateutil>=2.8.2
recommonmark>=0.6.0
requests>=2.26.0
scipy>=1.7.0
setuptools>=58.0.4
streamlit>=0.69.1
stringcase>=1.2.0
tabulate>=0.8.9
termgraph>=0.5.3
tqdm>=4.51.0