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

pull code #20

Merged
merged 33 commits into from Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
41de58c
Fix bugs of NAS interface (#1131)
Crysple May 30, 2019
e4f7502
Fix string type error issue (#1128)
SparkSnail May 30, 2019
5c31530
Fix some typo (#1129)
squirrelsc Jun 3, 2019
53d30bd
fix bug of hyper-parameter update (#1139)
lvybriage Jun 3, 2019
b6dca3e
fix bug of randint in hyper-parameter graph (#1145)
lvybriage Jun 3, 2019
3745583
Modified function get_id to iterate over dictionary only once. (#1140)
mohitanand001 Jun 3, 2019
2653f2d
delete loading in the table and rename intermediate result x and y na…
lvybriage Jun 3, 2019
3267f46
Chinese translation (#1127)
squirrelsc Jun 3, 2019
a823366
add nas example using general nas programming interface (#1130)
QuanluZhang Jun 3, 2019
946cb54
Fix nnictl command line (#1146)
SparkSnail Jun 3, 2019
ce274f0
Fix pipeline of PAI on windows (#1141)
SparkSnail Jun 3, 2019
139e0a9
Fix remote gpu scheduler bug (#1143)
SparkSnail Jun 3, 2019
beed60f
download log file (#1149)
lvybriage Jun 3, 2019
4465ad8
Add integration test file for nas example (#1148)
SparkSnail Jun 3, 2019
cae7072
a simple debug tool for general nas programming interface (#1147)
QuanluZhang Jun 3, 2019
d676309
Fix image name in PAIMode.md document (#1133)
SparkSnail Jun 3, 2019
4afe167
re-organize links & Fix link err (#1125)
suiguoxin Jun 4, 2019
70fb900
randint range, duration less than 1 (#1151)
lvybriage Jun 4, 2019
877aab7
Clean pipeline remote files (#1150)
demianzhang Jun 4, 2019
e9b80c8
update release note
xuehui1991 Jun 4, 2019
bb5daab
Merge remote-tracking branch 'upstream/master' into v0.8
xuehui1991 Jun 4, 2019
2a0fdd3
Merge pull request #1154 from xuehui1991/merge_v0.8
yds05 Jun 5, 2019
ce2d8d9
Add sklearn installation in setup.py (#1157)
SparkSnail Jun 5, 2019
f2ff131
update v0.8 tag: (#1169)
xuehui1991 Jun 12, 2019
7bf221f
Chinese translation (#1166)
squirrelsc Jun 12, 2019
c1a5b1e
Refactor the README (#1174)
scarlett2018 Jun 13, 2019
b3a6ff8
Remove PowerShell execution policy (#1175)
demianzhang Jun 17, 2019
2039c1c
Fix nnictl resume (#1172)
SparkSnail Jun 18, 2019
14c1b31
Fix failed to connect to PAI with http code:500 (#1176)
demianzhang Jun 19, 2019
ae7a72b
Remove all whitespace at end of line (#1162)
Jun 19, 2019
22993e5
Pass tslint for training service (#1177)
demianzhang Jun 20, 2019
e12df2b
Validate file name in codeDir for PAI platform (#1168)
SparkSnail Jun 21, 2019
61fec44
Enhancement: ability to adjust rendering interval (#1181)
lvybriage Jun 21, 2019
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
34 changes: 14 additions & 20 deletions README.md
Expand Up @@ -14,10 +14,10 @@

[简体中文](README_zh_CN.md)

NNI (Neural Network Intelligence) is a toolkit to help users run automated machine learning (AutoML) experiments.
NNI (Neural Network Intelligence) is a toolkit to help users run automated machine learning (AutoML) experiments.
The tool dispatches and runs trial jobs generated by tuning algorithms to search the best neural architecture and/or hyper-parameters in different environments like local machine, remote servers and cloud.

### **NNI [v0.7](https://github.com/Microsoft/nni/releases) has been released!**
### **NNI [v0.8](https://github.com/Microsoft/nni/releases) has been released!**
<p align="center">
<a href="#nni-v05-has-been-released"><img src="docs/img/overview.svg" /></a>
</p>
Expand Down Expand Up @@ -57,20 +57,20 @@ The tool dispatches and runs trial jobs generated by tuning algorithms to search
<li><a href="docs/en_US/BuiltinTuner.md#TPE">TPE</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Random">Random Search</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Anneal">Anneal</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Evolution">Naive Evolution</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Evolution">Naïve Evolution</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#SMAC">SMAC</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Batch">Batch</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Grid">Grid Search</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#GridSearch">Grid Search</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#Hyperband">Hyperband</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#NetworkMorphism">Network Morphism</a></li>
<li><a href="examples/tuners/enas_nni/README.md">ENAS</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#NetworkMorphism#MetisTuner">Metis Tuner</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#MetisTuner">Metis Tuner</a></li>
<li><a href="docs/en_US/BuiltinTuner.md#BOHB">BOHB</a></li>
</ul>
<a href="docs/en_US/BuiltinAssessors.md#assessor">Assessor</a>
<a href="docs/en_US/BuiltinAssessor.md">Assessor</a>
<ul>
<li><a href="docs/en_US/BuiltinAssessors.md#Medianstop">Median Stop</a></li>
<li><a href="docs/en_US/BuiltinAssessors.md#Curvefitting">Curve Fitting</a></li>
<li><a href="docs/en_US/BuiltinAssessor.md#Medianstop">Median Stop</a></li>
<li><a href="docs/en_US/BuiltinAssessor.md#Curvefitting">Curve Fitting</a></li>
</ul>
</td>
<td>
Expand Down Expand Up @@ -106,13 +106,7 @@ We encourage researchers and students leverage these projects to accelerate the

## **Install & Verify**

If you are using NNI on Windows and use PowerShell to run script for the first time, you need to **run PowerShell as administrator** with this command first:

```bash
Set-ExecutionPolicy -ExecutionPolicy Unrestricted
```

**Install through pip**
**Install through pip**

* We support Linux, MacOS and Windows(local, remote and pai mode) in current stage, Ubuntu 16.04 or higher, MacOS 10.14.1 along with Windows 10.1809 are tested and supported. Simply run the following `pip install` in an environment that has `python >= 3.5`.

Expand All @@ -136,14 +130,14 @@ Note:

**Install through source code**

* We support Linux (Ubuntu 16.04 or higher), MacOS (10.14.1) and Windows (10.1809) in our current stage.
* We support Linux (Ubuntu 16.04 or higher), MacOS (10.14.1) and Windows (10.1809) in our current stage.

Linux and MacOS

* Run the following commands in an environment that has `python >= 3.5`, `git` and `wget`.

```bash
git clone -b v0.7 https://github.com/Microsoft/nni.git
git clone -b v0.8 https://github.com/Microsoft/nni.git
cd nni
source install.sh
```
Expand All @@ -153,9 +147,9 @@ Windows
* Run the following commands in an environment that has `python >=3.5`, `git` and `PowerShell`

```bash
git clone -b v0.7 https://github.com/Microsoft/nni.git
git clone -b v0.8 https://github.com/Microsoft/nni.git
cd nni
powershell .\install.ps1
powershell -ExecutionPolicy Bypass -file install.ps1
```

For the system requirements of NNI, please refer to [Install NNI](docs/en_US/Installation.md)
Expand All @@ -169,7 +163,7 @@ The following example is an experiment built on TensorFlow. Make sure you have *
* Download the examples via clone the source code.

```bash
git clone -b v0.7 https://github.com/Microsoft/nni.git
git clone -b v0.8 https://github.com/Microsoft/nni.git
```

Linux and MacOS
Expand Down
12 changes: 6 additions & 6 deletions README_zh_CN.md
Expand Up @@ -10,7 +10,7 @@

NNI (Neural Network Intelligence) 是自动机器学习(AutoML)的工具包。 它通过多种调优的算法来搜索最好的神经网络结构和(或)超参,并支持单机、本地多机、云等不同的运行环境。

### **NNI [v0.7](https://github.com/Microsoft/nni/releases) 已发布!**
### **NNI [v0.8](https://github.com/Microsoft/nni/releases) 已发布!**

<p align="center">
<a href="#nni-v05-has-been-released"><img src="docs/img/overview.svg" /></a>
Expand Down Expand Up @@ -55,14 +55,14 @@ NNI (Neural Network Intelligence) 是自动机器学习(AutoML)的工具包
<li><a href="docs/zh_CN/BuiltinTuner.md#Evolution">Naive Evolution(进化算法)</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#SMAC">SMAC</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#Batch">Batch(批处理)</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#Grid">Grid Search(遍历搜索)</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#GridSearch">Grid Search(遍历搜索)</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#Hyperband">Hyperband</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#NetworkMorphism">Network Morphism</a></li>
<li><a href="examples/tuners/enas_nni/README_zh_CN.md">ENAS</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#NetworkMorphism#MetisTuner">Metis Tuner</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#MetisTuner">Metis Tuner</a></li>
<li><a href="docs/zh_CN/BuiltinTuner.md#BOHB">BOHB</a></li>
</ul>
<a href="docs/zh_CN/BuiltinAssessors.md#assessor">Assessor(评估器)</a>
<a href="docs/zh_CN/BuiltinAssessors.md">Assessor(评估器)</a>
<ul>
<li><a href="docs/zh_CN/BuiltinAssessors.md#Medianstop">Median Stop</a></li>
<li><a href="docs/zh_CN/BuiltinAssessors.md#Curvefitting">Curve Fitting</a></li>
Expand Down Expand Up @@ -150,7 +150,7 @@ Windows
```bash
git clone -b v0.7 https://github.com/Microsoft/nni.git
cd nni
powershell ./install.ps1
powershell .\install.ps1
```

参考[安装 NNI](docs/zh_CN/Installation.md) 了解系统需求。
Expand Down Expand Up @@ -180,7 +180,7 @@ Windows
* 运行 MNIST 示例。

```bash
nnictl create --config nni/examples/trials/mnist/config_windows.yml
nnictl create --config nni\examples\trials\mnist\config_windows.yml
```

* 在命令行中等待输出 `INFO: Successfully started experiment!`。 此消息表明 Experiment 已成功启动。 通过命令行输出的 `Web UI url` 来访问 Experiment 的界面。
Expand Down
8 changes: 4 additions & 4 deletions deployment/docker/Dockerfile
Expand Up @@ -31,7 +31,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \
vim \
unzip \
wget \
build-essential \
build-essential \
cmake \
libopenblas-dev \
automake \
Expand All @@ -51,9 +51,9 @@ RUN DEBIAN_FRONTEND=noninteractive && \
#
RUN python3 -m pip install --upgrade pip

# numpy 1.14.3 scipy 1.1.0
# numpy 1.14.3 scipy 1.1.0
RUN python3 -m pip --no-cache-dir install \
numpy==1.14.3 scipy==1.1.0
numpy==1.14.3 scipy==1.1.0

#
# Tensorflow 1.10.0
Expand All @@ -66,7 +66,7 @@ RUN python3 -m pip --no-cache-dir install tensorflow-gpu==1.10.0
RUN python3 -m pip --no-cache-dir install Keras==2.1.6

#
# PyTorch
# PyTorch
#
RUN python3 -m pip --no-cache-dir install torch==0.4.1
RUN python3 -m pip install torchvision==0.2.1
Expand Down
4 changes: 2 additions & 2 deletions deployment/docker/README.md
Expand Up @@ -14,11 +14,11 @@ pandas 0.23.4
lightgbm 2.2.2
NNI v0.7
```
You can take this Dockerfile as a reference for your own customized Dockerfile.
You can take this Dockerfile as a reference for your own customized Dockerfile.

## 2.How to build and run
__Use the following command from `nni/deployment/docker` to build docker image__
```
```
docker build -t nni/nni .
```
__Run the docker image__
Expand Down
2 changes: 1 addition & 1 deletion deployment/pypi/Makefile
Expand Up @@ -7,7 +7,7 @@ ifeq ($(UNAME_S), Linux)
else ifeq ($(UNAME_S), Darwin)
OS_SPEC := darwin
WHEEL_SPEC := macosx_10_9_x86_64
else
else
$(error platform $(UNAME_S) not supported)
endif

Expand Down
2 changes: 1 addition & 1 deletion deployment/pypi/install.ps1
Expand Up @@ -43,7 +43,7 @@ $env:PATH = $NNI_NODE_FOLDER+';'+$env:PATH
cd $CWD\..\..\src\nni_manager
yarn
yarn build
cd $CWD\..\..\src\webui
cd $CWD\..\..\src\webui
yarn
yarn build
if(Test-Path $CWD\nni){
Expand Down
3 changes: 2 additions & 1 deletion deployment/pypi/setup.py
Expand Up @@ -75,7 +75,8 @@
'numpy',
'scipy',
'coverage',
'colorama'
'colorama',
'sklearn'
],
classifiers = [
'Programming Language :: Python :: 3',
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/AdvancedNas.md
Expand Up @@ -88,4 +88,4 @@ For details, please refer to this [simple weight sharing example](https://github
[2]: https://arxiv.org/abs/1707.07012
[3]: https://arxiv.org/abs/1806.09055
[4]: https://arxiv.org/abs/1806.10282
[5]: https://arxiv.org/abs/1703.01041
[5]: https://arxiv.org/abs/1703.01041
2 changes: 1 addition & 1 deletion docs/en_US/AnnotationSpec.md
Expand Up @@ -29,7 +29,7 @@ In NNI, there are mainly four types of annotation:

**Arguments**

- **sampling_algo**: Sampling algorithm that specifies a search space. User should replace it with a built-in NNI sampling function whose name consists of an `nni.` identification and a search space type specified in [SearchSpaceSpec](SearchSpaceSpec.md) such as `choice` or `uniform`.
- **sampling_algo**: Sampling algorithm that specifies a search space. User should replace it with a built-in NNI sampling function whose name consists of an `nni.` identification and a search space type specified in [SearchSpaceSpec](SearchSpaceSpec.md) such as `choice` or `uniform`.
- **name**: The name of the variable that the selected value will be assigned to. Note that this argument should be the same as the left value of the following assignment statement.

There are 10 types to express your search space as follows:
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/BatchTuner.md
Expand Up @@ -5,4 +5,4 @@ Batch Tuner on NNI

Batch tuner allows users to simply provide several configurations (i.e., choices of hyper-parameters) for their trial code. After finishing all the configurations, the experiment is done. Batch tuner only supports the type choice in [search space spec](SearchSpaceSpec.md).

Suggested sceanrio: If the configurations you want to try have been decided, you can list them in searchspace file (using choice) and run them using batch tuner.
Suggested scenario: If the configurations you want to try have been decided, you can list them in SearchSpace file (using choice) and run them using batch tuner.
Expand Up @@ -2,7 +2,7 @@

NNI provides state-of-the-art tuning algorithm in our builtin-assessors and makes them easy to use. Below is the brief overview of NNI current builtin Assessors:

Note: Click the **Assessor's name** to get a detailed description of the algorithm, click the corresponding **Usage** to get the Assessor's installation requirements, suggested scenario and using example.
Note: Click the **Assessor's name** to get the Assessor's installation requirements, suggested scenario and using example. The link for a detailed description of the algorithm is at the end of the suggested scenario of each Assessor.

Currently we support the following Assessors:

Expand All @@ -25,7 +25,7 @@ Note: Please follow the format when you write your `config.yml` file.

**Suggested scenario**

It is applicable in a wide range of performance curves, thus, can be used in various scenarios to speed up the tuning progress.
It is applicable in a wide range of performance curves, thus, can be used in various scenarios to speed up the tuning progress. [Detailed Description](./MedianstopAssessor.md)

**Requirement of classArg**

Expand Down Expand Up @@ -53,7 +53,7 @@ assessor:

**Suggested scenario**

It is applicable in a wide range of performance curves, thus, can be used in various scenarios to speed up the tuning progress. Even better, it's able to handle and assess curves with similar performance.
It is applicable in a wide range of performance curves, thus, can be used in various scenarios to speed up the tuning progress. Even better, it's able to handle and assess curves with similar performance. [Detailed Description](./CurvefittingAssessor.md)

**Requirement of classArg**

Expand Down