Skip to content

Commit 8198743

Browse files
srinivas212srinivas212
authored
Merge pull request #40 from NVIDIA/reorg
Reorganize files in repo
2 parents 3eacdc0 + 1a6f646 commit 8198743

File tree

72 files changed

+180
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+180
-183
lines changed

‎src/cloudai/__init__.py‎

Lines changed: 56 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,63 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from cloudai.installer.slurm_installer import SlurmInstaller
16-
from cloudai.installer.standalone_installer import StandaloneInstaller
17-
from cloudai.parser.system_parser.slurm_system_parser import SlurmSystemParser
18-
from cloudai.parser.system_parser.standalone_system_parser import StandaloneSystemParser
19-
from cloudai.runner.slurm.slurm_runner import SlurmRunner
20-
from cloudai.runner.standalone.standalone_runner import StandaloneRunner
21-
from cloudai.schema.core.strategy.command_gen_strategy import CommandGenStrategy
22-
from cloudai.schema.core.strategy.grading_strategy import GradingStrategy
23-
from cloudai.schema.core.strategy.install_strategy import InstallStrategy
24-
from cloudai.schema.core.strategy.job_id_retrieval_strategy import JobIdRetrievalStrategy
25-
from cloudai.schema.core.strategy.report_generation_strategy import ReportGenerationStrategy
26-
from cloudai.schema.system.slurm.slurm_system import SlurmSystem
27-
from cloudai.schema.system.standalone_system import StandaloneSystem
28-
from cloudai.schema.test_template.chakra_replay.grading_strategy import ChakraReplayGradingStrategy
29-
from cloudai.schema.test_template.chakra_replay.report_generation_strategy import ChakraReplayReportGenerationStrategy
30-
from cloudai.schema.test_template.chakra_replay.slurm_command_gen_strategy import ChakraReplaySlurmCommandGenStrategy
31-
from cloudai.schema.test_template.chakra_replay.slurm_install_strategy import ChakraReplaySlurmInstallStrategy
32-
from cloudai.schema.test_template.chakra_replay.template import ChakraReplay
33-
from cloudai.schema.test_template.common.slurm_job_id_retrieval_strategy import SlurmJobIdRetrievalStrategy
34-
from cloudai.schema.test_template.common.standalone_job_id_retrieval_strategy import StandaloneJobIdRetrievalStrategy
35-
from cloudai.schema.test_template.jax_toolbox.grading_strategy import JaxToolboxGradingStrategy
36-
from cloudai.schema.test_template.jax_toolbox.report_generation_strategy import JaxToolboxReportGenerationStrategy
37-
from cloudai.schema.test_template.jax_toolbox.slurm_command_gen_strategy import JaxToolboxSlurmCommandGenStrategy
38-
from cloudai.schema.test_template.jax_toolbox.slurm_install_strategy import JaxToolboxSlurmInstallStrategy
39-
from cloudai.schema.test_template.jax_toolbox.template import JaxToolbox
40-
from cloudai.schema.test_template.nccl_test.grading_strategy import NcclTestGradingStrategy
41-
from cloudai.schema.test_template.nccl_test.report_generation_strategy import NcclTestReportGenerationStrategy
42-
from cloudai.schema.test_template.nccl_test.slurm_command_gen_strategy import NcclTestSlurmCommandGenStrategy
43-
from cloudai.schema.test_template.nccl_test.slurm_install_strategy import NcclTestSlurmInstallStrategy
44-
from cloudai.schema.test_template.nccl_test.template import NcclTest
45-
from cloudai.schema.test_template.nemo_launcher.grading_strategy import NeMoLauncherGradingStrategy
46-
from cloudai.schema.test_template.nemo_launcher.report_generation_strategy import NeMoLauncherReportGenerationStrategy
47-
from cloudai.schema.test_template.nemo_launcher.slurm_command_gen_strategy import NeMoLauncherSlurmCommandGenStrategy
48-
from cloudai.schema.test_template.nemo_launcher.slurm_install_strategy import NeMoLauncherSlurmInstallStrategy
49-
from cloudai.schema.test_template.nemo_launcher.slurm_job_id_retrieval_strategy import (
50-
NeMoLauncherSlurmJobIdRetrievalStrategy,
51-
)
52-
from cloudai.schema.test_template.nemo_launcher.template import NeMoLauncher
53-
from cloudai.schema.test_template.sleep.grading_strategy import SleepGradingStrategy
54-
from cloudai.schema.test_template.sleep.report_generation_strategy import SleepReportGenerationStrategy
55-
from cloudai.schema.test_template.sleep.standalone_command_gen_strategy import SleepStandaloneCommandGenStrategy
56-
from cloudai.schema.test_template.sleep.standalone_install_strategy import SleepStandaloneInstallStrategy
57-
from cloudai.schema.test_template.sleep.template import Sleep
58-
from cloudai.schema.test_template.ucc_test.grading_strategy import UCCTestGradingStrategy
59-
from cloudai.schema.test_template.ucc_test.report_generation_strategy import UCCTestReportGenerationStrategy
60-
from cloudai.schema.test_template.ucc_test.slurm_command_gen_strategy import UCCTestSlurmCommandGenStrategy
61-
from cloudai.schema.test_template.ucc_test.slurm_install_strategy import UCCTestSlurmInstallStrategy
62-
from cloudai.schema.test_template.ucc_test.template import UCCTest
63-
15+
from ._core.command_gen_strategy import CommandGenStrategy
16+
from ._core.grading_strategy import GradingStrategy
17+
from ._core.install_strategy import InstallStrategy
18+
from ._core.job_id_retrieval_strategy import JobIdRetrievalStrategy
19+
from ._core.parser import Parser
6420
from ._core.registry import Registry
21+
from ._core.report_generation_strategy import ReportGenerationStrategy
22+
from ._core.runner import Runner
23+
from ._core.system import System
24+
from ._core.test_template import TestTemplate
25+
from ._core.test_template_strategy import TestTemplateStrategy
6526
from .grader import Grader
6627
from .installer.installer import Installer
67-
from .parser.core.parser import Parser
28+
from .installer.slurm_installer import SlurmInstaller
29+
from .installer.standalone_installer import StandaloneInstaller
30+
from .parser.system_parser.slurm_system_parser import SlurmSystemParser
31+
from .parser.system_parser.standalone_system_parser import StandaloneSystemParser
6832
from .report_generator import ReportGenerator
69-
from .runner.core.runner import Runner
33+
from .runner.slurm.slurm_runner import SlurmRunner
34+
from .runner.standalone.standalone_runner import StandaloneRunner
35+
from .schema.system.slurm.slurm_system import SlurmSystem
36+
from .schema.system.standalone_system import StandaloneSystem
37+
from .schema.test_template.chakra_replay.grading_strategy import ChakraReplayGradingStrategy
38+
from .schema.test_template.chakra_replay.report_generation_strategy import ChakraReplayReportGenerationStrategy
39+
from .schema.test_template.chakra_replay.slurm_command_gen_strategy import ChakraReplaySlurmCommandGenStrategy
40+
from .schema.test_template.chakra_replay.slurm_install_strategy import ChakraReplaySlurmInstallStrategy
41+
from .schema.test_template.chakra_replay.template import ChakraReplay
42+
from .schema.test_template.common.slurm_job_id_retrieval_strategy import SlurmJobIdRetrievalStrategy
43+
from .schema.test_template.common.standalone_job_id_retrieval_strategy import StandaloneJobIdRetrievalStrategy
44+
from .schema.test_template.jax_toolbox.grading_strategy import JaxToolboxGradingStrategy
45+
from .schema.test_template.jax_toolbox.report_generation_strategy import JaxToolboxReportGenerationStrategy
46+
from .schema.test_template.jax_toolbox.slurm_command_gen_strategy import JaxToolboxSlurmCommandGenStrategy
47+
from .schema.test_template.jax_toolbox.slurm_install_strategy import JaxToolboxSlurmInstallStrategy
48+
from .schema.test_template.jax_toolbox.template import JaxToolbox
49+
from .schema.test_template.nccl_test.grading_strategy import NcclTestGradingStrategy
50+
from .schema.test_template.nccl_test.report_generation_strategy import NcclTestReportGenerationStrategy
51+
from .schema.test_template.nccl_test.slurm_command_gen_strategy import NcclTestSlurmCommandGenStrategy
52+
from .schema.test_template.nccl_test.slurm_install_strategy import NcclTestSlurmInstallStrategy
53+
from .schema.test_template.nccl_test.template import NcclTest
54+
from .schema.test_template.nemo_launcher.grading_strategy import NeMoLauncherGradingStrategy
55+
from .schema.test_template.nemo_launcher.report_generation_strategy import NeMoLauncherReportGenerationStrategy
56+
from .schema.test_template.nemo_launcher.slurm_command_gen_strategy import NeMoLauncherSlurmCommandGenStrategy
57+
from .schema.test_template.nemo_launcher.slurm_install_strategy import NeMoLauncherSlurmInstallStrategy
58+
from .schema.test_template.nemo_launcher.slurm_job_id_retrieval_strategy import (
59+
NeMoLauncherSlurmJobIdRetrievalStrategy,
60+
)
61+
from .schema.test_template.nemo_launcher.template import NeMoLauncher
62+
from .schema.test_template.sleep.grading_strategy import SleepGradingStrategy
63+
from .schema.test_template.sleep.report_generation_strategy import SleepReportGenerationStrategy
64+
from .schema.test_template.sleep.standalone_command_gen_strategy import SleepStandaloneCommandGenStrategy
65+
from .schema.test_template.sleep.standalone_install_strategy import SleepStandaloneInstallStrategy
66+
from .schema.test_template.sleep.template import Sleep
67+
from .schema.test_template.ucc_test.grading_strategy import UCCTestGradingStrategy
68+
from .schema.test_template.ucc_test.report_generation_strategy import UCCTestReportGenerationStrategy
69+
from .schema.test_template.ucc_test.slurm_command_gen_strategy import UCCTestSlurmCommandGenStrategy
70+
from .schema.test_template.ucc_test.slurm_install_strategy import UCCTestSlurmInstallStrategy
71+
from .schema.test_template.ucc_test.template import UCCTest
7072

