'新增队列调度'

před 4 roky · 1becb21320
--- a/style-transform-master/.vs/style-transform-master/v16/.suo
+++ b/style-transform-master/.vs/style-transform-master/v16/.suo
--- a/style-transform-master/style-transform-master/html/fail.html
+++ b/style-transform-master/style-transform-master/html/fail.html
@ -0,0 +1,11 @@
 <!DOCTYPE html>

 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <meta charset="utf-8" />
    <title>Fail</title>
 </head>
 <body>
    <script>alert("服务器繁忙，请稍后重试。");</script>
 </body>
 </html>
--- a/style-transform-master/style-transform-master/html/generate.html
+++ b/style-transform-master/style-transform-master/html/generate.html
@ -34,7 +34,9 @@
 					<h2><span class="highlight-text">WAITING</span></h2>

 					<p class="col-md-8 col-sm-10 col-xs-12 col-md-offset-2 col-sm-offset-1">
 						正在为您绘画，请稍等……<br />已完成<b><span style="color:darkgoldenrod" id="progress"></span>%</b>
 						正在为您绘画，请稍等……<br />
 						您的前方还有<span style="color:darkred" id="wait"></span>个作画任务，请耐心等待。<br />
 						已完成<b><span style="color:darkgoldenrod" id="progress"></span>%。</b>
 					</p>
 				</div>
 				<div id='prog_out' class="progress-background">
