diff --git a/Makefile b/Makefile index 3a4fc36..b64ffff 100644 --- a/Makefile +++ b/Makefile @@ -12,4 +12,13 @@ clean: .PHONY: pyenv pyenv: clean @python -m venv $(VENV_DIR) - @. ./$(VENV_DIR)/bin/activate && pip install . \ No newline at end of file + @. ./$(VENV_DIR)/bin/activate && pip install wheel && pip install . + +.PHONY: test_make_wheel +test_make_wheel: pyenv + @pip install wheel + @python setup.py bdist_wheel + +# .PHONY: test_mmux_utils_install +# test_mmux_utils_install: pyenv +# @python -m pip show mmux_utils \ No newline at end of file diff --git a/setup.py b/setup.py index 3dce034..dc0cd0f 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,8 @@ long_description=long_description, author="Javier Garcia Ordonez", author_email="ordonez@itis.swiss", - packages=find_packages(), + packages=find_packages(where="src"), + package_dir={"": "src"}, python_requires="==3.10.12", install_requires=[ "numpy", diff --git a/src/mmux-utils/__init__.py b/src/mmux_utils/__init__.py similarity index 100% rename from src/mmux-utils/__init__.py rename to src/mmux_utils/__init__.py diff --git a/src/mmux-utils/funs_create_dakota_conf.py b/src/mmux_utils/funs_create_dakota_conf.py similarity index 100% rename from src/mmux-utils/funs_create_dakota_conf.py rename to src/mmux_utils/funs_create_dakota_conf.py diff --git a/src/mmux-utils/funs_data_processing.py b/src/mmux_utils/funs_data_processing.py similarity index 100% rename from src/mmux-utils/funs_data_processing.py rename to src/mmux_utils/funs_data_processing.py diff --git a/src/mmux-utils/funs_evaluate.py b/src/mmux_utils/funs_evaluate.py similarity index 57% rename from src/mmux-utils/funs_evaluate.py rename to src/mmux_utils/funs_evaluate.py index 985a97c..1e46be5 100644 --- a/src/mmux-utils/funs_evaluate.py +++ b/src/mmux_utils/funs_evaluate.py @@ -48,6 +48,41 @@ def run_dakota(dakota_conf_path: Path, batch_mode: bool = True): study.execute() ## TODO access documentation of dakenv.study -- cannot, also cannot find in https://github.com/snl-dakota/dakota/tree/devel/packages # would need to ask Werner + """ + Help on class study in module dakota.environment.environment: + +class study(pybind11_builtins.pybind11_object) + | Method resolution order: + | study + | pybind11_builtins.pybind11_object + | builtins.object + | + | Methods defined here: + | + | __init__(...) + | __init__(*args, **kwargs) + | Overloaded function. + | + | 1. __init__(self: dakota.environment.environment.study, callback: object, input_string: str, read_restart: str = '') -> None + | + | 2. __init__(self: dakota.environment.environment.study, callbacks: dict, input_string: str, read_restart: str = '') -> None + | + | execute(...) + | execute(self: dakota.environment.environment.study) -> None + | + | response_results(...) + | response_results(self: dakota.environment.environment.study) -> dakota.environment.environment.Response + | + | variables_results(...) + | variables_results(self: dakota.environment.environment.study) -> dakota.environment.environment.Variables + | + | ---------------------------------------------------------------------- + | Static methods inherited from pybind11_builtins.pybind11_object: + | + | __new__(*args, **kwargs) from pybind11_builtins.pybind11_type + | Create and return a new object. See help(type) for accurate signature. + + """ if __name__ == "__main__": diff --git a/src/mmux-utils/funs_gp_evaluation.py b/src/mmux_utils/funs_gp_evaluation.py similarity index 100% rename from src/mmux-utils/funs_gp_evaluation.py rename to src/mmux_utils/funs_gp_evaluation.py diff --git a/src/mmux-utils/plot_pareto_front.py b/src/mmux_utils/plot_pareto_front.py similarity index 100% rename from src/mmux-utils/plot_pareto_front.py rename to src/mmux_utils/plot_pareto_front.py diff --git a/src/mmux-utils/plot_surr.py b/src/mmux_utils/plot_surr.py similarity index 100% rename from src/mmux-utils/plot_surr.py rename to src/mmux_utils/plot_surr.py