04031338

app/model/main.py

@@ -111,7 +111,7 @@ def main():
     # 添加参数
     parser.add_argument("input_file", help="输入文件路径")    # 第一个位置参数
 
-    parser.add_argument("model_name", default="cnn", help='选择短期模型')    # 第二个位置参数
+    parser.add_argument("--model_name", default="cnn", help='选择短期模型')    # 第二个位置参数
     # 解析参数
     args = parser.parse_args()
 

app/model/tf_cnn_train.py

@@ -24,7 +24,6 @@ mgUtils = MongoUtils(logger)
 def model_training(train_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     logger.info("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -75,15 +74,8 @@ def model_training(train_data, input_file, cap):
             write_number_to_file(os.path.join(output_file, status_file), 2, 3)
         my_exception = traceback.format_exc()
         my_exception.replace("\n", "\t")
-        result['msg'] = my_exception
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = args
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("cnn训练任务：用了 %s 秒 " % (end_time-start_time))
 
 
 if __name__ == "__main__":

app/model/tf_fmi_train.py

@@ -27,7 +27,6 @@ mgUtils = MongoUtils(logger)
 def model_training(train_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     logger.info("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -78,15 +77,8 @@ def model_training(train_data, input_file, cap):
             write_number_to_file(os.path.join(output_file, status_file), 2, 3)
         my_exception = traceback.format_exc()
         my_exception.replace("\n", "\t")
-        result['msg'] = my_exception
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = args
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("fmi训练任务：用了 %s 秒 " % (end_time-start_time))
 
 
 if __name__ == "__main__":

app/model/tf_lstm_train.py

@@ -27,7 +27,6 @@ mgUtils = MongoUtils(logger)
 def model_training(train_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     logger.info("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -78,15 +77,8 @@ def model_training(train_data, input_file, cap):
             write_number_to_file(os.path.join(output_file, status_file), 2, 3)
         my_exception = traceback.format_exc()
         my_exception.replace("\n", "\t")
-        result['msg'] = my_exception
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = args
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("lstm训练任务：用了 %s 秒 " % (end_time-start_time))
 
 
 if __name__ == "__main__":