From 6d3a0fdf64c5903ec992ebfd606945c9d218be2e Mon Sep 17 00:00:00 2001 From: Yan Ni Date: Wed, 26 Feb 2020 13:36:49 +0800 Subject: [PATCH 01/16] create Dev homepage (#2101) create dev homepage for lijiao --- docs/en_US/_templates/index.html | 7 +++++++ docs/en_US/_templates/layout.html | 7 +++++++ docs/en_US/conf.py | 6 +++++- docs/en_US/{index.rst => contents.rst} | 0 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 docs/en_US/_templates/index.html create mode 100644 docs/en_US/_templates/layout.html rename docs/en_US/{index.rst => contents.rst} (100%) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html new file mode 100644 index 0000000000..7216a4e460 --- /dev/null +++ b/docs/en_US/_templates/index.html @@ -0,0 +1,7 @@ +{% extends "!layout.html" %} + +{% set title = "Welcome To Neural Network Intelligence !!!"%} + +{% block document %} + +{% endblock %} \ No newline at end of file diff --git a/docs/en_US/_templates/layout.html b/docs/en_US/_templates/layout.html new file mode 100644 index 0000000000..7ee15d7864 --- /dev/null +++ b/docs/en_US/_templates/layout.html @@ -0,0 +1,7 @@ +{% extends "!layout.html" %} + +{% block sidebarlogo %} + + {%- if logo %}{%- endif %} + +{% endblock %} \ No newline at end of file diff --git a/docs/en_US/conf.py b/docs/en_US/conf.py index a883e248dd..856cef09bc 100644 --- a/docs/en_US/conf.py +++ b/docs/en_US/conf.py @@ -64,7 +64,7 @@ source_suffix = ['.rst', '.md'] # The master toctree document. -master_doc = 'index' +master_doc = 'contents' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -82,6 +82,10 @@ pygments_style = None +html_additional_pages = { + 'index': 'index.html', +} + # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for diff --git a/docs/en_US/index.rst b/docs/en_US/contents.rst similarity index 100% rename from docs/en_US/index.rst rename to docs/en_US/contents.rst From 82e4d412d48b44c146692f140737a5366e8cd4ee Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Wed, 26 Feb 2020 13:49:26 +0800 Subject: [PATCH 02/16] Doc homepage (#2102) update index --- docs/en_US/_templates/index.html | 498 +++++++++++++++++++++++++++++++ docs/static/css/custom.css | 72 +++++ 2 files changed, 570 insertions(+) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 7216a4e460..9203a7b8f1 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -3,5 +3,503 @@ {% set title = "Welcome To Neural Network Intelligence !!!"%} {% block document %} + + +
+ NNI (Neural Network Intelligence) is a lightweight but powerful toolkit to + help users automate + Feature Engineering, + Neural Architecture Search, + Hyperparameter Tuning and + Model Compression. +
+

+ The tool manages automated machine learning (AutoML) experiments, + dispatches and runs + experiments' trial jobs generated by tuning algorithms to search the best neural + architecture and/or hyper-parameters in + different training environments like + Local Machine, + Remote Servers, + OpenPAI, + Kubeflow, + FrameworkController on K8S (AKS etc.) + and other cloud options. +

+ +
+

Who should consider using NNI

+ +
+ +
+

NNI v1.4 has been released!

+ + + +
+ +
+

NNI capabilities in a glance

+

+ NNI provides CommandLine Tool as well as an user friendly WebUI to manage training experiements. + With the extensible API, you can customize your own AutoML algorithms and training services. + To make it easy for new users, NNI also provides a set of build-in stat-of-the-art + AutoML algorithms and out of box support for popular training platforms. +

+

+ Within the following table, we summarized the current NNI capabilities, + we are gradually adding new capabilities and we'd love to have your contribution. +

+
+ +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + +
+ Frameworks & Libraries + + Algorithms + + Training Services +
Built-in +
    +
  • Supported Frameworks
    • +
      +
    • PyTorch
      • +
    • Keras
      • +
    • TensorFlow
      • +
    • MXNet
      • +
    • Caffe2
      • + More...
      +
    +
+
    +
  • Supported Libraries
    • +
      +
    • Scikit-learn
      • +
    • XGBoost
      • +
    • LightGBM
      • + More...
      +
    +
+ + 		+ Hyperparameter Tuning + + Neural Architecture Search + + Model Compression + + Feature Engineering (Beta) + + Early Stop Algorithms + + + +
References + + + + + +
+ + +
+

Installation

+
+

Install

+

+ NNI supports and is tested on Ubuntu >= 16.04, macOS >= 10.14.1, + and Windows 10 >= 1809. Simply run the following `pip install` + in an environment that has `python 64-bit >= 3.5`. +

+
Linux or macOS
+
python3 -m pip install --upgrade nni
+
Windows
+
python -m pip install --upgrade nni
+

If you want to try latest code, please install + NNI from source code.

+ +

For detail system requirements of NNI, please refer to here for Linux & macOS, and here for Windows.

+
+
+

Note:

+
    +
  • If there is any privilege issue, add --user to install NNI in the user directory.
    • +
  • Currently NNI on Windows supports local, remote and pai mode. Anaconda or Miniconda is highly + recommended to install NNI on Windows.
    • +
  • If there is any error like Segmentation fault, please refer to FAQ. For FAQ on Windows, please refer + to NNI on Windows.
    • +
+
+
+

Verify installation

+

+ The following example is built on TensorFlow 1.x. Make sure TensorFlow 1.x is used when running + it. +

+
    +
  • +

    Download the examples via clone the source code.

    +
    python3 -m pip install --upgrade nni
    +
    • +
  • +

    Run the MNIST example.

    +
    Linux or macOS
    +
    nnictl create --config nni/examples/trials/mnist-tfv1/config.yml
    +
    Windows
    +
    nnictl create --config nni\examples\trials\mnist-tfv1\config_windows.yml
    +
    • +
  • +

    + Wait for the message INFO: Successfully started experiment! in the command line. + This message indicates that your experiment has been successfully started. + You can explore the experiment using the Web UI url. +

    + + 
    +INFO: Starting restful server...
+INFO: Successfully started Restful server!
+INFO: Setting local config...
+INFO: Successfully set local config!
+INFO: Starting experiment...
+INFO: Successfully started experiment!
+-----------------------------------------------------------------------
+The experiment id is egchD4qy
+The Web UI urls are: http://223.255.255.1:8080   http://127.0.0.1:8080
+-----------------------------------------------------------------------
+
+You can use these commands to get more information about the experiment
+-----------------------------------------------------------------------
+  commands                       description
+1. nnictl experiment show        show the information of experiments
+2. nnictl trial ls               list all of trial jobs
+3. nnictl top                    monitor the status of running experiments
+4. nnictl log stderr             show stderr log content
+5. nnictl log stdout             show stdout log content
+6. nnictl stop                   stop an experiment
+7. nnictl trial kill             kill a trial job by id
+8. nnictl --help                 get help information about nnictl
+-----------------------------------------------------------------------
+
    +
    • +
  • + Open the Web UI url in your browser, you can view detail information of the experiment and + all the submitted trial jobs as shown below. Here are more Web UI + pages. +
    + + +
    +
+ + +
+ + +
+

Documentation

+ +
+ + +
+

Contributing

+

+ This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor + License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your + contribution. + For details, visit https://cla.microsoft.com. +

+

+ When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and + decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You + will only need to do this once across all repos using our CLA. +

+

+ This project has adopted the Microsoft Open Source Code of + Conduct. For more information see the Code of + Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments. +

+

+ After getting familiar with contribution agreements, you are ready to create your first PR =), follow the NNI + developer tutorials to get start: +