7173
Registry().add_system_parser("standalone", StandaloneSystemParser)
7274
Registry().add_system_parser("slurm", SlurmSystemParser)
@@ -122,4 +124,7 @@
122124
"Parser",
123125
"ReportGenerator",
124126
"Runner",
127+
"System",
128+
"TestTemplate",
129+
"TestTemplateStrategy",
125130
]

src/cloudai/runner/core/base_job.py renamed to src/cloudai/_core/base_job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from cloudai.schema.core.test import Test
15+
from .test import Test
1616

1717

1818
class BaseJob:

src/cloudai/parser/core/base_multi_file_parser.py renamed to src/cloudai/_core/base_multi_file_parser.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
from typing import Any, Dict, List, Union
1818

1919
import toml
20-
from cloudai.schema.core.test import Test
21-
from cloudai.schema.core.test_template import TestTemplate
20+
21+
from .test import Test
22+
from .test_template import TestTemplate
2223

2324

2425
class BaseMultiFileParser(ABC):

src/cloudai/runner/core/base_runner.py renamed to src/cloudai/_core/base_runner.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
from types import FrameType
2424
from typing import Dict, List, Optional
2525

26-
from cloudai.schema.core.system import System
27-
from cloudai.schema.core.test import Test
28-
from cloudai.schema.core.test_scenario import TestScenario
29-
3026
from .base_job import BaseJob
27+
from .system import System
28+
from .test import Test
29+
from .test_scenario import TestScenario
3130

