diff --git a/.gitignore b/.gitignore index 9e5ed2f..1692240 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Byte-compiled / optimized / DLL files __pycache__/ -*.py[cod] +*.py[codE] *$py.class # C extensions diff --git a/conda-build/meta.yaml b/conda-build/meta.yaml index 9644be2..7ba6af6 100644 --- a/conda-build/meta.yaml +++ b/conda-build/meta.yaml @@ -1,6 +1,6 @@ package: name: ot2rec - version: 0.2.4 + version: 0.2.5 source: path: .. diff --git a/construct.yaml b/construct.yaml index f06799c..bdd780b 100644 --- a/construct.yaml +++ b/construct.yaml @@ -1,10 +1,10 @@ name: Ot2Rec -version: 0.2.4 +version: 0.2.5 company: Rosalind Franklin Institute channels: - https://conda.anaconda.org/conda-forge - file:///usr/share/miniconda3/conda-bld/ specs: - python 3.9.* - - Ot2Rec 0.2.4 + - Ot2Rec 0.2.5 - conda diff --git a/setup.py b/setup.py index 18eb0d4..ac747db 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( - version='0.2.4', + version='0.2.5', name='Ot2Rec', description='Ot2Rec', url='https://github.com/rosalindfranklininstitute/Ot2Rec', diff --git a/src/Ot2Rec/magicgui.py b/src/Ot2Rec/magicgui.py index ef46bee..d1620a8 100644 --- a/src/Ot2Rec/magicgui.py +++ b/src/Ot2Rec/magicgui.py @@ -83,7 +83,6 @@ def get_args_new_proj( output_folder={"label": "MC2 output folder"}, file_prefix={"label": "File prefix (if different from project name)"}, exec_path={"label": "Path to MC2 executable"}, - no_gpu={"label": "CPU only?"}, jobs_per_gpu={"label": "Jobs per GPU", "min": 1}, gpu_mem_usage={"label": "GPU memory usage (if applicable)", @@ -113,7 +112,6 @@ def get_args_mc2( output_folder=Path(Path.cwd() / "motioncor"), file_prefix="", exec_path=Path("/opt/lmod/modules/motioncor2/1.4.0/MotionCor2_1.4.0/MotionCor2_1.4.0_Cuda110"), - no_gpu=False, jobs_per_gpu=2, gpu_mem_usage=1.0, use_gain=False,