From ed6cf15b71b27ead68d1448c5a7bbc8c595e7c58 Mon Sep 17 00:00:00 2001 From: zweien <278954153@qq.com> Date: Fri, 16 Jul 2021 11:09:35 +0800 Subject: [PATCH 1/3] chore: update setup conf --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f98410c..9587816 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,14 @@ setuptools.setup( packages=setuptools.find_packages(), classifiers=[ "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", + "Environment :: Console", + "Intended Audience :: Developers", + "Topic :: Scientific/Engineering :: Artificial Intelligence", ], python_requires=">=3.6", install_requires=load_requirements(), From cbcecb9320670332d82299e582f992cc6b8f30cd Mon Sep 17 00:00:00 2001 From: zweien <278954153@qq.com> Date: Fri, 16 Jul 2021 11:35:43 +0800 Subject: [PATCH 2/3] docs: update installation --- README.md | 23 ++++++++++++++++++----- docs/index.rst | 4 ++-- docs/user/installation.md | 31 ++++++++++++++++++++++++++++--- requirements.txt | 2 +- 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4989da5..1bbaa5a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,22 @@ -[![License](https://img.shields.io/github/license/analysiscenter/pydens.svg)](https://www.apache.org/licenses/LICENSE-2.0) -[![Python](https://img.shields.io/badge/python-3.8-blue.svg)](https://python.org) -[![Documentation Status](https://readthedocs.org/projects/idrlnet/badge/?version=latest)](https://idrlnet.readthedocs.io/en/latest/?badge=latest) - # IDRLnet +[![License](https://img.shields.io/github/license/analysiscenter/pydens.svg)](https://www.apache.org/licenses/LICENSE-2.0) +[![Python](https://img.shields.io/badge/python-3.7/3.8/3.9-blue.svg)](https://python.org) +[![Documentation Status](https://readthedocs.org/projects/idrlnet/badge/?version=latest)](https://idrlnet.readthedocs.io/en/latest/?badge=latest) +[![PyPI version](https://badge.fury.io/py/idrlnet.svg)](https://badge.fury.io/py/idrlnet) +[![DockerHub](https://img.shields.io/docker/pulls/idrl/idrlnet.svg)](https://hub.docker.com/r/idrl/idrlnet) +[![CodeFactor](https://www.codefactor.io/repository/github/idrl-lab/idrlnet/badge/master)](https://www.codefactor.io/repository/github/idrl-lab/idrlnet/overview/master) + **IDRLnet** is a machine learning library on top of [PyTorch](https://pytorch.org/). Use IDRLnet if you need a machine learning library that solves both forward and inverse differential equations via physics-informed neural networks (PINN). IDRLnet is a flexible framework inspired by [Nvidia Simnet](https://developer.nvidia.com/simnet>). +## Docs + +- [Full docs](https://idrlnet.readthedocs.io/en/latest/) +- [Tutorial](https://idrlnet.readthedocs.io/en/latest/user/get_started/tutorial.html) + ## Installation Choose one of the following installation methods. @@ -27,11 +35,16 @@ Note: To avoid version conflicts, please use some tools to create a virtual envi ```bash docker pull idrl/idrlnet:latest +docker run idrl/idrlnet:latest ``` ### Anaconda - +```bash +conda create -n idrlnet_dev python=3.8 -y +conda activate idrlnet_dev +pip install idrlnet +``` ### From Source diff --git a/docs/index.rst b/docs/index.rst index 2e820f3..ede321d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,8 +12,8 @@ Welcome to idrlnet's documentation! Features -------- -IDRLnet is a machine learning library on top of `Pytorch `_. Use IDRLnet if you need a machine -learning library that solves both forward and inverse partial differential equations (PDEs) via physics-informed neural +IDRLnet is a machine learning library on top of `PyTorch `_. Use IDRLnet if you need a machine +learning library that solves both forward and inverse differential equations via physics-informed neural networks (PINN). IDRLnet is a flexible framework inspired by `Nvidia Simnet `_. IDRLnet supports diff --git a/docs/user/installation.md b/docs/user/installation.md index 49d3cd5..6912976 100644 --- a/docs/user/installation.md +++ b/docs/user/installation.md @@ -2,13 +2,38 @@ We recommend using conda to manage the environment. Other methods may also work well such like using docker or virtual env. + +Choose one of the following installation methods. + +## PyPI + +Simple installation from PyPI + +```bash +pip install -U idrlnet +``` + +Note: To avoid version conflicts, please use some tools to create a virtual environment first. + +## Docker + +```bash +docker pull idrl/idrlnet:latest +docker run idrl/idrlnet:latest +``` + ## Anaconda ```bash -git clone https://git.idrl.site/pengwei/idrlnet -cd idrlnet conda create -n idrlnet_dev python=3.8 -y conda activate idrlnet_dev -pip install -r requirements.txt +pip install idrlnet +``` + +## From Source + +``` +git clone https://github.com/idrl-lab/idrlnet +cd idrlnet pip install -e . ``` diff --git a/requirements.txt b/requirements.txt index 69cf75b..1593ce5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,5 +17,5 @@ sympy==1.5.1 pyevtk==1.1.1 flask==1.1.2 requests==2.25.0 -torch==1.7.1 +torch>=1.7.1 networkx==2.5.1 \ No newline at end of file From 2a1b495fdd948fde9e4456841b325d4b05e517c5 Mon Sep 17 00:00:00 2001 From: zweien <278954153@qq.com> Date: Sun, 18 Jul 2021 15:22:02 +0800 Subject: [PATCH 3/3] docs: update docker usage --- README.md | 9 +++++++-- docs/user/installation.md | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1bbaa5a..6e7ef2d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Choose one of the following installation methods. ### PyPI -Simple installation from PyPI +Simple installation from PyPI. ```bash pip install -U idrlnet @@ -33,11 +33,16 @@ Note: To avoid version conflicts, please use some tools to create a virtual envi ### Docker +Pull latest docker image from Dockerhub. + ```bash docker pull idrl/idrlnet:latest -docker run idrl/idrlnet:latest +docker run -it idrl/idrlnet:latest bash + ``` +Note: Available tags can be found in [Dockerhub](https://hub.docker.com/repository/docker/idrl/idrlnet). + ### Anaconda ```bash diff --git a/docs/user/installation.md b/docs/user/installation.md index 6912976..4c13766 100644 --- a/docs/user/installation.md +++ b/docs/user/installation.md @@ -17,11 +17,15 @@ Note: To avoid version conflicts, please use some tools to create a virtual envi ## Docker +Pull latest docker image from Dockerhub. + ```bash docker pull idrl/idrlnet:latest -docker run idrl/idrlnet:latest +docker run -it idrl/idrlnet:latest bash ``` +Note: Available tags can be found in [Dockerhub](https://hub.docker.com/repository/docker/idrl/idrlnet). + ## Anaconda ```bash