mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nlp.git
				synced 2025-10-31 12:52:47 +00:00 
			
		
		
		
	Fix zip switch integration
This commit is contained in:
		
							
								
								
									
										37
									
								
								nlp
									
									
									
									
									
								
							
							
						
						
									
										37
									
								
								nlp
									
									
									
									
									
								
							| @@ -35,14 +35,12 @@ def parse_arguments(): | ||||
|                         help='total number of cores available', | ||||
|                         required=False, | ||||
|                         type=int) | ||||
|     parser.add_argument( | ||||
|         '--zip', | ||||
|         action='store_true', | ||||
|         default=False, | ||||
|         dest='zip', | ||||
|         help='package result files in zip bundles', | ||||
|         required=False | ||||
|     ) | ||||
|     parser.add_argument('--zip', | ||||
|                         action='store_true', | ||||
|                         default=False, | ||||
|                         dest='zip', | ||||
|                         help='package result files in zip bundles', | ||||
|                         required=False) | ||||
|     return parser.parse_args() | ||||
|  | ||||
|  | ||||
| @@ -100,18 +98,19 @@ class NLPWorkflow(WorkflowRunner): | ||||
|                 ) | ||||
|             ) | ||||
|  | ||||
|         vrt_zip_jobs = [] | ||||
|         vrt_zip_job_dependencies = nlp_jobs | ||||
|         cmd = 'cd "%s" && zip -m vrt.zip */*.vrt -x "pyflow.data*" && cd -' % ( | ||||
|             self.output_dir | ||||
|         ) | ||||
|         vrt_zip_jobs.append( | ||||
|             self.addTask( | ||||
|                 command=cmd, | ||||
|                 dependencies=vrt_zip_job_dependencies, | ||||
|                 label='vrt_zip_job' | ||||
|         if zip: | ||||
|             vrt_zip_jobs = [] | ||||
|             vrt_zip_job_dependencies = nlp_jobs | ||||
|             cmd = 'cd "%s" && zip -m vrt.zip */*.vrt -x "pyflow.data*" && cd -' % ( | ||||
|                 self.output_dir | ||||
|             ) | ||||
|             vrt_zip_jobs.append( | ||||
|                 self.addTask( | ||||
|                     command=cmd, | ||||
|                     dependencies=vrt_zip_job_dependencies, | ||||
|                     label='vrt_zip_job' | ||||
|                 ) | ||||
|             ) | ||||
|         ) | ||||
|  | ||||
|  | ||||
| def analyze_jobs(input_dir, output_dir): | ||||
|   | ||||
| @@ -5,7 +5,7 @@ import argparse | ||||
| import os | ||||
| import subprocess | ||||
|  | ||||
| container_image = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/nlp:2.1.0' | ||||
| container_image = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/nlp:latest' | ||||
| container_input_dir = '/input' | ||||
| container_output_dir = '/output' | ||||
| uid = str(os.getuid()) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user