+ +
+ + +
+

External Repositories and References

+

With authors' permission, we listed a set of NNI usage examples and relevant articles.

+ + + + + +
+ + +
+

Feedback

+ +
+ + +
+

Related Projects

+

+ Targeting at openness and advancing state-of-art technology, + Microsoft Research (MSR) + had also released few + other open source projects.

+ +

We encourage researchers and students leverage these projects to accelerate the AI development and research.

+
+ + +
+

License

+

The entire codebase is under MIT license

+
+ + {% endblock %} \ No newline at end of file diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index 6d0b44926c..0efc993115 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -1,3 +1,75 @@ .wy-table-responsive table td, .wy-table-responsive table th{ white-space:normal } + +.title { + padding-bottom: 6px; + border-bottom: 1px solid #ccc; +} + +.second-title{ + margin-top: 14px; +} +/* command style */ +.command { + background-color: #f8f8f8; + border: 1px solid #e1e4e5; + height: 40px; + line-height: 40px; + font-size: 12px; + padding-left: 10px; +} + +.command-intro { + line-height: 40px; +} + +.code{ + background-color: #f8f8f8; + padding: 15px 20px; +} + +/* p margin-top: 24 */ +.topMargin{ + margin-top: 24px; +} + +.wy-nav-content ul li{ + list-style: disc; + margin-bottom: 12px; + margin-left: 24px; +} + +.list, .list tr, .list td{ + border: 1px solid #ccc; +} + +.column b{ + padding-bottom: 4px; + border-bottom: 2px solid blue; +} +.column td{ + width: 200px; + text-align: center; + line-height: 36px; +} +td.framework{ + width:300px; + -webkit-width: 220px; +} +.list .circle li{ + list-style-type: circle; +} + +.list .firstUl, .circle{ + padding-left: 20px; +} + +.list .verticalMiddle{ + vertical-align: middle !important; + text-align: center; +} + +.inline{ + display: inline-block; +} \ No newline at end of file From 5f8b2f774f677302cef519ec7658067b42be44d8 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Mon, 11 May 2020 11:05:35 +0800 Subject: [PATCH 03/16] update (#2413) Co-authored-by: Lijiao <15910218274@163.com> --- docs/static/css/custom.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index 0efc993115..42d353abcc 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -34,6 +34,21 @@ margin-top: 24px; } +/* document body width */ +.wy-nav-content{ + max-width: 90% !important; +} + +/* nni logo bgcolor */ +.wy-side-nav-search{ + background-color: black; +} + +/* document body font-family */ +.wy-body-for-nav{ + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; +} + .wy-nav-content ul li{ list-style: disc; margin-bottom: 12px; From b9471ec23252cfded0e366bcedbb0455b3b671f4 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Fri, 15 May 2020 16:16:54 +0800 Subject: [PATCH 04/16] Final doc (#2436) * change font-family Segoe * update Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/index.html | 10 +++------- docs/static/css/custom.css | 11 ++++++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 9203a7b8f1..8980de97ec 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -44,9 +44,7 @@

Who should consider using NNI

NNI v1.4 has been released!

- - - +
@@ -125,8 +123,6 @@

NNI capabilities in a glance

  • Scikit-learn
  • EfficientNet
    • More...
    - - @@ -332,8 +328,8 @@

    Verify installation

    all the submitted trial jobs as shown below. Here are more Web UI pages.
    - - + +
    diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index 42d353abcc..759d1cacb9 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -36,7 +36,8 @@ /* document body width */ .wy-nav-content{ - max-width: 90% !important; + max-width: 100% !important; + background-color: #fff; } /* nni logo bgcolor */ @@ -45,7 +46,7 @@ } /* document body font-family */ -.wy-body-for-nav{ +.wy-body-for-nav, h1, h2, h3, h4, h5, h6, div, p, ul, li, a{ font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; } @@ -85,6 +86,10 @@ td.framework{ text-align: center; } -.inline{ +.inline img, .inline h3{ display: inline-block; +} + +.ui-img img{ + height: 230px; } \ No newline at end of file From 4180cb44505e689c4578e6b8d31a2cb960e10620 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Fri, 15 May 2020 18:07:27 +0800 Subject: [PATCH 05/16] chang font-family (#2438) "Lato", segoe ui, "proxima-nova","Helvetica Neue",Arial,sans-serif --- docs/static/css/custom.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index 759d1cacb9..be48b7beb4 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -47,7 +47,7 @@ /* document body font-family */ .wy-body-for-nav, h1, h2, h3, h4, h5, h6, div, p, ul, li, a{ - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-family: "Lato", segoe ui, "proxima-nova","Helvetica Neue",Arial,sans-serif; } .wy-nav-content ul li{ @@ -92,4 +92,4 @@ td.framework{ .ui-img img{ height: 230px; -} \ No newline at end of file +} From 6b162ae72d3269330f367625c33a077d9bd4a90b Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Mon, 18 May 2020 10:44:39 +0800 Subject: [PATCH 06/16] update index.html (#2441) * change font-family Segoe * update Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/index.html | 39 +++++-------------------------- docs/static/img/overview.svg | 1 + docs/static/img/release_icon.png | Bin 0 -> 2016 bytes 3 files changed, 7 insertions(+), 33 deletions(-) create mode 100644 docs/static/img/overview.svg create mode 100644 docs/static/img/release_icon.png diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 8980de97ec..416829a1c2 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -3,9 +3,7 @@ {% set title = "Welcome To Neural Network Intelligence !!!"%} {% block document %} - -
    NNI (Neural Network Intelligence) is a lightweight but powerful toolkit to help users automate @@ -44,7 +42,7 @@

    Who should consider using NNI

    NNI v1.4 has been released!

    - +
    @@ -62,7 +60,7 @@

    NNI capabilities in a glance

    - +

    @@ -106,15 +104,6 @@

    NNI capabilities in a glance

    Model Compression @@ -178,16 +160,11 @@

    NNI capabilities in a glance

  • AGP Pruner
  • Slim Pruner
  • FPGM Pruner
    • - QuantizationFeature Engineering (Beta) @@ -199,8 +176,6 @@

    NNI capabilities in a glance

    @@ -231,17 +239,18 @@

    Install

    python3 -m pip install --upgrade nni
    Windows
    python -m pip install --upgrade nni
    -

    If you want to try latest code, please install +

    If you want to try latest code, please install NNI from source code.

    -

    For detail system requirements of NNI, please refer to here for Linux & macOS, and here for Windows.

    +

    For detail system requirements of NNI, please refer to here + for Linux & macOS, and here for Windows.

    Note:

    • If there is any privilege issue, add --user to install NNI in the user directory.
    • Currently NNI on Windows supports local, remote and pai mode. Anaconda or Miniconda is highly - recommended to install NNI on Windows.
      • + recommended to install NNI on Windows.
    • If there is any error like Segmentation fault, please refer to FAQ. For FAQ on Windows, please refer to NNI on Windows.
      • @@ -256,7 +265,7 @@

      Verify installation

      • Download the examples via clone the source code.

        -
        python3 -m pip install --upgrade nni
        +
        git clone -b v1.5 https://github.com/Microsoft/nni.git

      • Run the MNIST example.

        @@ -317,8 +326,7 @@

        Documentation

        • To learn about what's NNI, read the NNI Overview.
        • To get yourself familiar with how to use NNI, read the documentation.
          • -
        • To get started and install NNI on your system, please refer to Install - NNI.
          • +
        • To get started and install NNI on your system, please refer to Install NNI.
    @@ -340,7 +348,7 @@

    Contributing

    This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments. + href="mailto:opencode@microsoft.com">opencode@microsoft.com with any additional questions or comments.

    After getting familiar with contribution agreements, you are ready to create your first PR =), follow the NNI @@ -367,8 +375,7 @@

    Contributing

  • Customize your own Tuner
  • Implement customized TrainingService
    • - -
  • Implement a new NAS trainer on NNI
    • +
  • Implement a new NAS trainer on NNI
  • Customize your own Advisor
    • @@ -379,10 +386,12 @@

    External Repositories and References

    With authors' permission, we listed a set of NNI usage examples and relevant articles.

    @@ -257,9 +232,9 @@

    Install

    Windows
    python -m pip install --upgrade nni

    If you want to try latest code, please install - NNI from source code.

    - -

    For detail system requirements of NNI, please refer to here for Linux & macOS, and here for Windows.

    + NNI from source code. +

    +

    For detail system requirements of NNI, please refer to here for Linux & macOS, and here for Windows.

    Note:

    @@ -296,7 +271,7 @@

    Verify installation

    This message indicates that your experiment has been successfully started. You can explore the experiment using the Web UI url.

    - + 
     INFO: Starting restful server...
 INFO: Successfully started Restful server!
@@ -402,7 +377,6 @@ 
    Contributing
    
 
    
   
    External Repositories and References
    
   
    With authors' permission, we listed a set of NNI usage examples and relevant articles.
    
-  
   
      
     
      External Repositories
      
     
    • Run ENAS with
@@ -497,5 +471,4 @@ 
      License
      
   
      The entire codebase is under MIT license
    - {% endblock %} \ No newline at end of file diff --git a/docs/static/img/overview.svg b/docs/static/img/overview.svg new file mode 100644 index 0000000000..ae369941ab --- /dev/null +++ b/docs/static/img/overview.svg @@ -0,0 +1 @@ +overview栅格化 \ No newline at end of file diff --git a/docs/static/img/release_icon.png b/docs/static/img/release_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c0479181f6a911863eee9d3d87f655f8de8c0d7b GIT binary patch literal 2016 zcma)7YdjMQAD&!Gj+CtEBAb=4xi$A&SvH%=up^f&bBkoMxlbYFo@L7<3d7`*4q7^H z-B`}V*j%b5b<|vPiD(X9=i~e7eLpljY_8nDIy z?YatC+8LVybcVe~he22Ha6-FI&FEdi4bjOK{|G#0AxK%Sy{39NTXgwG^TWDHzFI}t zDO6J>M9^*O;5Dr6o!Xh3yWu076Lcyn`Z9dX2 zvz_p7fbphtNzj(u6hcjnx<0$O*;2QpDNC?KUsGJ?TU>YUo;o%v3N#o&*>gj?s}q@Ms9$#f~u%f-eB6M>Tuuzjf@a+|Lct^o%~xOBp<4USSdS2lYk! zAS@icofJE@<}Z}D2_sF<((;*ZUw?hOW1=-i7Rp;?TiKaU_Z>6=o$UXqr0n{PMqf%Z zRF#Ycc9j@0M|9GVaOO&KztJJyT94g}{Ag{Bw-USHd!;3=kL^nV&AMafg!1Myo>~Wu zg$)6o@Ev&E%$l^O6!&_J=D~&Ez|x}RfG*2hyJO{PQuB636Niydrml_rY3&!)dej1;&{OlL5=8qIyb+Sw0_vvcJc8~>nbWK?Fp}}yNtJf|MO3v z-w^M25ovsKpDoqJx7~Vtq&B#JuwEI~`e*K15|Vhxq_-RezOuGl zn>Ft5(cdYI-RMPnzcZL4mTa9gE!k?+?Pm35_*o;?<(1_h9lt^-092$ValcZ~Hnc%=xI5`J-EKa_XF^giFS2iwDH`RXQrFR z-((F1S0M(dMp$NRxtVHZ+h2^|C_UBtgkT!D);(X4ruh7Kp~6`sG2m%+plF#^JLL8S%_W#W87h2J8R`f0X-5sCpyml3oBNd8p z!yRXuOsX^Oc=Iv!eKfKJR7qVH*ebTVw35AG`;d=OM#vCmZTYlb zX!0u+J=GgfanU`+pAyG3H>Qo68dEmsM`jzv-#t*C;w$3=IBg0a6q)#DJtD!Gaian7bzkm zudvRIUzL3bs?*O}rB@#D_P$lI60cUO8S{! z*`q?EHprr|VlC!Pzo4CCiQP_grDN>mpsRV~+JE(Z?zc(%*5t|v3ewk)(K$wL6s37U$xta$I zA~RGyccZgm%PELgs!uQ@FJPdCQk!Tg=7cp z**&`E5njXxE5a|-F&a&_7E8B(MI3Zi15@@H#^Fq4_X$ZALO~A9+4RDllK2WLqY-I0 ztFi@4InBB6TQ;j9nct#vj0k4_AO0Szs5O-kim%w1dd3OOTpXg>dRt_*BuBG2VH_SX RFK~OZ0Vo94q2V+k Date: Tue, 19 May 2020 12:38:54 +0800 Subject: [PATCH 07/16] change font-family Segoe (#2453) Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/layout.html | 32 ++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/en_US/_templates/layout.html b/docs/en_US/_templates/layout.html index 7ee15d7864..1c8995d0ae 100644 --- a/docs/en_US/_templates/layout.html +++ b/docs/en_US/_templates/layout.html @@ -1,7 +1,29 @@ -{% extends "!layout.html" %} +{% block sidebartitle %} + + {% if logo and theme_logo_only %} + + {% else %} + {{ project }} + {% endif %} + + {% if logo %} + {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #} + + {% endif %} + + + {% if theme_display_version %} + {%- set nav_version = version %} + {% if READTHEDOCS and current_version %} + {%- set nav_version = current_version %} + {% endif %} + {% if nav_version %} +
    + {{ nav_version }} +
    + {% endif %} + {% endif %} + + {% include "searchbox.html" %} -{% block sidebarlogo %} - - {%- if logo %}{%- endif %} - {% endblock %} \ No newline at end of file From 126877cbc2a60387855c293b296fbcb8f5bb4f94 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Thu, 21 May 2020 11:51:25 +0800 Subject: [PATCH 08/16] Update layout.html (#2469) --- docs/en_US/_templates/layout.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en_US/_templates/layout.html b/docs/en_US/_templates/layout.html index 1c8995d0ae..e4200b60ab 100644 --- a/docs/en_US/_templates/layout.html +++ b/docs/en_US/_templates/layout.html @@ -1,3 +1,4 @@ +{% extends "!layout.html" %} {% block sidebartitle %} {% if logo and theme_logo_only %} @@ -26,4 +27,4 @@ {% include "searchbox.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} From 0b2b1d75275fbce6a9a9343863948cc53de3c13d Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Mon, 25 May 2020 09:47:59 +0800 Subject: [PATCH 09/16] change font-family Segoe (#2478) Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/index.html | 146 +++++++++++++++++++------------ 1 file changed, 89 insertions(+), 57 deletions(-) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 416829a1c2..c4ba9b58ea 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -23,6 +23,7 @@ OpenPAI, Kubeflow, FrameworkController on K8S (AKS etc.) + DLWorkspace (aka. DLTS) and other cloud options.

    @@ -41,7 +42,7 @@

    Who should consider using NNI

    -

    NNI v1.4 has been released!

    +

    NNI {{ release }} has been released!

    @@ -104,43 +105,45 @@

    NNI capabilities in a glance

    		 Hyperparameter Tuning Neural Architecture Search @@ -150,18 +153,21 @@

    NNI capabilities in a glance

  • DARTS
  • P-DARTS
  • CDARTS
    • +
  • SPOS
    • +
  • ProxylessNAS
  • Network Morphism
    • +
  • TextNAS
    • Model Compression     		@@ -187,7 +193,9 @@

    NNI capabilities in a glance

  • OpenPAI
  • Kubeflow
  • FrameworkController on K8S - (AKSetc.)
    • + (AKSetc.) + +
  • DLWorkspace (aka. DLTS)
    		•
    + + + + + + + + + + + + +
    GitterWeChat
    + Gitter + OR + NNI Wechat +
    +
    From 7d1f8501ff906b90c2b535ab3033d0a1d6666444 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Mon, 25 May 2020 10:27:58 +0800 Subject: [PATCH 10/16] Update index.html (#2482) --- docs/en_US/_templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index c4ba9b58ea..221ba071a5 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -326,7 +326,7 @@

    Documentation

    @@ -503,4 +503,4 @@

    License

    The entire codebase is under MIT license

    -{% endblock %} \ No newline at end of file +{% endblock %} From 826a82e34c3c066bd2ba772b5cdffcc806c8fafb Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Tue, 2 Jun 2020 10:12:56 +0800 Subject: [PATCH 11/16] add chinese doc link (#2512) * add chinese doc link * update Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/index.html | 1 + docs/static/css/custom.css | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 221ba071a5..fe726c5215 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -5,6 +5,7 @@ {% block document %}
    +
    简体中文
    NNI (Neural Network Intelligence) is a lightweight but powerful toolkit to help users automate Feature Engineering, diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index be48b7beb4..c871031e3c 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -93,3 +93,16 @@ td.framework{ .ui-img img{ height: 230px; } + +.wy-side-nav-search>div.version{ + color: #fff !important; +} + +.list{ + width: 90%; + margin: 0 auto; +} + +.chinese{ + margin-bottom: 16px; +} From 69a1c3212268c899897b349584402af293a1f21a Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Tue, 2 Jun 2020 14:30:22 +0800 Subject: [PATCH 12/16] change link (#2519) Co-authored-by: Lijiao <15910218274@163.com> --- docs/en_US/_templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index fe726c5215..403d571166 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -5,7 +5,7 @@ {% block document %}
    -
    简体中文
    +
    简体中文
    NNI (Neural Network Intelligence) is a lightweight but powerful toolkit to help users automate Feature Engineering, From ff1f8c48b1fd7b85ece7337be08fec050e70743b Mon Sep 17 00:00:00 2001 From: Yan Ni Date: Fri, 5 Jun 2020 16:51:32 +0800 Subject: [PATCH 13/16] update release version --- docs/en_US/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en_US/conf.py b/docs/en_US/conf.py index 856cef09bc..0e0d3b8674 100644 --- a/docs/en_US/conf.py +++ b/docs/en_US/conf.py @@ -28,7 +28,7 @@ # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = 'v1.5' +release = 'v1.6' # -- General configuration --------------------------------------------------- From 1697944fb7f883fd58d96297fa42054c99379138 Mon Sep 17 00:00:00 2001 From: Yan Ni Date: Fri, 5 Jun 2020 16:59:24 +0800 Subject: [PATCH 14/16] update wechat group QRcode --- docs/en_US/_templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 403d571166..889de522f1 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -455,7 +455,7 @@

    Feedback

    OR - NNI Wechat + NNI Wechat From fb3b00126666a32c04e3c85e5cfd7969aae676b5 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Tue, 9 Jun 2020 10:47:11 +0800 Subject: [PATCH 15/16] update wechat image (#2533) * update wechat image * update link Co-authored-by: Lijiao <15910218274@163.com> --- README.md | 2 +- docs/en_US/_templates/index.html | 8 ++++---- docs/static/css/custom.css | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 27a33c5f18..81930e6bba 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ With authors' permission, we listed a set of NNI usage examples and relevant art Join IM discussion groups: |Gitter||WeChat| |----|----|----| -|![image](https://user-images.githubusercontent.com/39592018/80665738-e0574a80-8acc-11ea-91bc-0836dc4cbf89.png)| OR |![image](https://github.com/JSong-Jia/NNI-user-group/blob/master/user%20group%20code_0512.png)| +|![image](https://user-images.githubusercontent.com/39592018/80665738-e0574a80-8acc-11ea-91bc-0836dc4cbf89.png)| OR |![image](https://github.com/scarlett2018/nniutil/blob/master/wechat.png)| ## Related Projects diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 889de522f1..6568416c0e 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -450,12 +450,12 @@

    Feedback

    WeChat - + Gitter - OR - - NNI Wechat + OR + + NNI Wechat diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css index c871031e3c..ba10407098 100644 --- a/docs/static/css/custom.css +++ b/docs/static/css/custom.css @@ -106,3 +106,11 @@ td.framework{ .chinese{ margin-bottom: 16px; } + +.QR{ + width: 180px; +} + +.or{ + vertical-align: middle; +} \ No newline at end of file From d65db7a6d2d83c00b6868cd800fc02a7dac6be87 Mon Sep 17 00:00:00 2001 From: Lijiaoa <61399850+Lijiaoa@users.noreply.github.com> Date: Tue, 9 Jun 2020 15:17:46 +0800 Subject: [PATCH 16/16] fix broken link (#2542) Co-authored-by: Lijiao <15910218274@163.com> --- README.md | 2 +- docs/en_US/_templates/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81930e6bba..d8856da919 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ With authors' permission, we listed a set of NNI usage examples and relevant art Join IM discussion groups: |Gitter||WeChat| |----|----|----| -|![image](https://user-images.githubusercontent.com/39592018/80665738-e0574a80-8acc-11ea-91bc-0836dc4cbf89.png)| OR |![image](https://github.com/scarlett2018/nniutil/blob/master/wechat.png)| +|![image](https://user-images.githubusercontent.com/39592018/80665738-e0574a80-8acc-11ea-91bc-0836dc4cbf89.png)| OR |![image](https://github.com/scarlett2018/nniutil/raw/master/wechat.png)| ## Related Projects diff --git a/docs/en_US/_templates/index.html b/docs/en_US/_templates/index.html index 6568416c0e..22a4c77dc2 100644 --- a/docs/en_US/_templates/index.html +++ b/docs/en_US/_templates/index.html @@ -455,7 +455,7 @@

    Feedback

    OR - NNI Wechat + NNI Wechat