diff --git a/psbench/benchmarks/funcx_tasks/main.py b/psbench/benchmarks/funcx_tasks/main.py index 92a5a25..51a1b2a 100644 --- a/psbench/benchmarks/funcx_tasks/main.py +++ b/psbench/benchmarks/funcx_tasks/main.py @@ -26,21 +26,11 @@ from psbench.logging import TESTING_LOG_LEVEL from psbench.proxystore import init_store_from_args from psbench.tasks.pong import pong +from psbench.tasks.pong import pong_proxy from psbench.utils import randbytes -logger = logging.getLogger('funcx-test') - - -def pong_proxy(*args, **kwargs): # type: ignore - """Trampoline function for psbench.tasks.pong.pong_proxy. - The trampoline is needed to remove type annotations since there is an - issue in FuncX with serializing functions with type annotations. - (See FuncX #901) - """ - from psbench.tasks.pong import pong_proxy as _pong_proxy - - return _pong_proxy(*args, **kwargs) +logger = logging.getLogger('funcx-test') @dataclasses.dataclass diff --git a/psbench/tasks/pong.py b/psbench/tasks/pong.py index ecce21d..0c93e8e 100644 --- a/psbench/tasks/pong.py +++ b/psbench/tasks/pong.py @@ -66,6 +66,7 @@ def pong_proxy( from proxystore.store import get_store from proxystore.store import UnknownStoreError + from psbench.tasks.pong import ProxyStats from psbench.utils import randbytes assert isinstance(data, Proxy) diff --git a/setup.cfg b/setup.cfg index b9ecbe0..4d73c86 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,8 +18,8 @@ classifiers = [options] packages = find: install_requires = - funcx==1.0.* - funcx-endpoint==1.0.* + funcx>=1.0.3 + funcx-endpoint>=1.0.3 proxystore[endpoints]==0.4.0a2 requests python_requires = >=3.7