From 798af77516810fb1b0ff877f071a4f32fecdc553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=8B=E6=B1=9F=E5=AE=9E=E9=AA=8C=E5=AE=A4?=
 <tianshu@zhejianglab.com>
Date: Fri, 26 Feb 2021 12:10:31 +0800
Subject: [PATCH] update visual server

---
 dubhe-visual-server/.gitignore       |  3 --
 dubhe-visual-server/config.ini       | 16 ++++++++
 dubhe-visual-server/init.sh          |  2 +-
 dubhe-visual-server/requirements.txt | 57 ++++++++++++++++++++++++++++
 dubhe-visual-server/start_server.sh  |  2 +-
 dubhe-visual-server/stop_server.sh   |  2 +-
 6 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 dubhe-visual-server/config.ini
 create mode 100644 dubhe-visual-server/requirements.txt

diff --git a/dubhe-visual-server/.gitignore b/dubhe-visual-server/.gitignore
index ce1411c..ca2b4d9 100644
--- a/dubhe-visual-server/.gitignore
+++ b/dubhe-visual-server/.gitignore
@@ -21,6 +21,3 @@ service_utils/redis_test.py
 
 # redis
 Redis-x64-3.2.100/
-
-# config
-config.ini
\ No newline at end of file
diff --git a/dubhe-visual-server/config.ini b/dubhe-visual-server/config.ini
new file mode 100644
index 0000000..25d7017
--- /dev/null
+++ b/dubhe-visual-server/config.ini
@@ -0,0 +1,16 @@
+# http服务相关 
+[httpserver]
+# True或False，表示是否启动django调试
+DjangoDebug = False
+
+# 日志解析服务相关
+[parser]
+# 可视化日志的根目录，解析服务会从该目录下查找某个用户的可视化日志，用户需根据实际情况进行替换
+LogdirBase = /nfs/dubhe-prod/train-manage
+
+[common]
+RedisHost = localhost
+RedisPort = 6379
+RedisDB = 1
+RedisPassword =
+UserExpirationTime = 60
\ No newline at end of file
diff --git a/dubhe-visual-server/init.sh b/dubhe-visual-server/init.sh
index fcf5a21..ff5d7ef 100644
--- a/dubhe-visual-server/init.sh
+++ b/dubhe-visual-server/init.sh
@@ -15,7 +15,7 @@ conda env create --file dubhe_visual.yaml
 
 echo 'conda dubhe_visual虚拟环境初始化成功，进入环境并执行数据初始化操作...'
 
-conda activate dubhe_visual
+source activate dubhe_visual
 
 cd backend/
 python manage.py migrate
diff --git a/dubhe-visual-server/requirements.txt b/dubhe-visual-server/requirements.txt
new file mode 100644
index 0000000..8e2bc2b
--- /dev/null
+++ b/dubhe-visual-server/requirements.txt
@@ -0,0 +1,57 @@
+absl-py==0.9.0
+asgiref==3.2.10
+astunparse==1.6.3
+blinker==1.4
+brotlipy==0.7.0
+cachetools==4.1.0
+certifi==2020.6.20
+cffi==1.14.0
+chardet==3.0.4
+click==7.1.2
+crc32c==2.0.1
+cryptography==2.9.2
+Django==3.0.8
+django-cors-headers==3.4.0
+gast==0.3.3
+google-auth==1.14.1
+google-auth-oauthlib==0.4.1
+google-pasta==0.2.0
+grpcio==1.27.2
+h5py==2.10.0
+idna==2.10
+joblib==0.16.0
+Keras-Preprocessing==1.1.0
+Markdown==3.1.1
+mkl-fft==1.0.6
+numpy==1.18.5
+oauthlib==3.1.0
+opt-einsum==3.1.0
+pathtools==0.1.2
+Pillow==7.2.0
+protobuf==3.9.1
+pyasn1==0.4.8
+pyasn1-modules==0.2.7
+pycparser==2.20
+PyJWT==1.7.1
+pyOpenSSL==19.1.0
+PySocks==1.7.1
+pytz==2020.1
+redis==3.5.3
+requests==2.24.0
+requests-oauthlib==1.3.0
+rsa==4.0
+scikit-learn==0.23.1
+scipy==1.4.1
+six==1.15.0
+sqlparse==0.3.1
+tensorboard==2.2.1
+tensorboard-plugin-wit==1.8.0
+tensorflow==2.2.0
+tensorflow-estimator==2.2.0
+termcolor==1.1.0
+threadpoolctl==2.1.0
+tsne-mp==0.1.13
+urllib3==1.25.9
+watchdog==0.10.3
+Werkzeug==1.0.1
+wrapt==1.12.1
diff --git a/dubhe-visual-server/start_server.sh b/dubhe-visual-server/start_server.sh
index 06e3c91..1f3172c 100644
--- a/dubhe-visual-server/start_server.sh
+++ b/dubhe-visual-server/start_server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-conda activate dubhe_visual
+source activate dubhe_visual
 echo '进入conda虚拟环境，正在启动服务...'
 DIRNAME=$(pwd)
 
diff --git a/dubhe-visual-server/stop_server.sh b/dubhe-visual-server/stop_server.sh
index 2246140..1e38379 100644
--- a/dubhe-visual-server/stop_server.sh
+++ b/dubhe-visual-server/stop_server.sh
@@ -2,6 +2,6 @@
 
 ps -ef | grep python |grep -v "ndp" |awk '{print $2}'|xargs kill -9
 
-conda deactivate
+source deactivate
 
 echo '服务停止成功，退出conda虚拟环境'