diff --git a/README.md b/README.md index bfb4f050d..2750a51cd 100644 --- a/README.md +++ b/README.md @@ -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* diff --git a/examples/requirements.ex.txt b/examples/requirements.ex.txt index dbdc8c561..b3ddecc5b 100644 --- a/examples/requirements.ex.txt +++ b/examples/requirements.ex.txt @@ -1 +1,4 @@ -PuLP==2.1 +matplotlib>=3.1.2 +pulp>=2.1.0 +pymaro +tweepy>=4.10.0 diff --git a/maro/cli/inspector/cim_dashboard.py b/maro/cli/inspector/cim_dashboard.py index 11c8564d8..02e24c57c 100644 --- a/maro/cli/inspector/cim_dashboard.py +++ b/maro/cli/inspector/cim_dashboard.py @@ -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. diff --git a/maro/cli/inspector/citi_bike_dashboard.py b/maro/cli/inspector/citi_bike_dashboard.py index b60eb693b..15be35c43 100644 --- a/maro/cli/inspector/citi_bike_dashboard.py +++ b/maro/cli/inspector/citi_bike_dashboard.py @@ -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. diff --git a/maro/cli/inspector/env_data_process.py b/maro/cli/inspector/env_data_process.py index 2e8cb0469..bd2b57a09 100644 --- a/maro/cli/inspector/env_data_process.py +++ b/maro/cli/inspector/env_data_process.py @@ -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. diff --git a/maro/requirements.build.txt b/maro/requirements.build.txt index d689fd287..b893b4fdb 100644 --- a/maro/requirements.build.txt +++ b/maro/requirements.build.txt @@ -1,6 +1,6 @@ -pyjwt -numpy<1.20.0 -Cython>=0.29.14 +PyJWT>=2.4.0 +numpy>=1.19.0 +cython>=0.29.14 altair>=4.1.0 streamlit>=0.69.1 tqdm>=4.51.0 diff --git a/maro/rl/model/fc_block.py b/maro/rl/model/fc_block.py index acd7bd16e..a323dedb0 100644 --- a/maro/rl/model/fc_block.py +++ b/maro/rl/model/fc_block.py @@ -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 diff --git a/maro/simulator/scenarios/citi_bike/station.py b/maro/simulator/scenarios/citi_bike/station.py index 9515470d3..02709a47a 100644 --- a/maro/simulator/scenarios/citi_bike/station.py +++ b/maro/simulator/scenarios/citi_bike/station.py @@ -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 diff --git a/notebooks/requirements.nb.txt b/notebooks/requirements.nb.txt index 518b1a5de..d0cc32aa0 100644 --- a/notebooks/requirements.nb.txt +++ b/notebooks/requirements.nb.txt @@ -1,4 +1,6 @@ -jupyter==1.0.0 +autopep8>=1.4.4 +ipython-genutils>=0.2.0 +ipython>=7.16.3 jupyter-client jupyter-console jupyter-contrib-core @@ -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 +matplotlib>=3.1.2 +seaborn>=0.9.0 +shap>=0.32.1 +pymaro diff --git a/requirements.dev.txt b/requirements.dev.txt index 8c34db6eb..3bbf44e1e 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,69 +1,35 @@ -add-trailing-comma -altair==4.1.0 -aria2p==0.9.1 -astroid==2.3.3 +altair>=4.1.0 +aria2p>=0.9.1 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 +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 -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 +Flask>=1.1.2 +Flask_Cors>=3.0.10 +Flask_SocketIO>=5.2.0 +geopy>=2.0.0 +holidays>=0.10.3 +Jinja2>=2.11.3 +kubernetes>=21.7.0 +numpy>=1.19.5 +pandas>=0.25.3 +paramiko>=2.9.2 +prompt_toolkit>=2.0.10 +psutil>=5.8.0 +ptvsd>=4.3.2 +PyJWT>=2.4.0 +python_dateutil>=2.8.1 +PyYAML>=5.4.1 +pyzmq>=19.0.2 +requests>=2.25.1 +scipy>=1.7.0 +streamlit>=0.69.1 +stringcase>=1.2.0 +tabulate>=0.8.5 +tornado>=6.1 +tqdm>=4.51.0 diff --git a/setup.py b/setup.py index 12e0c035d..213cd09b0 100644 --- a/setup.py +++ b/setup.py @@ -135,25 +135,20 @@ ], install_requires=[ # TODO: use a helper function to collect these - "numpy<1.20.0", - "scipy<=1.7.0", - "torch<1.8.0", "holidays>=0.10.3", - "pyaml>=20.4.0", + "numpy>=1.19.5", + "pandas>=0.25.3", + "paramiko>=2.9.2", + "ptvsd>=4.3.2", + "python_dateutil>=2.8.1", + "PyYAML>=5.4.1", + "pyzmq>=19.0.2", "redis>=3.5.3", - "pyzmq<22.1.0", - "requests<=2.26.0", - "psutil<5.9.0", - "deepdiff>=5.2.2", - "azure-storage-blob<12.9.0", - "azure-storage-common", - "geopy>=2.0.0", - "pandas<1.2", - "PyYAML<5.5.0", - "paramiko>=2.7.2", - "kubernetes>=12.0.1", - "prompt_toolkit<3.1.0", - "stringcase>=1.2.0", + "requests>=2.25.1", + "scipy>=1.7.0", + "tabulate>=0.8.5", + "torch>=1.6.0, <1.8.0", + "tornado>=6.1", ] + specific_requires, entry_points={ diff --git a/tests/requirements.test.txt b/tests/requirements.test.txt index 221ee85cd..c7ac76f45 100644 --- a/tests/requirements.test.txt +++ b/tests/requirements.test.txt @@ -1,23 +1,17 @@ -matplotlib>=3.1.2 -geopy -pandas<1.2 -numpy<1.20.0 -holidays>=0.10.3 -pyaml>=20.4.0 -redis>=3.5.3 -pyzmq<22.1.0 -influxdb -requests<=2.26.0 -psutil<5.9.0 -deepdiff>=5.2.2 +altair>=4.1.0 azure-storage-blob<12.9.0 azure-storage-common -torch<1.8.0 -pytest -coverage -termgraph -paramiko>=2.7.2 -pytz==2019.3 -aria2p==0.9.1 -kubernetes>=12.0.1 -PyYAML<5.5.0 \ No newline at end of file +coverage>=6.4.1 +deepdiff>=5.7.0 +geopy>=2.0.0 +holidays>=0.10.3 +kubernetes>=21.7.0 +numpy>=1.19.5 +pandas>=0.25.3 +paramiko>=2.9.2 +pytest>=7.1.2 +PyYAML>=5.4.1 +pyzmq>=19.0.2 +redis>=3.5.3 +streamlit>=0.69.1 +termgraph>=0.5.3