From 97ca5682feca1c0dea289c73ca7469e911a7c48e Mon Sep 17 00:00:00 2001 From: guanjihuan Date: Fri, 7 Mar 2025 04:09:04 +0800 Subject: [PATCH] 0.1.163 --- PyPI/setup.cfg | 2 +- PyPI/src/guan.egg-info/PKG-INFO | 2 +- PyPI/src/guan/data_processing.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PyPI/setup.cfg b/PyPI/setup.cfg index e1e352a..f3adca3 100644 --- a/PyPI/setup.cfg +++ b/PyPI/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = guan -version = 0.1.162 +version = 0.1.163 author = guanjihuan author_email = guanjihuan@163.com description = An open source python package diff --git a/PyPI/src/guan.egg-info/PKG-INFO b/PyPI/src/guan.egg-info/PKG-INFO index c2b0d47..2a55243 100644 --- a/PyPI/src/guan.egg-info/PKG-INFO +++ b/PyPI/src/guan.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.2 Name: guan -Version: 0.1.162 +Version: 0.1.163 Summary: An open source python package Home-page: https://py.guanjihuan.com Author: guanjihuan diff --git a/PyPI/src/guan/data_processing.py b/PyPI/src/guan/data_processing.py index 32c8b9a..8f5d4f9 100644 --- a/PyPI/src/guan/data_processing.py +++ b/PyPI/src/guan/data_processing.py @@ -123,7 +123,7 @@ def make_sh_file_for_bsub(sh_filename='a', command_line='python a.py', cpu_num=1 f.write(sh_content) # 复制.py和.sh文件,然后提交任务,实现半手动并行(PBS) -def copy_py_sh_file_and_qsub_task(parameter_array, py_filename='a', old_str_in_py='parameter = 0', new_str_in_py='parameter = ', sh_filename='a', qsub_task_name='task'): +def copy_py_sh_file_and_qsub_task(parameter_array, py_filename='a', old_str_in_py='parameter = 0', new_str_in_py='parameter = ', sh_filename='a', task_name='task'): import os parameter_str_array = [] for i0 in parameter_array: @@ -151,8 +151,8 @@ def copy_py_sh_file_and_qsub_task(parameter_array, py_filename='a', old_str_in_p old_str = 'python '+py_filename+'.py' new_str = 'python '+py_filename+'_'+str(index)+'.py' content = content.replace(old_str, new_str) - old_str = '#PBS -N '+qsub_task_name - new_str = '#PBS -N '+qsub_task_name+'_'+str(index) + old_str = '#PBS -N '+task_name + new_str = '#PBS -N '+task_name+'_'+str(index) content = content.replace(old_str, new_str) with open(sh_filename+'_'+str(index)+'.sh', 'w') as f: f.write(content) @@ -160,7 +160,7 @@ def copy_py_sh_file_and_qsub_task(parameter_array, py_filename='a', old_str_in_p os.system('qsub '+new_file) # 复制.py和.sh文件,然后提交任务,实现半手动并行(LSF) -def copy_py_sh_file_and_bsub_task(parameter_array, py_filename='a', old_str_in_py='parameter = 0', new_str_in_py='parameter = ', sh_filename='a', bsub_task_name='task'): +def copy_py_sh_file_and_bsub_task(parameter_array, py_filename='a', old_str_in_py='parameter = 0', new_str_in_py='parameter = ', sh_filename='a', task_name='task'): import os parameter_str_array = [] for i0 in parameter_array: @@ -188,8 +188,8 @@ def copy_py_sh_file_and_bsub_task(parameter_array, py_filename='a', old_str_in_p old_str = 'python '+py_filename+'.py' new_str = 'python '+py_filename+'_'+str(index)+'.py' content = content.replace(old_str, new_str) - old_str = '#BSUB -J '+bsub_task_name - new_str = '#BSUB -J '+bsub_task_name+'_'+str(index) + old_str = '#BSUB -J '+task_name + new_str = '#BSUB -J '+task_name+'_'+str(index) content = content.replace(old_str, new_str) with open(sh_filename+'_'+str(index)+'.sh', 'w') as f: f.write(content)