diff --git a/CHANGELOG.md b/CHANGELOG.md index d6f679c4..4032b27f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # Changelog All notable changes to this project will be documented in this file. +### [1.5.1] + +#### Fixed + +- Fix hydra plugin not working properly. + ### [1.5.0] #### Changed diff --git a/poetry.lock b/poetry.lock index 02a78dbd..c7633bc6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2134,6 +2134,22 @@ files = [ hydra-core = ">=1.1.0.dev7" optuna = ">=2.10.0,<3.0.0" +[[package]] +name = "hydra-plugins" +version = "1.0.0" +description = "Hydra plugin allowing the discovery of external configurations" +optional = false +python-versions = ">=3.9,<3.11" +files = [] +develop = false + +[package.dependencies] +poetry = "1.7.1" + +[package.source] +type = "directory" +url = "quadra_hydra_plugin" + [[package]] name = "identify" version = "2.5.33" @@ -4061,9 +4077,9 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.21.0", markers = "python_version == \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\""}, + {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\" and python_version < \"3.10\" or python_version > \"3.9\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_system != \"Darwin\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\""}, {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\""}, - {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\" and python_version < \"3.10\" or python_version > \"3.9\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_system != \"Darwin\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, ] [[package]] @@ -4085,9 +4101,9 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.21.0", markers = "python_version == \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\""}, + {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\" and python_version < \"3.10\" or python_version > \"3.9\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_system != \"Darwin\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\""}, {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\""}, - {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\" and python_version < \"3.10\" or python_version > \"3.9\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_system != \"Darwin\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, ] [[package]] @@ -7567,4 +7583,4 @@ test = ["pytest", "pytest_cov", "pytest_env", "pytest_lazy_fixture", "pytest_moc [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.11" -content-hash = "d7e8605754d78a93147e6ab29a638a675c66f645c224a324fce122ea969adbb2" +content-hash = "e45ebf4c37d3b7ad89937fa6a12837e408a6f14a298a21953b29e8617492349a" diff --git a/pyproject.toml b/pyproject.toml index 59f0f7c9..7480c172 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "quadra" -version = "1.5.0" +version = "1.5.1" description = "Deep Learning experiment orchestration library" authors = [ "Federico Belotti ", @@ -25,6 +25,7 @@ classifiers = [ ] homepage = "https://orobix.github.io/quadra" repository = "https://github.com/orobix/quadra" +packages = [{ include = "quadra" }, { include = "quadra_hydra_plugin" }] [build-system] requires = ["poetry-core>=1.0.0"] @@ -36,7 +37,7 @@ quadra = "quadra.main:main" [tool.poetry.dependencies] python = ">=3.9,<3.11" poetry = "1.7.1" - +hydra-plugins = { path = "./quadra_hydra_plugin" } # TODO: We could support previous torch version using mutually exclusive python version but it's bad... # TODO: Right now it seems that poetry will download every kind of possible dependency from cu116 # To make it faster we could hardcode the correct version of the dependencies diff --git a/quadra/__init__.py b/quadra/__init__.py index 266bfee3..ce214805 100644 --- a/quadra/__init__.py +++ b/quadra/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.5.0" +__version__ = "1.5.1" def get_version(): diff --git a/hydra_plugins/quarda_searchpath_plugin.py b/quadra_hydra_plugin/hydra_plugins/quadra_searchpath_plugin.py similarity index 100% rename from hydra_plugins/quarda_searchpath_plugin.py rename to quadra_hydra_plugin/hydra_plugins/quadra_searchpath_plugin.py diff --git a/quadra_hydra_plugin/pyproject.toml b/quadra_hydra_plugin/pyproject.toml new file mode 100644 index 00000000..65769a92 --- /dev/null +++ b/quadra_hydra_plugin/pyproject.toml @@ -0,0 +1,19 @@ +[tool.poetry] +name = "hydra_plugins" +version = "1.0.0" +description = "Hydra plugin allowing the discovery of external configurations" +authors = [ + "Federico Belotti ", + "Silvia Bianchetti ", + "Refik Can Malli ", + "Lorenzo Mammana ", + "Alessandro Polidori ", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.poetry.dependencies] +python = ">=3.9,<3.11" +poetry = "1.7.1"