diff --git a/Benchmark/Benchmark.py b/Benchmark/Benchmark.py index 92b72fd..e376238 100644 --- a/Benchmark/Benchmark.py +++ b/Benchmark/Benchmark.py @@ -93,7 +93,9 @@ def bwa_mem(input_json): total_input_size = data_input_size + input_sizes.get('bwa_index') output_bam_size = data_input_size * 1.5 intermediate_index_size = input_sizes.get('bwa_index') * 2 - total_intermediate_size = intermediate_index_size + output_bam_size + copied_input_size = data_input_size * 5 # copied and unzipped + total_intermediate_size \ + = intermediate_index_size + output_bam_size + copied_input_size total_output_size = output_bam_size additional_size_in_gb = 4.5 diff --git a/README.md b/README.md index ada78db..2f4f526 100644 --- a/README.md +++ b/README.md @@ -33,14 +33,14 @@ B.benchmark(app_name, input_json) * bwa-mem ```python app_name = 'bwa-mem' -input_json = {'input_size_in_bytes': {'fastq1':93520, - 'fastq2':97604, - 'bwa_index':3364568}, +input_json = {'input_size_in_bytes': {'fastq1':93520000, + 'fastq2':97604000, + 'bwa_index':3364568000}, 'parameters': {'nThreads': 4}} B.benchmark(app_name, input_json) ``` ``` -{'recommended_instance_type': 'c4.8xlarge', 'EBS_optimized': True, 'cost_in_usd': 1.591, 'EBS_optimization_surcharge': 0.0, 'mem_in_gb': 60.0, 'cpu': 36} +{'aws': {'cost_in_usd': 0.188, 'EBS_optimization_surcharge': None, 'EBS_optimized': False, 'cpu': 4, 'mem_in_gb': 16.0, 'recommended_instance_type': 't2.xlarge'}, 'total_mem_in_MB': 12834.808349609375, 'total_size_in_GB': 15.502477258443832, 'min_CPU': 4} ``` To use Benchmark in from other places, install it as below. diff --git a/cwl_awsem/bwa-mem.cwl b/cwl_awsem/bwa-mem.cwl index 9dab614..d72e684 100644 --- a/cwl_awsem/bwa-mem.cwl +++ b/cwl_awsem/bwa-mem.cwl @@ -1,7 +1,7 @@ { "hints": [ { - "dockerPull": "duplexa/4dn-hic:v36", + "dockerPull": "duplexa/4dn-hic:v39", "class": "DockerRequirement" } ], @@ -44,7 +44,7 @@ ], "id": "#nThreads", "inputBinding": { - "position": 5, + "position": 6, "separate": true }, "default": 4 @@ -56,10 +56,22 @@ ], "id": "#prefix", "inputBinding": { - "position": 4, + "position": 5, "separate": true }, "default": "out" + }, + { + "type": [ + "null", + "string" + ], + "id": "#outdir", + "inputBinding": { + "position": 4, + "separate": true + }, + "default": "." } ], "outputs": [