Merge pull request #24 from microsoft/master

pull code
SparkSnail · Jul 8, 2019 · ea5f58f · ea5f58f
2 parents e9040c9 + eea33e1
commit ea5f58f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/src/sdk/pynni/nni/networkmorphism_tuner/bayesian.py b/src/sdk/pynni/nni/networkmorphism_tuner/bayesian.py
@@ -29,8 +29,9 @@
 from scipy.optimize import linear_sum_assignment
 from sklearn.metrics.pairwise import rbf_kernel
 
+from nni.utils import OptimizeMode
 from nni.networkmorphism_tuner.graph_transformer import transform
-from nni.networkmorphism_tuner.utils import Constant, OptimizeMode
+from nni.networkmorphism_tuner.utils import Constant
 from nni.networkmorphism_tuner.layers import is_layer
 
 

diff --git a/src/webui/src/App.css b/src/webui/src/App.css
@@ -1,5 +1,4 @@
 .nni{
-  font-family: 'Segoe';
   color: #212121;
   font-size: 14px;
   background: #f2f2f2;

diff --git a/src/webui/src/index.css b/src/webui/src/index.css
@@ -49,8 +49,4 @@ table {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
-@font-face {
-	font-family: 'Segoe';
-	src: url('./static/font/SegoePro-Regular.ttf');
-}
 
diff --git a/src/webui/src/static/font/SegoePro-Regular.ttf b/src/webui/src/static/font/SegoePro-Regular.ttf
diff --git a/src/webui/src/static/style/table.scss b/src/webui/src/static/style/table.scss
@@ -30,15 +30,13 @@
     tr{
         text-align: center;
         color:#212121;
-        font-family: 'Segoe';
         font-size: 14px;
         /* background-color: #f2f2f2; */
     }
     th{
         padding: 2px;
         background-color:white !important;
         font-size: 14px;
-        font-family: 'Segoe';
         color: #808080;
         border-bottom: 1px solid #d0d0d0;
         text-align: center;