Merge branch 'master' into master

opteroncx · Mar 6, 2019 · 0fe6bd4 · 0fe6bd4
2 parents 7a6186b + 0ac1910
commit 0fe6bd4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/setup.py b/setup.py
@@ -24,6 +24,8 @@
         './pyc/mt_download.pyc',
         './pyc/slomo.pyc',
         './pyc/runSlomo.pyc',
+        './pyc/MoeNet_lite2.pyc',
+        './pyc/logger.pyc',
         './templates',
         './static',
         './model',
@@ -49,7 +51,7 @@
         ]
 
 build_exe_options = {
-        'packages': ['tkinter', 'scipy', 'asyncio', 'numpy', 'torch', 'gevent','flask','torchvision'], 
+        'packages': ['tkinter', 'asyncio', 'numpy', 'torch', 'gevent','flask','torchvision','logging'], 
         'includes': ['numpy.core._methods','jinja2','jinja2.ext','asyncio.compat'],
         'include_files': ifiles,
         'bin_excludes': efiles}

diff --git a/templates/video.html b/templates/video.html
@@ -28,7 +28,7 @@
 				<br>
 				<br>
 				<h2 class="agileits-title">AI视频</h2>
-				<p class="pagile-text">选择一段需要放大的视频！运行完毕请点击保存</p>
+				<p class="pagile-text">选择一段需要放大/插帧或慢动作处理的视频！运行完毕请点击保存</p>
 			</div>
 		</div>
 		<!-- //features -->

diff --git a/update_log.txt b/update_log.txt
@@ -1,3 +1,15 @@
+==========ver4.4.2============
+集成4倍快速放大模型
+系统信息页面增加获取日志功能，worker进程日志同时写入.user/log.txt
+后台支持缩放功能，使用PyTorch的Bilinear interpolate
+增加备用的nvml.dll
+统一后台任务接口
+==========ver4.3.1============
+slomo现在自动设置batchSize
+系统信息增加cuda和cudnn版本
+简化保存按钮样式
+修正页面若干文字错误，美化图标
+视频放大栏目改为AI视频
 ==========ver4.2============
 更换快速放大模型
 chcp方式支持非ASCII程序目录