Skip to content

Commit 00634ce

Browse files
Merge pull request #171 from ncsa/feature/fix_Options
Feature/fix options
2 parents aba49df + a974126 commit 00634ce

35 files changed

Lines changed: 923 additions & 2019 deletions

.github/workflows/README

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/python-app.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
environment-name: test_neat
1818
cache-environment: true
1919

20-
- name: Run NEAT Simulations
20+
- name: Run unit tests (pytest)
2121
run: |
22-
for i in {1..11}; do
23-
micromamba run -n test_neat python -m neat --log-level DEBUG read-simulator -c data/test_configs/config_test$i.yml -o ../outputs/test${i}_read-simulator;
24-
done
22+
micromamba run -n test_neat pytest -q tests

config_template/template_neat_config.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -141,37 +141,26 @@ min_mutations: .
141141
overwrite_output: .
142142

143143
# How to split the input reference for parallelization
144-
# If parallel_mode = false, this option has no effect.
144+
# Note if threads == 1, this option has no effect.
145145
# type = string | required: no | default = contig | values: contig, size
146-
mode: .
146+
parallel_mode: .
147147

148-
# Target chunk size if by = size (overlap = read_len * 2).
148+
# Target block size if by = size (overlap = read_len * 2).
149149
# Default is 500000 when by = size. Not used for by = contig.
150150
# type = int | required: no | default = 500000 (when by=size)
151-
size: .
151+
parallel_block_size: .
152152

153153
# Maximum number of concurrent NEAT jobs (threads or hyperthreads) to run.
154-
# Note that assigning a value higher than your available number of threads
155-
# could result in performance issues in the computer running the job.
156-
# If parallel_mode = false, this option has no effect.
157154
# type = int | required: no | default = all available.
158155
threads: .
159156

160157
# Delete the 'splits' directory after stitching completes
161-
# Note if parallel_mode = false, this option has no effect.
162-
# type = bool | required: no | default = false
158+
# Note if threads == 1, this option has no effect.
159+
# type = bool | required: no | default = true
163160
cleanup_splits: .
164161

165-
# Reuse existing files in 'splits' and skip the split step. This
166-
# option should be a path to the directory containing the splits.
167-
# Note if parallel_mode = None, this option has no effect.
168-
# type = str | required: no | default = None
169-
reuse_splits: .
170-
171-
# For recombining bams, you will need to have samtools installed
172-
# if no installation path is specified here, Python will check
173-
# for an installation of samtools in PATH. If Python can't
174-
# find it, it will throw an error and exit.
175-
# Note if parallel_mode = None, or produce_bam = false, this option has no effect,
176-
# and will not be checked
177-
samtools: .
162+
# Reuse existing files in '<out_dir>/splits' and skip the split step.
163+
# The directory must contain neat-generated files and must be in the output dir within "splits"
164+
# Note if threads == 1, this option has no effect.
165+
# type = bool | required: no | default = False
166+
reuse_splits: .

data/test_configs/config_test1.yml

Lines changed: 0 additions & 137 deletions
This file was deleted.

data/test_configs/config_test10.yml

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)