diff --git a/.github/workflows/config/codeql.yml b/.github/workflows/config/codeql.yml index ca249be9..80aa698f 100644 --- a/.github/workflows/config/codeql.yml +++ b/.github/workflows/config/codeql.yml @@ -1,7 +1,7 @@ name: "CodeQL config" paths: - - src/ + - nemo_run/ - test/ - examples/ - .github/ diff --git a/src/nemo_run/__init__.py b/nemo_run/__init__.py similarity index 100% rename from src/nemo_run/__init__.py rename to nemo_run/__init__.py diff --git a/src/nemo_run/__main__.py b/nemo_run/__main__.py similarity index 100% rename from src/nemo_run/__main__.py rename to nemo_run/__main__.py diff --git a/src/nemo_run/api.py b/nemo_run/api.py similarity index 100% rename from src/nemo_run/api.py rename to nemo_run/api.py diff --git a/src/nemo_run/cli/__init__.py b/nemo_run/cli/__init__.py similarity index 100% rename from src/nemo_run/cli/__init__.py rename to nemo_run/cli/__init__.py diff --git a/src/nemo_run/cli/api.py b/nemo_run/cli/api.py similarity index 100% rename from src/nemo_run/cli/api.py rename to nemo_run/cli/api.py diff --git a/src/nemo_run/cli/cli_parser.py b/nemo_run/cli/cli_parser.py similarity index 100% rename from src/nemo_run/cli/cli_parser.py rename to nemo_run/cli/cli_parser.py diff --git a/src/nemo_run/cli/devspace.py b/nemo_run/cli/devspace.py similarity index 100% rename from src/nemo_run/cli/devspace.py rename to nemo_run/cli/devspace.py diff --git a/src/nemo_run/cli/experiment.py b/nemo_run/cli/experiment.py similarity index 100% rename from src/nemo_run/cli/experiment.py rename to nemo_run/cli/experiment.py diff --git a/src/nemo_run/cli/workspace.py b/nemo_run/cli/workspace.py similarity index 100% rename from src/nemo_run/cli/workspace.py rename to nemo_run/cli/workspace.py diff --git a/src/nemo_run/config.py b/nemo_run/config.py similarity index 100% rename from src/nemo_run/config.py rename to nemo_run/config.py diff --git a/src/nemo_run/core/__init__.py b/nemo_run/core/__init__.py similarity index 100% rename from src/nemo_run/core/__init__.py rename to nemo_run/core/__init__.py diff --git a/src/nemo_run/core/execution/__init__.py b/nemo_run/core/execution/__init__.py similarity index 100% rename from src/nemo_run/core/execution/__init__.py rename to nemo_run/core/execution/__init__.py diff --git a/src/nemo_run/core/execution/base.py b/nemo_run/core/execution/base.py similarity index 100% rename from src/nemo_run/core/execution/base.py rename to nemo_run/core/execution/base.py diff --git a/src/nemo_run/core/execution/dgxcloud.py b/nemo_run/core/execution/dgxcloud.py similarity index 100% rename from src/nemo_run/core/execution/dgxcloud.py rename to nemo_run/core/execution/dgxcloud.py diff --git a/src/nemo_run/core/execution/docker.py b/nemo_run/core/execution/docker.py similarity index 100% rename from src/nemo_run/core/execution/docker.py rename to nemo_run/core/execution/docker.py diff --git a/src/nemo_run/core/execution/launcher.py b/nemo_run/core/execution/launcher.py similarity index 100% rename from src/nemo_run/core/execution/launcher.py rename to nemo_run/core/execution/launcher.py diff --git a/src/nemo_run/core/execution/local.py b/nemo_run/core/execution/local.py similarity index 100% rename from src/nemo_run/core/execution/local.py rename to nemo_run/core/execution/local.py diff --git a/src/nemo_run/core/execution/skypilot.py b/nemo_run/core/execution/skypilot.py similarity index 100% rename from src/nemo_run/core/execution/skypilot.py rename to nemo_run/core/execution/skypilot.py diff --git a/src/nemo_run/core/execution/slurm.py b/nemo_run/core/execution/slurm.py similarity index 100% rename from src/nemo_run/core/execution/slurm.py rename to nemo_run/core/execution/slurm.py diff --git a/src/nemo_run/core/execution/templates/ft_launcher.j2 b/nemo_run/core/execution/templates/ft_launcher.j2 similarity index 100% rename from src/nemo_run/core/execution/templates/ft_launcher.j2 rename to nemo_run/core/execution/templates/ft_launcher.j2 diff --git a/src/nemo_run/core/execution/templates/slurm.sh.j2 b/nemo_run/core/execution/templates/slurm.sh.j2 similarity index 100% rename from src/nemo_run/core/execution/templates/slurm.sh.j2 rename to nemo_run/core/execution/templates/slurm.sh.j2 diff --git a/src/nemo_run/core/execution/templates/slurm_ray.sh.j2 b/nemo_run/core/execution/templates/slurm_ray.sh.j2 similarity index 100% rename from src/nemo_run/core/execution/templates/slurm_ray.sh.j2 rename to nemo_run/core/execution/templates/slurm_ray.sh.j2 diff --git a/src/nemo_run/core/execution/utils.py b/nemo_run/core/execution/utils.py similarity index 100% rename from src/nemo_run/core/execution/utils.py rename to nemo_run/core/execution/utils.py diff --git a/src/nemo_run/core/frontend/__init__.py b/nemo_run/core/frontend/__init__.py similarity index 100% rename from src/nemo_run/core/frontend/__init__.py rename to nemo_run/core/frontend/__init__.py diff --git a/src/nemo_run/core/frontend/console/__init__.py b/nemo_run/core/frontend/console/__init__.py similarity index 100% rename from src/nemo_run/core/frontend/console/__init__.py rename to nemo_run/core/frontend/console/__init__.py diff --git a/src/nemo_run/core/frontend/console/api.py b/nemo_run/core/frontend/console/api.py similarity index 100% rename from src/nemo_run/core/frontend/console/api.py rename to nemo_run/core/frontend/console/api.py diff --git a/src/nemo_run/core/frontend/console/styles.py b/nemo_run/core/frontend/console/styles.py similarity index 100% rename from src/nemo_run/core/frontend/console/styles.py rename to nemo_run/core/frontend/console/styles.py diff --git a/src/nemo_run/core/packaging/__init__.py b/nemo_run/core/packaging/__init__.py similarity index 100% rename from src/nemo_run/core/packaging/__init__.py rename to nemo_run/core/packaging/__init__.py diff --git a/src/nemo_run/core/packaging/base.py b/nemo_run/core/packaging/base.py similarity index 100% rename from src/nemo_run/core/packaging/base.py rename to nemo_run/core/packaging/base.py diff --git a/src/nemo_run/core/packaging/git.py b/nemo_run/core/packaging/git.py similarity index 100% rename from src/nemo_run/core/packaging/git.py rename to nemo_run/core/packaging/git.py diff --git a/src/nemo_run/core/packaging/hybrid.py b/nemo_run/core/packaging/hybrid.py similarity index 100% rename from src/nemo_run/core/packaging/hybrid.py rename to nemo_run/core/packaging/hybrid.py diff --git a/src/nemo_run/core/packaging/pattern.py b/nemo_run/core/packaging/pattern.py similarity index 100% rename from src/nemo_run/core/packaging/pattern.py rename to nemo_run/core/packaging/pattern.py diff --git a/src/nemo_run/core/runners/__init__.py b/nemo_run/core/runners/__init__.py similarity index 100% rename from src/nemo_run/core/runners/__init__.py rename to nemo_run/core/runners/__init__.py diff --git a/src/nemo_run/core/runners/fdl_runner.py b/nemo_run/core/runners/fdl_runner.py similarity index 100% rename from src/nemo_run/core/runners/fdl_runner.py rename to nemo_run/core/runners/fdl_runner.py diff --git a/src/nemo_run/core/serialization/__init__.py b/nemo_run/core/serialization/__init__.py similarity index 100% rename from src/nemo_run/core/serialization/__init__.py rename to nemo_run/core/serialization/__init__.py diff --git a/src/nemo_run/core/serialization/yaml.py b/nemo_run/core/serialization/yaml.py similarity index 100% rename from src/nemo_run/core/serialization/yaml.py rename to nemo_run/core/serialization/yaml.py diff --git a/src/nemo_run/core/serialization/zlib_json.py b/nemo_run/core/serialization/zlib_json.py similarity index 100% rename from src/nemo_run/core/serialization/zlib_json.py rename to nemo_run/core/serialization/zlib_json.py diff --git a/src/nemo_run/core/tunnel/__init__.py b/nemo_run/core/tunnel/__init__.py similarity index 100% rename from src/nemo_run/core/tunnel/__init__.py rename to nemo_run/core/tunnel/__init__.py diff --git a/src/nemo_run/core/tunnel/client.py b/nemo_run/core/tunnel/client.py similarity index 100% rename from src/nemo_run/core/tunnel/client.py rename to nemo_run/core/tunnel/client.py diff --git a/src/nemo_run/core/tunnel/rsync.py b/nemo_run/core/tunnel/rsync.py similarity index 100% rename from src/nemo_run/core/tunnel/rsync.py rename to nemo_run/core/tunnel/rsync.py diff --git a/src/nemo_run/core/tunnel/server.py b/nemo_run/core/tunnel/server.py similarity index 100% rename from src/nemo_run/core/tunnel/server.py rename to nemo_run/core/tunnel/server.py diff --git a/src/nemo_run/devspace/__init__.py b/nemo_run/devspace/__init__.py similarity index 100% rename from src/nemo_run/devspace/__init__.py rename to nemo_run/devspace/__init__.py diff --git a/src/nemo_run/devspace/base.py b/nemo_run/devspace/base.py similarity index 100% rename from src/nemo_run/devspace/base.py rename to nemo_run/devspace/base.py diff --git a/src/nemo_run/devspace/editor.py b/nemo_run/devspace/editor.py similarity index 100% rename from src/nemo_run/devspace/editor.py rename to nemo_run/devspace/editor.py diff --git a/src/nemo_run/exceptions.py b/nemo_run/exceptions.py similarity index 100% rename from src/nemo_run/exceptions.py rename to nemo_run/exceptions.py diff --git a/src/nemo_run/help.py b/nemo_run/help.py similarity index 100% rename from src/nemo_run/help.py rename to nemo_run/help.py diff --git a/src/nemo_run/lazy.py b/nemo_run/lazy.py similarity index 100% rename from src/nemo_run/lazy.py rename to nemo_run/lazy.py diff --git a/src/nemo_run/run/__init__.py b/nemo_run/run/__init__.py similarity index 100% rename from src/nemo_run/run/__init__.py rename to nemo_run/run/__init__.py diff --git a/src/nemo_run/run/api.py b/nemo_run/run/api.py similarity index 100% rename from src/nemo_run/run/api.py rename to nemo_run/run/api.py diff --git a/src/nemo_run/run/experiment.py b/nemo_run/run/experiment.py similarity index 100% rename from src/nemo_run/run/experiment.py rename to nemo_run/run/experiment.py diff --git a/src/nemo_run/run/job.py b/nemo_run/run/job.py similarity index 100% rename from src/nemo_run/run/job.py rename to nemo_run/run/job.py diff --git a/src/nemo_run/run/logs.py b/nemo_run/run/logs.py similarity index 100% rename from src/nemo_run/run/logs.py rename to nemo_run/run/logs.py diff --git a/src/nemo_run/run/plugin.py b/nemo_run/run/plugin.py similarity index 100% rename from src/nemo_run/run/plugin.py rename to nemo_run/run/plugin.py diff --git a/src/nemo_run/run/task.py b/nemo_run/run/task.py similarity index 100% rename from src/nemo_run/run/task.py rename to nemo_run/run/task.py diff --git a/src/nemo_run/run/torchx_backend/__init__.py b/nemo_run/run/torchx_backend/__init__.py similarity index 100% rename from src/nemo_run/run/torchx_backend/__init__.py rename to nemo_run/run/torchx_backend/__init__.py diff --git a/src/nemo_run/run/torchx_backend/components/__init__.py b/nemo_run/run/torchx_backend/components/__init__.py similarity index 100% rename from src/nemo_run/run/torchx_backend/components/__init__.py rename to nemo_run/run/torchx_backend/components/__init__.py diff --git a/src/nemo_run/run/torchx_backend/components/ft_launcher.py b/nemo_run/run/torchx_backend/components/ft_launcher.py similarity index 100% rename from src/nemo_run/run/torchx_backend/components/ft_launcher.py rename to nemo_run/run/torchx_backend/components/ft_launcher.py diff --git a/src/nemo_run/run/torchx_backend/components/torchrun.py b/nemo_run/run/torchx_backend/components/torchrun.py similarity index 100% rename from src/nemo_run/run/torchx_backend/components/torchrun.py rename to nemo_run/run/torchx_backend/components/torchrun.py diff --git a/src/nemo_run/run/torchx_backend/launcher.py b/nemo_run/run/torchx_backend/launcher.py similarity index 100% rename from src/nemo_run/run/torchx_backend/launcher.py rename to nemo_run/run/torchx_backend/launcher.py diff --git a/src/nemo_run/run/torchx_backend/packaging.py b/nemo_run/run/torchx_backend/packaging.py similarity index 100% rename from src/nemo_run/run/torchx_backend/packaging.py rename to nemo_run/run/torchx_backend/packaging.py diff --git a/src/nemo_run/run/torchx_backend/runner.py b/nemo_run/run/torchx_backend/runner.py similarity index 100% rename from src/nemo_run/run/torchx_backend/runner.py rename to nemo_run/run/torchx_backend/runner.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/__init__.py b/nemo_run/run/torchx_backend/schedulers/__init__.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/__init__.py rename to nemo_run/run/torchx_backend/schedulers/__init__.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/api.py b/nemo_run/run/torchx_backend/schedulers/api.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/api.py rename to nemo_run/run/torchx_backend/schedulers/api.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/dgxcloud.py b/nemo_run/run/torchx_backend/schedulers/dgxcloud.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/dgxcloud.py rename to nemo_run/run/torchx_backend/schedulers/dgxcloud.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/docker.py b/nemo_run/run/torchx_backend/schedulers/docker.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/docker.py rename to nemo_run/run/torchx_backend/schedulers/docker.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/local.py b/nemo_run/run/torchx_backend/schedulers/local.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/local.py rename to nemo_run/run/torchx_backend/schedulers/local.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/skypilot.py b/nemo_run/run/torchx_backend/schedulers/skypilot.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/skypilot.py rename to nemo_run/run/torchx_backend/schedulers/skypilot.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/slurm.py b/nemo_run/run/torchx_backend/schedulers/slurm.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/slurm.py rename to nemo_run/run/torchx_backend/schedulers/slurm.py diff --git a/src/nemo_run/run/torchx_backend/schedulers/utils.py b/nemo_run/run/torchx_backend/schedulers/utils.py similarity index 100% rename from src/nemo_run/run/torchx_backend/schedulers/utils.py rename to nemo_run/run/torchx_backend/schedulers/utils.py diff --git a/src/nemo_run/run/utils.py b/nemo_run/run/utils.py similarity index 100% rename from src/nemo_run/run/utils.py rename to nemo_run/run/utils.py diff --git a/pyproject.toml b/pyproject.toml index 4286f86e..ee2ca529 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,8 +90,8 @@ addopts = '-m "not slow"' [tool.coverage.run] branch = true -include = ["src/nemo_run/**/*.py"] -omit = ["src/nemo_run/core/tunnel/callback.py", "src/nemo_run/help.py", "src/nemo_run/**/__init__.py", "src/nemo_run/**/_version.py"] +include = ["nemo_run/**/*.py"] +omit = ["nemo_run/core/tunnel/callback.py", "nemo_run/help.py", "nemo_run/**/__init__.py", "nemo_run/**/_version.py"] [tool.coverage.report] # Regexes for lines to exclude from consideration @@ -122,13 +122,13 @@ directory = "coverage_html_report" allow-direct-references = true [tool.hatch.build.targets.wheel] -packages = ["src/nemo_run"] +packages = ["nemo_run"] [tool.hatch.version] source = "vcs" [tool.hatch.build.hooks.vcs] -version-file = "src/nemo_run/_version.py" +version-file = "nemo_run/_version.py" [tool.ruff] line-length = 100 diff --git a/test/core/execution/test_local.py b/test/core/execution/test_local.py index e6dada28..2eb89d64 100644 --- a/test/core/execution/test_local.py +++ b/test/core/execution/test_local.py @@ -16,7 +16,7 @@ import os import tempfile -from src.nemo_run.core.execution.local import LocalExecutor +from nemo_run.core.execution.local import LocalExecutor def test_local_executor_init(): diff --git a/test/core/execution/test_utils.py b/test/core/execution/test_utils.py index b7ccafaf..9c3df5fe 100644 --- a/test/core/execution/test_utils.py +++ b/test/core/execution/test_utils.py @@ -15,7 +15,7 @@ import pytest -from src.nemo_run.core.execution.utils import fill_template +from nemo_run.core.execution.utils import fill_template def test_fill_template_file_not_found(): diff --git a/test/core/packaging/test_base.py b/test/core/packaging/test_base.py index 6f167d0f..366a7046 100644 --- a/test/core/packaging/test_base.py +++ b/test/core/packaging/test_base.py @@ -14,9 +14,9 @@ # limitations under the License. import pytest -from nemo_run.config import Config -from src.nemo_run.core.packaging.base import Packager +from nemo_run.config import Config +from nemo_run.core.packaging.base import Packager @pytest.fixture