diff --git a/hpobench/container/recipes/ml/Singularity.ml_mmfb b/hpobench/container/recipes/ml/Singularity.ml_mmfb index cd8b3e6e..edba805c 100644 --- a/hpobench/container/recipes/ml/Singularity.ml_mmfb +++ b/hpobench/container/recipes/ml/Singularity.ml_mmfb @@ -12,10 +12,13 @@ VERSION v0.0.1 cd /home \ && git clone https://github.com/automl/HPOBench.git \ && cd HPOBench \ - && git checkout development \ + && git checkout master \ && pip install ".[ml_mfbb]" \ && cd / \ && mkdir /var/lib/hpobench/ \ + && mkdir /var/lib/hpobench/cache \ + && mkdir /var/lib/hpobench/data \ + && mkdir /var/lib/hpobench/socket \ && chmod -R 777 /var/lib/hpobench/ \ && pip cache purge \ && rm -rf /var/lib/apt/lists/* diff --git a/hpobench/container/recipes/nas/Singularity.nasbench_201 b/hpobench/container/recipes/nas/Singularity.nasbench_201 index 4f4cdcf2..8b7ebe50 100644 --- a/hpobench/container/recipes/nas/Singularity.nasbench_201 +++ b/hpobench/container/recipes/nas/Singularity.nasbench_201 @@ -16,6 +16,9 @@ VERSION v0.0.1 && pip install . \ && cd / \ && mkdir /var/lib/hpobench/ \ + && mkdir /var/lib/hpobench/cache \ + && mkdir /var/lib/hpobench/data \ + && mkdir /var/lib/hpobench/socket \ && chmod -R 777 /var/lib/hpobench/ \ && rm -rf /var/lib/apt/lists/* \ && pip cache purge diff --git a/hpobench/container/server_abstract_benchmark.py b/hpobench/container/server_abstract_benchmark.py index 85c6faa1..a7002f50 100644 --- a/hpobench/container/server_abstract_benchmark.py +++ b/hpobench/container/server_abstract_benchmark.py @@ -52,6 +52,10 @@ def __init__(self, socket_id): # start the event loop of the server to wait for calls self.daemon.requestLoop(loopCondition=lambda: self.pyro_running) + def print_hello_world(self): + logger.debug('Server: Hello World!') + return 'Hello World!' + def init_benchmark(self, kwargs_str): try: kwargs = json.loads(kwargs_str, cls=BenchmarkDecoder) @@ -128,5 +132,12 @@ def shutdown(self): args = parser.parse_args() # pylint: disable=logging-fstring-interpolation + logger.debug(f'args: {args}') + logger.debug(f'args.importBase: {args.importBase}') + logger.debug(f'args.benchmark: {args.benchmark}') + logger.debug(f'args.socket_id: {args.socket_id}') exec(f"from hpobench.benchmarks.{args.importBase} import {args.benchmark} as Benchmark") + logger.debug(f'import worked') bp = BenchmarkServer(args.socket_id) + logger.debug(f'BenchmarkServer started') + logger.debug(f'BenchmarkServer: {bp}') diff --git a/hpobench/util/container_utils.py b/hpobench/util/container_utils.py index 7fee19e9..22323f09 100644 --- a/hpobench/util/container_utils.py +++ b/hpobench/util/container_utils.py @@ -56,9 +56,9 @@ def object_hook(self, obj: Any) -> Union[Union[tuple, np.ndarray, float, float, if __type == 'np.ndarray': return np.array(obj['__items__']) if __type == 'np.float': - return np.float(obj['__items__']) + return float(obj['__items__']) if __type == 'np.int': - return np.int(obj['__items__']) + return int(obj['__items__']) if __type == 'random_state': return deserialize_random_state(obj['__items__']) return obj diff --git a/setup.py b/setup.py index 4c53ecb0..023779c3 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def read_file(file_name): version=read_file('hpobench/__version__.py').split()[-1].strip('\''), packages=setuptools.find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests'],), - python_requires='>=3.6, <=3.10', + python_requires='>=3.6', install_requires=read_file('./requirements.txt').split('\n'), extras_require=get_extra_requirements(), test_suite='pytest', @@ -48,6 +48,7 @@ def read_file(file_name): 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Development Status :: 3 - Alpha', 'Natural Language :: English', 'Environment :: Console',