3231

3332
class BaseRunner(ABC):

src/cloudai/parser/core/base_system_parser.py renamed to src/cloudai/_core/base_system_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from abc import ABC, abstractmethod
1616
from typing import Any, Dict
1717

18-
from cloudai.schema.core.system import System
18+
from .system import System
1919

2020

2121
class BaseSystemParser(ABC):

src/cloudai/schema/core/strategy/command_gen_strategy.py renamed to src/cloudai/_core/command_gen_strategy.py

File renamed without changes.

src/cloudai/grader/grader.py renamed to src/cloudai/_core/grader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import os
1818
from typing import Dict, List
1919

20-
from cloudai.schema.core.test import Test
21-
from cloudai.schema.core.test_scenario import TestScenario
20+
from .test import Test
21+
from .test_scenario import TestScenario
2222

2323

2424
class Grader:

src/cloudai/schema/core/strategy/grading_strategy.py renamed to src/cloudai/_core/grading_strategy.py

File renamed without changes.

src/cloudai/schema/core/strategy/install_strategy.py renamed to src/cloudai/_core/install_strategy.py

File renamed without changes.

src/cloudai/schema/core/strategy/job_id_retrieval_strategy.py renamed to src/cloudai/_core/job_id_retrieval_strategy.py

File renamed without changes.

0 commit comments

Comments
 (0)