Merge pull request #1262 from pyiron/serial

Purge SerialMaster
pyiron · Feb 19, 2024 · ab51d75 · ab51d75
2 parents 14f40e7 + 8ceef9d
commit ab51d75
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 492 deletions.
diff --git a/pyiron_base/__init__.py b/pyiron_base/__init__.py
@@ -35,7 +35,6 @@
 from pyiron_base.jobs.master.interactivewrapper import InteractiveWrapper
 from pyiron_base.jobs.master.list import ListMaster
 from pyiron_base.jobs.master.parallel import ParallelMaster, JobGenerator
-from pyiron_base.jobs.master.serial import SerialMasterBase
 from pyiron_base.project.generic import Project, Creator
 from pyiron_base.utils.parser import Logstatus, extract_data_from_file
 from pyiron_base.state.settings import Settings

diff --git a/pyiron_base/jobs/job/factory.py b/pyiron_base/jobs/job/factory.py
@@ -14,7 +14,6 @@
 
 from pyiron_base.jobs.master.flexible import FlexibleMaster
 from pyiron_base.jobs.script import ScriptJob
-from pyiron_base.jobs.master.serial import SerialMasterBase
 from pyiron_base.jobs.datamining import TableJob
 from pyiron_base.storage.hdfio import ProjectHDFio
 from pyiron_base.state import state
@@ -119,6 +118,5 @@ def _job_class_dict(self) -> Dict:
         return {
             "FlexibleMaster": FlexibleMaster,
             "ScriptJob": ScriptJob,
-            "SerialMasterBase": SerialMasterBase,
             "TableJob": TableJob,
         }
diff --git a/pyiron_base/jobs/job/generic.py b/pyiron_base/jobs/job/generic.py
@@ -105,7 +105,7 @@
 
         .. attribute:: job_type
 
-            Job type object with all the available job types: ['ExampleJob', 'SerialMaster', 'ParallelMaster',
+            Job type object with all the available job types: ['ExampleJob', 'ParallelMaster',
                                                                'ScriptJob', 'ListMaster']
 """
 )
@@ -345,7 +345,7 @@ def exclude_groups_hdf(self, val):
     @property
     def job_type(self):
         """
-        Job type object with all the available job types: ['ExampleJob', 'SerialMaster', 'ParallelMaster', 'ScriptJob',
+        Job type object with all the available job types: ['ExampleJob', 'ParallelMaster', 'ScriptJob',
                                                            'ListMaster']
         Returns:
             JobTypeChoice: Job type object
@@ -942,8 +942,6 @@ def create_job(self, job_type, job_name, delete_existing_job=False):
         - ‘Sphinx’:
         - ‘Vasp’:
         - ‘GenericMaster’:
-        - ‘SerialMaster’: series of jobs run in serial
-        - ‘AtomisticSerialMaster’:
         - ‘ParallelMaster’: series of jobs run in parallel
         - ‘KmcMaster’:
         - ‘ThermoLambdaMaster’:
@@ -952,7 +950,6 @@ def create_job(self, job_type, job_name, delete_existing_job=False):
         - ‘Murnaghan’:
         - ‘MinimizeMurnaghan’:
         - ‘ElasticMatrix’:
-        - ‘ConvergenceVolume’:
         - ‘ConvergenceEncutParallel’:
         - ‘ConvergenceKpointParallel’:
         - ’PhonopyMaster’:
@@ -968,9 +965,9 @@ def create_job(self, job_type, job_name, delete_existing_job=False):
         Args:
             job_type (str): job type can be ['StructureContainer’, ‘StructurePipeline’, ‘AtomisticExampleJob’,
                                              ‘ExampleJob’, ‘Lammps’, ‘KMC’, ‘Sphinx’, ‘Vasp’, ‘GenericMaster’,
-                                             ‘SerialMaster’, ‘AtomisticSerialMaster’, ‘ParallelMaster’, ‘KmcMaster’,
+                                             ‘ParallelMaster’, ‘KmcMaster’,
                                              ‘ThermoLambdaMaster’, ‘RandomSeedMaster’, ‘MeamFit’, ‘Murnaghan’,
-                                             ‘MinimizeMurnaghan’, ‘ElasticMatrix’, ‘ConvergenceVolume’,
+                                             ‘MinimizeMurnaghan’, ‘ElasticMatrix’,
                                              ‘ConvergenceEncutParallel’, ‘ConvergenceKpointParallel’, ’PhonopyMaster’,
                                              ‘DefectFormationEnergy’, ‘LammpsASE’, ‘PipelineMaster’,
                                              ’TransformationPath’, ‘ThermoIntEamQh’, ‘ThermoIntDftEam’, ‘ScriptJob’,

diff --git a/pyiron_base/jobs/job/interactive.py b/pyiron_base/jobs/job/interactive.py
@@ -109,7 +109,7 @@ class InteractiveBase(GenericJob):
 
         .. attribute:: job_type
 
-            Job type object with all the available job types: ['ExampleJob', 'SerialMaster', 'ParallelMaster', 'ScriptJob',
+            Job type object with all the available job types: ['ExampleJob', 'ParallelMaster', 'ScriptJob',
                                                                'ListMaster']
 
     Examples:

diff --git a/pyiron_base/jobs/job/jobtype.py b/pyiron_base/jobs/job/jobtype.py
@@ -30,7 +30,6 @@
 JOB_CLASS_DICT = {
     "FlexibleMaster": "pyiron_base.jobs.master.flexible",
     "ScriptJob": "pyiron_base.jobs.script",
-    "SerialMasterBase": "pyiron_base.jobs.master.serial",
     "TableJob": "pyiron_base.jobs.datamining",
     "WorkerJob": "pyiron_base.jobs.worker",
     "ExecutableContainerJob": "pyiron_base.jobs.flex.executablecontainer",
@@ -244,7 +243,6 @@ def wrapper(job_name, delete_existing_job=False, delete_aborted_job=False):
                 """
                 Create one of the following jobs:
                 - 'ExampleJob': example job just generating random number
-                - 'SerialMaster': series of jobs run in serial
                 - 'ParallelMaster': series of jobs run in parallel
                 - 'ScriptJob': Python script or jupyter notebook job container
                 - 'ListMaster': list of jobs