more merge cleanup

.github/workflows/build_docs.yml

@@ -32,8 +32,6 @@ on:
   push:
     branches:
       - develop
-    branches-ignore:
-      - smartsim-refactor
 
 jobs:
   build_docs:

.github/workflows/changelog.yml

@@ -30,8 +30,6 @@ name: enforce_changelog
 
 on:
   pull_request:
-    branches-ignore:
-      - smartsim-refactor
   push:
     branches:
       - develop

.github/workflows/run_tests.yml

@@ -172,7 +172,7 @@ jobs:
         run: |
           echo "SMARTSIM_LOG_LEVEL=debug" >> $GITHUB_ENV
           py.test -s --import-mode=importlib -o log_cli=true --cov=$(smart site) --cov-report=xml --cov-config=./tests/test_configs/cov/local_cov.cfg --ignore=tests/full_wlm/ -m ${{ matrix.subset }} ./tests
-    
+
       # Upload artifacts on failure, ignoring binary files
       - name: Upload Artifact
         if: failure()

doc/installation_instructions/basic.rst

@@ -45,14 +45,14 @@ ML Library Support
 ==================
 
 We currently support both Nvidia and AMD GPUs when using RedisAI for GPU inference. The support
-for these GPUs often depends on the version of the CUDA or ROCm stack that is availble on your
-machine. In _most_ cases, the versions backwards compatible. If you encounter problems, please
+for these GPUs often depends on the version of the CUDA or ROCm stack that is available on your
+machine. In _most_ cases, the versions are backwards compatible. If you encounter problems, please
 contact us and we can build the backend libraries for your desired version of CUDA and ROCm.
 
 CPU backends are provided for Apple (both Intel and Apple Silicon) and Linux (x86_64).
 
 Be sure to reference the table below to find which versions of the ML libraries are supported for
-your particular platform. Additional, see :ref:`installation notes <install-notes>` for helpful
+your particular platform. Additionally, see :ref:`installation notes <install-notes>` for helpful
 information regarding various system types before installation.
 
 Linux
@@ -175,7 +175,7 @@ MacOSX
 
 .. note::
 
-    Users have succesfully run SmartSim on Windows using Windows Subsystem for Linux
+    Users have successfully run SmartSim on Windows using Windows Subsystem for Linux
     with Nvidia support. Generally, users should follow the Linux instructions here,
     however we make no guarantee or offer of support.
 
@@ -387,7 +387,7 @@ source remains at the site of the clone instead of in site-packages.
   pip install -e ".[dev]"  # for zsh users
 
 Use the now installed ``smart`` cli to install the machine learning runtimes and
-dragon. Referring to "Step 2: Build SmartSim above".
+dragon. Referring to "Step 2: Build SmartSim" above.
 
 Build the SmartRedis library
 ============================

smartsim/_core/_cli/validate.py

@@ -70,7 +70,9 @@ def __exit__(
             self._finalizer.detach()  # type: ignore[attr-defined]
 
 
-def execute(args: argparse.Namespace, _unparsed_args: argparse.Namespace) -> int:
+def execute(
+    args: argparse.Namespace, _unparsed_args: t.Optional[t.List[str]] = None
+) -> int:
     """Validate the SmartSim installation works as expected given a
     simple experiment
     """

smartsim/_core/control/job.py

@@ -29,8 +29,6 @@
 import typing as t
 from dataclasses import dataclass
 
-from smartsim.entity._mock import Mock
-
 from ...entity import SmartSimEntity
 from ...status import JobStatus
 

smartsim/_core/control/manifest.py

@@ -29,8 +29,6 @@
 import typing as t
 from dataclasses import dataclass, field
 
-from smartsim.entity._mock import Mock
-
 from ...builders import Ensemble
 from ...database import FeatureStore
 from ...entity import Application, FSNode, SmartSimEntity

smartsim/_core/launcher/dragon/dragon_launcher.py

@@ -400,11 +400,6 @@ def _as_run_request_args_and_policy(
         DragonRunRequestView(
             exe=exe_,
             exe_args=args,
-            # FIXME: Currently this is hard coded because the schema requires
-            #        it, but in future, it is almost certainly necessary that
-            #        this will need to be injected by the user or by us to have
-            #        the command execute next to any generated files. A similar
-            #        problem exists for the other settings.
             path=path,
             env=env,
             # TODO: Not sure how this info is injected

smartsim/_core/launcher/step/alps_step.py

@@ -126,14 +126,14 @@ def _build_exe(self) -> t.List[str]:
             return self._make_mpmd()
 
         exe = self.entity.exe
-        args = self.entity.exe_args  # pylint: disable=protected-access
+        args = self.entity.exe_args
         return exe + args
 
     def _make_mpmd(self) -> t.List[str]:
         """Build Aprun (MPMD) executable"""
 
         exe = self.entity.exe
-        exe_args = self.entity._exe_args  # pylint: disable=protected-access
+        exe_args = self.entity.exe_args
         cmd = exe + exe_args
 
         for mpmd in self._get_mpmd():

smartsim/_core/launcher/step/lsf_step.py

@@ -217,7 +217,7 @@ def _build_exe(self) -> t.List[str]:
         :return: executable list
         """
         exe = self.entity.exe
-        args = self.entity.exe_args  # pylint: disable=protected-access
+        args = self.entity.exe_args
 
         if self._get_mpmd():
             erf_file = self.get_step_file(ending=".mpmd")

smartsim/_core/launcher/step/mpi_step.py

@@ -136,21 +136,21 @@ def _build_exe(self) -> t.List[str]:
             return self._make_mpmd()
 
         exe = self.entity.exe
-        args = self.entity.exe_args  # pylint: disable=protected-access
+        args = self.entity.exe_args
         return exe + args
 
     def _make_mpmd(self) -> t.List[str]:
         """Build mpiexec (MPMD) executable"""
         exe = self.entity.exe
-        args = self.entity.exe_args  # pylint: disable=protected-access
+        args = self.entity.exe_args
         cmd = exe + args
 
         for mpmd in self._get_mpmd():
             cmd += [" : "]
             cmd += mpmd.format_run_args()
             cmd += mpmd.format_env_vars()
             cmd += mpmd.exe
-            cmd += mpmd.exe_args  # pylint: disable=protected-access
+            cmd += mpmd.exe_args
 
         cmd = sh_split(" ".join(cmd))
         return cmd

smartsim/settings/common.py

@@ -44,6 +44,6 @@ def set_check_input(key: str, value: t.Optional[str]) -> None:
     if key.startswith("-"):
         key = key.lstrip("-")
         logger.warning(
-            "One or more leading `-` characters were provided to the run argument. \
-            Leading dashes were stripped and the arguments were passed to the run_command."
+            "One or more leading `-` characters were provided to the run argument.\n"
+            "Leading dashes were stripped and the arguments were passed to the run_command."
         )