remove SimSpecsV2 to not scare people

Libensemble · Sep 11, 2023 · 0d92b5c · 0d92b5c
1 parent 0ace7bd
commit 0d92b5c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/libensemble/ensemble.py b/libensemble/ensemble.py
@@ -1,7 +1,7 @@
 import importlib
 import json
 import logging
-from typing import Optional, Union
+from typing import Optional
 
 import numpy.typing as npt
 import tomli
@@ -10,7 +10,7 @@
 from libensemble import logger
 from libensemble.executors import Executor
 from libensemble.libE import libE
-from libensemble.specs import AllocSpecs, ExitCriteria, GenSpecs, LibeSpecs, SimSpecs, SimSpecsV2
+from libensemble.specs import AllocSpecs, ExitCriteria, GenSpecs, LibeSpecs, SimSpecs
 from libensemble.tools import add_unique_random_streams
 from libensemble.tools import parse_args as parse_args_f
 from libensemble.tools import save_libE_output
@@ -248,7 +248,7 @@ class Ensemble:
 
  def __init__(
  self,
- sim_specs: Optional[Union[SimSpecs, SimSpecsV2]] = SimSpecs(),
+ sim_specs: Optional[SimSpecs] = SimSpecs(),
  gen_specs: Optional[GenSpecs] = GenSpecs(),
  exit_criteria: Optional[ExitCriteria] = {},
  libE_specs: Optional[LibeSpecs] = None,

diff --git a/libensemble/libE.py b/libensemble/libE.py
@@ -116,7 +116,7 @@
 import sys
 import traceback
 from pathlib import Path
-from typing import Callable, Dict, Union
+from typing import Callable, Dict
 
 import numpy as np
 
@@ -129,7 +129,7 @@
 from libensemble.manager import LoggedException, WorkerException, manager_main, report_worker_exc
 from libensemble.resources.platforms import get_platform
 from libensemble.resources.resources import Resources
-from libensemble.specs import AllocSpecs, ExitCriteria, GenSpecs, LibeSpecs, SimSpecs, SimSpecsV2, _EnsembleSpecs
+from libensemble.specs import AllocSpecs, ExitCriteria, GenSpecs, LibeSpecs, SimSpecs, _EnsembleSpecs
 from libensemble.tools.alloc_support import AllocSupport
 from libensemble.tools.tools import _USER_SIM_ID_WARNING
 from libensemble.utils import launcher
@@ -143,7 +143,7 @@
 
 
 def libE(
- sim_specs: Union[SimSpecs, SimSpecsV2],
+ sim_specs: SimSpecs,
  gen_specs: GenSpecs,
  exit_criteria: ExitCriteria,
  persis_info: Dict = {},

diff --git a/libensemble/specs.py b/libensemble/specs.py
@@ -96,15 +96,6 @@ def check_valid_in(cls, v):
  return v
 
 
-class SimSpecsV2(BaseModel):
-
- fn: Callable
- args: list
- kwargs: Optional[dict]
- outputs: list = []
- globus_compute_endpoint: Optional[str] = ""
-
-
 class GenSpecs(BaseModel):
  """
  Specifications for configuring a Generator Function. Equivalent to
@@ -559,7 +550,7 @@ class _EnsembleSpecs(BaseModel):
  libE_specs: LibeSpecs
  """ Specifications and options for libEnsemble """
 
- sim_specs: Union[SimSpecs, SimSpecsV2]
+ sim_specs: SimSpecs
  """ Specifications for the simulation function """
 
  gen_specs: Optional[GenSpecs]