diff --git a/PyPI/setup.cfg b/PyPI/setup.cfg index 0b2aa44..7e49119 100644 --- a/PyPI/setup.cfg +++ b/PyPI/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = guan -version = 0.1.93 +version = 0.1.94 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 d0f8b8b..9fdb9bd 100644 --- a/PyPI/src/guan.egg-info/PKG-INFO +++ b/PyPI/src/guan.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: guan -Version: 0.1.93 +Version: 0.1.94 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 e7e4857..f6b00ed 100644 --- a/PyPI/src/guan/data_processing.py +++ b/PyPI/src/guan/data_processing.py @@ -1,15 +1,15 @@ # Module: data_processing # 并行计算前的预处理,把参数分成多份 -def preprocess_for_parallel_calculations(parameter_array_all, cpus=1, task_index=0): +def preprocess_for_parallel_calculations(parameter_array_all, task_num=1, task_index=0): import numpy as np num_all = np.array(parameter_array_all).shape[0] - if num_all%cpus == 0: - num_parameter = int(num_all/cpus) + if num_all%task_num == 0: + num_parameter = int(num_all/task_num) parameter_array = parameter_array_all[task_index*num_parameter:(task_index+1)*num_parameter] else: - num_parameter = int(num_all/(cpus-1)) - if task_index != cpus-1: + num_parameter = int(num_all/(task_num-1)) + if task_index != task_num-1: parameter_array = parameter_array_all[task_index*num_parameter:(task_index+1)*num_parameter] else: parameter_array = parameter_array_all[task_index*num_parameter:num_all]