From f128a085df3b199b7350b00079f12c047c5ef74a Mon Sep 17 00:00:00 2001 From: Riley Hales PhD <39097632+rileyhales@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:29:22 -0600 Subject: [PATCH 1/3] use preonly petsc solvers --- RAPIDpy/rapid.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/RAPIDpy/rapid.py b/RAPIDpy/rapid.py index c9ef379..f0f0495 100644 --- a/RAPIDpy/rapid.py +++ b/RAPIDpy/rapid.py @@ -774,18 +774,16 @@ def rapid_cleanup(*args): log("Running RAPID ...", "INFO") if os.name == "nt": - local_rapid_executable_location = \ - self._get_cygwin_path(local_rapid_executable_location) + local_rapid_executable_location = self._get_cygwin_path(local_rapid_executable_location) # htcondor will not allow mpiexec for single processor jobs # this was added for that purpose - run_rapid_command = [local_rapid_executable_location, - "-ksp_type", self._ksp_type] + run_rapid_command = [local_rapid_executable_location, "-ksp_type", 'preonly'] - if self._num_processors > 1: - run_rapid_command = [self._mpiexec_command, - "-n", str(self._num_processors)] \ - + run_rapid_command + # if self._num_processors > 1: + # run_rapid_command = [self._mpiexec_command, + # "-n", str(self._num_processors)] \ + # + run_rapid_command process = Popen(run_rapid_command, stdout=PIPE, stderr=PIPE, shell=False) From 332a5eb25fc764dc6a56c2eea219267c632e04e2 Mon Sep 17 00:00:00 2001 From: Riley Hales PhD <39097632+rileyhales@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:30:04 -0600 Subject: [PATCH 2/3] increment version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index efaa2f3..2bde08c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='RAPIDpy', - version='2.7.0', + version='2.8.0', description='Python interface for RAPID (rapid-hub.org)', long_description='RAPIDpy is a python interface for RAPID that assists ' 'to prepare inputs, runs the RAPID program, and provides ' From f8b83f61b1815565b4c1aef6e2bb7cf1e233db85 Mon Sep 17 00:00:00 2001 From: Riley Hales PhD <39097632+rileyhales@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:30:28 -0600 Subject: [PATCH 3/3] drop python 2 classifiers --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 2bde08c..efa1603 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,6 @@ 'Intended Audience :: Science/Research', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6',