--- a/style-transform-master/style-transform-master/obj/Debug/style-transform-master.njsprojAssemblyReference.cache
+++ b/style-transform-master/style-transform-master/obj/Debug/style-transform-master.njsprojAssemblyReference.cache
--- a/style-transform-master/style-transform-master/public/js/generate.js
+++ b/style-transform-master/style-transform-master/public/js/generate.js
@ -6,6 +6,7 @@ function getProgress(taskID) {
 	}).done(function(data) {
 		$('div[role="progressbar"]').attr("aria-valuenow", data.percentage);
 		$('div[role="progressbar"]').width(data.percentage + '%');
 		$('#wait').html(data.wait);
 		$('#progress').html(data.percentage);
 		if(data.status == 1) {
 			window.location.replace('./success?taskID='+taskID);
--- a/style-transform-master/style-transform-master/public/uploads/176b2f8f89ba8b530007d6986c2fa9c922a17a4758a.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b2f8f89ba8b530007d6986c2fa9c922a17a4758a.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b2fb522f98d18e1c2a7fbb26857de6e644f6d096.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b2fb522f98d18e1c2a7fbb26857de6e644f6d096.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b3104418353a1deca2017e116ff55024cf4e0071.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b3104418353a1deca2017e116ff55024cf4e0071.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b344f40c982f6168b63a0165c869a89be89c8537.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b344f40c982f6168b63a0165c869a89be89c8537.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b3478124094634bb8c1aceda8d75ea236a21175a.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b3478124094634bb8c1aceda8d75ea236a21175a.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b348fcce3fc160596c09a98cbe47ee2a086c42bd.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b348fcce3fc160596c09a98cbe47ee2a086c42bd.jpg
--- a/style-transform-master/style-transform-master/public/uploads/176b34907171b5597171b2e24a6430897b21314cf27.jpg
+++ b/style-transform-master/style-transform-master/public/uploads/176b34907171b5597171b2e24a6430897b21314cf27.jpg
--- a/style-transform-master/style-transform-master/public/uploads/24140d7a8f001e552893569e61c45022
+++ b/style-transform-master/style-transform-master/public/uploads/24140d7a8f001e552893569e61c45022
--- a/style-transform-master/style-transform-master/public/uploads/248baa6862e643126e7cc271f5c0db43
+++ b/style-transform-master/style-transform-master/public/uploads/248baa6862e643126e7cc271f5c0db43
--- a/style-transform-master/style-transform-master/public/uploads/31cb74097c0f137cda202f97fc82c39c
+++ b/style-transform-master/style-transform-master/public/uploads/31cb74097c0f137cda202f97fc82c39c
--- a/style-transform-master/style-transform-master/public/uploads/40bf7fff77f209858c92692c1643db05
+++ b/style-transform-master/style-transform-master/public/uploads/40bf7fff77f209858c92692c1643db05
--- a/style-transform-master/style-transform-master/public/uploads/4a528c2b3d548f21efd498d6fcc6ee3e
+++ b/style-transform-master/style-transform-master/public/uploads/4a528c2b3d548f21efd498d6fcc6ee3e
--- a/style-transform-master/style-transform-master/public/uploads/6be77319ed4f40cb3764c9d17a0e3e6d
+++ b/style-transform-master/style-transform-master/public/uploads/6be77319ed4f40cb3764c9d17a0e3e6d
--- a/style-transform-master/style-transform-master/public/uploads/7b5ee265b28a6127e1655142523c6ce4
+++ b/style-transform-master/style-transform-master/public/uploads/7b5ee265b28a6127e1655142523c6ce4
--- a/style-transform-master/style-transform-master/public/uploads/9529e38e01e4ade24d1939ae029ea7ba
+++ b/style-transform-master/style-transform-master/public/uploads/9529e38e01e4ade24d1939ae029ea7ba
--- a/style-transform-master/style-transform-master/public/uploads/a0e8ff26bdf39d016052c3338fd11ab9
+++ b/style-transform-master/style-transform-master/public/uploads/a0e8ff26bdf39d016052c3338fd11ab9
--- a/style-transform-master/style-transform-master/public/uploads/a66b7d24b2ae85efd87692b33e8e69d1
+++ b/style-transform-master/style-transform-master/public/uploads/a66b7d24b2ae85efd87692b33e8e69d1
--- a/style-transform-master/style-transform-master/public/uploads/b68ae966a5ac0ce4ef5c59feff613a2e
+++ b/style-transform-master/style-transform-master/public/uploads/b68ae966a5ac0ce4ef5c59feff613a2e
--- a/style-transform-master/style-transform-master/public/uploads/c0c0d564976eb7c53c1436be2333f31e
+++ b/style-transform-master/style-transform-master/public/uploads/c0c0d564976eb7c53c1436be2333f31e
--- a/style-transform-master/style-transform-master/public/uploads/caa0e5cfcb3f4597e4c0ed7790275f31
+++ b/style-transform-master/style-transform-master/public/uploads/caa0e5cfcb3f4597e4c0ed7790275f31
--- a/style-transform-master/style-transform-master/public/uploads/ce4073057a801b2ca993fb1469a15e99
+++ b/style-transform-master/style-transform-master/public/uploads/ce4073057a801b2ca993fb1469a15e99
--- a/style-transform-master/style-transform-master/public/uploads/d517817f8cfc575b5a80563ff5359cd3
+++ b/style-transform-master/style-transform-master/public/uploads/d517817f8cfc575b5a80563ff5359cd3
--- a/style-transform-master/style-transform-master/public/uploads/d6a0e417d27ad4937da8f0ce7a826fd4
+++ b/style-transform-master/style-transform-master/public/uploads/d6a0e417d27ad4937da8f0ce7a826fd4
--- a/style-transform-master/style-transform-master/public/uploads/e634459ff4fd2d759b4691375f922723
+++ b/style-transform-master/style-transform-master/public/uploads/e634459ff4fd2d759b4691375f922723
--- a/style-transform-master/style-transform-master/public/uploads/f8abae0975cdc75a23d08fdf7c22b90c
+++ b/style-transform-master/style-transform-master/public/uploads/f8abae0975cdc75a23d08fdf7c22b90c
--- a/style-transform-master/style-transform-master/public/uploads/fe5269e79229d462114741c0ffadf28a
+++ b/style-transform-master/style-transform-master/public/uploads/fe5269e79229d462114741c0ffadf28a
--- a/style-transform-master/style-transform-master/server.js
+++ b/style-transform-master/style-transform-master/server.js
@ -28,26 +28,19 @@ var upload = multer({ dest: 'public/uploads/' });
 var progress = {};
 var relationfile = {};

 server.post('/generate', upload.fields([{ name: 'content_image', maxCount: 1 }, { name: 'style_image', maxCount: 1 }]), function (req, res) {
 	let max_epoch = req.body.max_epoch;
 	let md5 = crypto.createHash('md5');
 	
 	console.log(req.files);
 	console.log("Epoch = " + max_epoch);

 	if (!req.files.content_image || !req.files.style_image) {
 		progress[taskID] = {percentage: 0, max_epoch: 0, status: -2};
 	}
 var isIdle = true;
 var queue = [];
 var totalTask = 0;

 	let taskID = Date.now().toString(16) + md5.update(req.files.content_image[0].filename + req.files.style_image[0].filename).digest('hex');
 function run_child(taskID) {
 	let child = exec(`python run_main.py --content ./public/uploads/${relationfile[taskID].content} --style ./public/uploads/${relationfile[taskID].style} --output ./public/uploads/${taskID}.jpg --num_iter ${progress[taskID].max_epoch}`);
 	
 	console.log(taskID + " start!");
 	console.log(`content: ${relationfile[taskID].content}`);
 	console.log(`style: ${relationfile[taskID].style}`)
 	console.log(`output: ${taskID}.jpg`);
 	console.log(`num_iter = ${progress[taskID].max_epoch}`);

 	relationfile[taskID] = {content: req.files.content_image[0].filename, style: req.files.style_image[0].filename};

 	let child = exec(`python run_main.py --content ./public/uploads/${req.files.content_image[0].filename} --style ./public/uploads/${req.files.style_image[0].filename} --output ./public/uploads/${taskID}.jpg --num_iter ${max_epoch}`);
 	//console.log(`python run_main.py --content ./uploads/${req.files.content_image[0].filename} --style ./uploads/${req.files.style_image[0].filename} --output ./uploads/${taskID}.jpg --num_iter ${max_epoch}`);

 	progress[taskID] = {percentage: 0, max_epoch: parseInt(max_epoch), status: 0};
 	child.stdout.on("data", function (data) {
 		let args = data.split(' ');
 		let signal = args[0];
@ -69,8 +62,6 @@ server.post('/generate', upload.fields([{ name: 'content_image', maxCount: 1 },
 		progress[taskID].totalLoss = totalLoss;
 		progress[taskID].ContentLoss = ContentLoss;
 		progress[taskID].StyleLoss = StyleLoss;
 		
 		//console.log(taskID + ": " + args);
 	});

 	child.on("close", (code) => {
@ -80,11 +71,45 @@ server.post('/generate', upload.fields([{ name: 'content_image', maxCount: 1 },
 			progress[taskID].status = -1;
 		}
 		console.log(taskID + " done!");
 		totalTask += 1;

 		if (queue.length == 0) {
 			isIdle = true;
 		} else {
 			let nextTaskID = queue.shift();
 			run_child(nextTaskID);
 		}
 	});
 }

 server.post('/generate', upload.fields([{ name: 'content_image', maxCount: 1 }, { name: 'style_image', maxCount: 1 }]), function (req, res) {
 	let max_epoch = req.body.max_epoch;
 	let md5 = crypto.createHash('md5');
 	
 	console.log(req.files);
 	console.log("Epoch = " + max_epoch);

 	if (!req.files.content_image || !req.files.style_image) {
 		progress[taskID] = {percentage: 0, max_epoch: 0, status: -2};
 	}

 	let taskID = Date.now().toString(16) + md5.update(req.files.content_image[0].filename + req.files.style_image[0].filename).digest('hex');

 	relationfile[taskID] = {content: req.files.content_image[0].filename, style: req.files.style_image[0].filename};
 	progress[taskID] = {percentage: 0, max_epoch: parseInt(max_epoch), status: 0, wait: totalTask + queue.length + 1};

 	if (isIdle) {
 		isIdle = false;
 		progress[taskID].wait -= 1;
 		run_child(taskID);
 	} else {
 		queue.push(taskID);
 	}


 	let $ = cheerio.load(fs.readFileSync("./html/generate.html"));

 	$('script[name="go"]').html(`setInterval(function() {getProgress("${taskID}");}, 1000);`);
 	$('script[name="go"]').html(`getProgress("${taskID}"); setInterval(function() {getProgress("${taskID}");}, 1000);`);
 	
 	res.writeHead(200, { 'Content-type': 'text/html' });
 	res.end($.html());
@ -108,12 +133,17 @@ server.get('/success', function (req, res) {
 });

 server.get('/fail', function (req, res) {

 	res.writeHead(200, { 'Content-type': 'text/html' });
 	res.end(fs.readFileSync("./html/fail.html"));
 });

 server.get('/progress', function (req, res) {
 	if(req.query.taskID) {
 		res.json(progress[req.query.taskID]);
 	if(req.query.taskID && progress[req.query.taskID]) {
 		let result_obj = {};
 		result_obj.percentage = progress[req.query.taskID].percentage;
 		result_obj.wait = progress[req.query.taskID].wait - totalTask;
 		result_obj.status = progress[req.query.taskID].status;
 		res.json(result_obj);
 	}
 });

--- a/style-transform-master/style-transform-master/style-transform-master.njsproj
+++ b/style-transform-master/style-transform-master/style-transform-master.njsproj
@ -28,6 +28,9 @@
    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="html\fail.html">
      <SubType>Code</SubType>
    </Content>
    <Content Include="html\generate.html" />
    <Content Include="html\index.html" />
    <Content Include="html\success.html">