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