Merge remote-tracking branch 'upstream/smartsim-refactor' into file_ops

conftest.py

@@ -51,8 +51,8 @@
 from smartsim import Experiment
 from smartsim._core.config import CONFIG
 from smartsim._core.config.config import Config
-from smartsim._core.launcher.dragon.dragonConnector import DragonConnector
-from smartsim._core.launcher.dragon.dragonLauncher import DragonLauncher
+from smartsim._core.launcher.dragon.dragon_connector import DragonConnector
+from smartsim._core.launcher.dragon.dragon_launcher import DragonLauncher
 from smartsim._core.utils.telemetry.telemetry import JobEntity
 from smartsim.database import FeatureStore
 from smartsim.entity import Application

doc/tutorials/doc_examples/experiment_doc_examples/exp.py

@@ -1,5 +1,5 @@
 from smartsim import Experiment
-from smartsim._core.control.previewrenderer import Verbosity
+from smartsim._core.control.preview_renderer import Verbosity
 from smartsim.log import get_logger
 
 # Initialize an Experiment

pyproject.toml

@@ -147,24 +147,22 @@ module = [
   # FIXME: DO NOT MERGE THIS INTO DEVELOP BRANCH UNLESS THESE ARE PASSING OR
   #        REMOVED!!
   "smartsim._core._cli.*",
-  "smartsim._core.control.controller",
   "smartsim._core.control.manifest",
   "smartsim._core.entrypoints.dragon_client",
-  "smartsim._core.launcher.colocated",
   "smartsim._core.launcher.launcher",
   "smartsim._core.launcher.local.*",
   "smartsim._core.launcher.lsf.*",
   "smartsim._core.launcher.pbs.*",
   "smartsim._core.launcher.sge.*",
   "smartsim._core.launcher.slurm.*",
   "smartsim._core.launcher.step.*",
-  "smartsim._core.launcher.stepInfo",
-  "smartsim._core.launcher.stepMapping",
-  "smartsim._core.launcher.taskManager",
+  "smartsim._core.launcher.step_info",
+  "smartsim._core.launcher.step_mapping",
+  "smartsim._core.launcher.task_manager",
   "smartsim._core.utils.serialize",
   "smartsim._core.utils.telemetry.*",
   "smartsim.database.*",
-  "smartsim.settings.sgeSettings",
+  "smartsim.settings.sge_settings",
   "smartsim._core.control.controller_utils",
   "smartsim.entity.dbnode",
 ]

smartsim/_core/__init__.py

@@ -24,7 +24,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .control import Controller, Manifest, previewrenderer
+from .control import Manifest, preview_renderer
 from .generation import Generator
 
-__all__ = ["Controller", "Manifest", "Generator", "previewrenderer"]
+__all__ = ["Manifest", "Generator", "preview_renderer"]

smartsim/_core/arguments/shell.py

@@ -30,7 +30,7 @@
 from abc import abstractmethod
 
 from smartsim.log import get_logger
-from smartsim.settings.arguments.launchArguments import LaunchArguments
+from smartsim.settings.arguments.launch_arguments import LaunchArguments
 
 logger = get_logger(__name__)
 

smartsim/_core/commands/__init__.py

@@ -25,5 +25,5 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from .command import Command
-from .commandList import CommandList
-from .launchCommands import LaunchCommands
+from .command_list import CommandList
+from .launch_commands import LaunchCommands

smartsim/_core/commands/launchCommands.py → smartsim/_core/commands/launch_commands.py

@@ -1,4 +1,4 @@
-from .commandList import CommandList
+from .command_list import CommandList
 
 
 class LaunchCommands:

smartsim/_core/control/__init__.py

@@ -24,5 +24,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .controller import Controller
 from .manifest import Manifest