From 62e958fa8c07ae73be0b10a30e1fb5e4c3d0e8f3 Mon Sep 17 00:00:00 2001 From: Shao Wang <77665902+Electronic-Waste@users.noreply.github.com> Date: Wed, 5 Feb 2025 21:34:37 +0800 Subject: [PATCH] KEP-2170: Change API Group Name to `trainer.kubeflow.org` (#2413) * fix(apis): change the group of API to trainer.kubeflow.org. Signed-off-by: Electronic-Waste <2690692950@qq.com> * chore(manifests): update crds in manifests using make manifests. Signed-off-by: Electronic-Waste <2690692950@qq.com> * chore: change the apia dir name to trainer.kubeflow.org and update reference. Signed-off-by: Electronic-Waste <2690692950@qq.com> * chore: execute make generate. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix: remove remaining kubeflow.org dirs. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix(sdk): remove outdated docs & update models reference. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix: rename apis dir to ttrainer. Signed-off-by: Electronic-Waste <2690692950@qq.com> * chore: execute make generate. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix(sdk): remove outdated docs & update models reference. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix(sdk): update model reference in code. Signed-off-by: Electronic-Waste <2690692950@qq.com> * fix(doc): update api grou p in KEP-2170. Signed-off-by: Electronic-Waste <2690692950@qq.com> --------- Signed-off-by: Electronic-Waste <2690692950@qq.com> --- Makefile | 4 +- api.v2/openapi-spec/swagger.json | 114 +++++----- cmd/training-operator.v2alpha1/main.go | 2 +- .../2170-kubeflow-training-v2/README.md | 30 +-- hack/swagger-v2/main.go | 2 +- hack/update-codegen.sh | 6 +- manifests/v2/base/crds/kustomization.yaml | 6 +- ...kubeflow.org_clustertrainingruntimes.yaml} | 4 +- ...rainer.kubeflow.org_trainingruntimes.yaml} | 4 +- ...ml => trainer.kubeflow.org_trainjobs.yaml} | 8 +- .../{kubeflow.org => trainer}/v2alpha1/doc.go | 2 +- .../v2alpha1/groupversion_info.go | 6 +- .../v2alpha1/trainingruntime_types.go | 0 .../v2alpha1/trainjob_types.go | 4 +- .../v2alpha1/zz_generated.deepcopy.go | 0 .../v2alpha1/zz_generated.defaults.go | 0 .../v2alpha1/zz_generated.openapi.go | 202 +++++++++--------- .../v2alpha1/clustertrainingruntime.go | 2 +- .../v2alpha1/containeroverride.go | 0 .../coschedulingpodgrouppolicysource.go | 0 .../v2alpha1/datasetconfig.go | 0 .../v2alpha1/inputmodel.go | 0 .../v2alpha1/jobsettemplatespec.go | 0 .../v2alpha1/jobstatus.go | 0 .../v2alpha1/mlpolicy.go | 0 .../v2alpha1/mlpolicysource.go | 0 .../v2alpha1/modelconfig.go | 0 .../v2alpha1/mpimlpolicysource.go | 2 +- .../v2alpha1/outputmodel.go | 0 .../v2alpha1/podgrouppolicy.go | 0 .../v2alpha1/podgrouppolicysource.go | 0 .../v2alpha1/podspecoverride.go | 0 .../v2alpha1/podspecoverridetargetjob.go | 0 .../v2alpha1/runtimeref.go | 0 .../v2alpha1/torchelasticpolicy.go | 0 .../v2alpha1/torchmlpolicysource.go | 0 .../v2alpha1/trainer.go | 0 .../v2alpha1/trainingruntime.go | 2 +- .../v2alpha1/trainingruntimespec.go | 0 .../v2alpha1/trainjob.go | 2 +- .../v2alpha1/trainjobspec.go | 0 .../v2alpha1/trainjobstatus.go | 0 pkg/client/applyconfiguration/utils.go | 56 ++--- pkg/client/clientset/versioned/clientset.go | 16 +- .../versioned/fake/clientset_generated.go | 10 +- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../v2alpha1/clustertrainingruntime.go | 12 +- .../{kubeflow.org => trainer}/v2alpha1/doc.go | 0 .../v2alpha1/fake/doc.go | 0 .../fake/fake_clustertrainingruntime.go | 8 +- .../v2alpha1/fake/fake_trainer_client.go} | 12 +- .../v2alpha1/fake/fake_trainingruntime.go | 8 +- .../v2alpha1/fake/fake_trainjob.go | 10 +- .../v2alpha1/generated_expansion.go | 0 .../v2alpha1/trainer_client.go} | 36 ++-- .../v2alpha1/trainingruntime.go | 12 +- .../v2alpha1/trainjob.go | 14 +- .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 10 +- .../{kubeflow.org => trainer}/interface.go | 4 +- .../v2alpha1/clustertrainingruntime.go | 12 +- .../v2alpha1/interface.go | 0 .../v2alpha1/trainingruntime.go | 12 +- .../v2alpha1/trainjob.go | 12 +- .../v2alpha1/clustertrainingruntime.go | 2 +- .../v2alpha1/expansion_generated.go | 0 .../v2alpha1/trainingruntime.go | 2 +- .../v2alpha1/trainjob.go | 2 +- pkg/controller.v2/trainjob_controller.go | 2 +- pkg/runtime.v2/core/clustertrainingruntime.go | 2 +- .../core/clustertrainingruntime_test.go | 2 +- pkg/runtime.v2/core/trainingruntime.go | 2 +- pkg/runtime.v2/core/trainingruntime_test.go | 2 +- pkg/runtime.v2/framework/core/framework.go | 2 +- .../framework/core/framework_test.go | 2 +- pkg/runtime.v2/framework/interface.go | 2 +- .../plugins/coscheduling/coscheduling.go | 2 +- .../framework/plugins/coscheduling/indexer.go | 2 +- .../framework/plugins/jobset/builder.go | 2 +- .../framework/plugins/jobset/jobset.go | 2 +- pkg/runtime.v2/framework/plugins/mpi/mpi.go | 2 +- .../framework/plugins/plainml/plainml.go | 2 +- .../framework/plugins/torch/torch.go | 2 +- pkg/runtime.v2/indexer/indexer.go | 2 +- pkg/runtime.v2/interface.go | 2 +- pkg/runtime.v2/runtime.go | 2 +- pkg/util.v2/testing/client.go | 2 +- pkg/util.v2/testing/wrapper.go | 2 +- .../clustertrainingruntime_webhook.go | 2 +- pkg/webhooks.v2/setup.go | 2 +- pkg/webhooks.v2/trainingruntime_webhook.go | 2 +- pkg/webhooks.v2/trainjob_webhook.go | 2 +- .../KubeflowOrgV2alpha1TrainingRuntimeSpec.md | 13 -- ... TrainerV2alpha1ClusterTrainingRuntime.md} | 4 +- ...inerV2alpha1ClusterTrainingRuntimeList.md} | 4 +- ...md => TrainerV2alpha1ContainerOverride.md} | 2 +- ...alpha1CoschedulingPodGroupPolicySource.md} | 2 +- ...fig.md => TrainerV2alpha1DatasetConfig.md} | 2 +- ...tModel.md => TrainerV2alpha1InputModel.md} | 2 +- ...d => TrainerV2alpha1JobSetTemplateSpec.md} | 2 +- ...bStatus.md => TrainerV2alpha1JobStatus.md} | 2 +- ...MLPolicy.md => TrainerV2alpha1MLPolicy.md} | 6 +- ...ce.md => TrainerV2alpha1MLPolicySource.md} | 6 +- ...md => TrainerV2alpha1MPIMLPolicySource.md} | 2 +- ...onfig.md => TrainerV2alpha1ModelConfig.md} | 6 +- ...Model.md => TrainerV2alpha1OutputModel.md} | 2 +- ...cy.md => TrainerV2alpha1PodGroupPolicy.md} | 4 +- ...=> TrainerV2alpha1PodGroupPolicySource.md} | 4 +- ...e.md => TrainerV2alpha1PodSpecOverride.md} | 8 +- ...rainerV2alpha1PodSpecOverrideTargetJob.md} | 2 +- ...imeRef.md => TrainerV2alpha1RuntimeRef.md} | 4 +- ...d => TrainerV2alpha1TorchElasticPolicy.md} | 2 +- ... => TrainerV2alpha1TorchMLPolicySource.md} | 4 +- ...TrainJob.md => TrainerV2alpha1TrainJob.md} | 6 +- ...List.md => TrainerV2alpha1TrainJobList.md} | 4 +- ...Spec.md => TrainerV2alpha1TrainJobSpec.md} | 12 +- ...us.md => TrainerV2alpha1TrainJobStatus.md} | 4 +- ...a1Trainer.md => TrainerV2alpha1Trainer.md} | 2 +- ...e.md => TrainerV2alpha1TrainingRuntime.md} | 4 +- ... => TrainerV2alpha1TrainingRuntimeList.md} | 4 +- .../TrainerV2alpha1TrainingRuntimeSpec.md | 13 ++ .../kubeflow/training/api/training_client.py | 22 +- sdk_v2/kubeflow/training/models/__init__.py | 56 ++--- ...iner_v2alpha1_cluster_training_runtime.py} | 46 ++-- ...v2alpha1_cluster_training_runtime_list.py} | 46 ++-- ...=> trainer_v2alpha1_container_override.py} | 56 ++--- ...1_coscheduling_pod_group_policy_source.py} | 16 +- ....py => trainer_v2alpha1_dataset_config.py} | 32 +-- ...del.py => trainer_v2alpha1_input_model.py} | 32 +-- ...trainer_v2alpha1_job_set_template_spec.py} | 24 +-- ...atus.py => trainer_v2alpha1_job_status.py} | 56 ++--- ...olicy.py => trainer_v2alpha1_ml_policy.py} | 44 ++-- ...y => trainer_v2alpha1_ml_policy_source.py} | 36 ++-- ...ig.py => trainer_v2alpha1_model_config.py} | 36 ++-- ...> trainer_v2alpha1_mpiml_policy_source.py} | 40 ++-- ...el.py => trainer_v2alpha1_output_model.py} | 32 +-- ...y => trainer_v2alpha1_pod_group_policy.py} | 22 +- ...ainer_v2alpha1_pod_group_policy_source.py} | 22 +- ... => trainer_v2alpha1_pod_spec_override.py} | 82 +++---- ..._v2alpha1_pod_spec_override_target_job.py} | 16 +- ...ref.py => trainer_v2alpha1_runtime_ref.py} | 36 ++-- ... trainer_v2alpha1_torch_elastic_policy.py} | 40 ++-- ...rainer_v2alpha1_torch_ml_policy_source.py} | 30 +-- ...n_job.py => trainer_v2alpha1_train_job.py} | 60 +++--- ....py => trainer_v2alpha1_train_job_list.py} | 46 ++-- ....py => trainer_v2alpha1_train_job_spec.py} | 110 +++++----- ...y => trainer_v2alpha1_train_job_status.py} | 30 +-- ...trainer.py => trainer_v2alpha1_trainer.py} | 64 +++--- ...y => trainer_v2alpha1_training_runtime.py} | 46 ++-- ...trainer_v2alpha1_training_runtime_list.py} | 46 ++-- ...trainer_v2alpha1_training_runtime_spec.py} | 50 ++--- sdk_v2/kubeflow/training/utils/utils.py | 10 +- .../controller.v2/trainjob_controller_test.go | 2 +- test/integration/framework/framework.go | 2 +- .../webhook.v2/clustertrainingruntime_test.go | 2 +- .../webhook.v2/trainingruntime_test.go | 2 +- 157 files changed, 1070 insertions(+), 1070 deletions(-) rename manifests/v2/base/crds/{kubeflow.org_clustertrainingruntimes.yaml => trainer.kubeflow.org_clustertrainingruntimes.yaml} (99%) rename manifests/v2/base/crds/{kubeflow.org_trainingruntimes.yaml => trainer.kubeflow.org_trainingruntimes.yaml} (99%) rename manifests/v2/base/crds/{kubeflow.org_trainjobs.yaml => trainer.kubeflow.org_trainjobs.yaml} (99%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/doc.go (95%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/groupversion_info.go (85%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/trainingruntime_types.go (100%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/trainjob_types.go (99%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/zz_generated.deepcopy.go (100%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/zz_generated.defaults.go (100%) rename pkg/apis/{kubeflow.org => trainer}/v2alpha1/zz_generated.openapi.go (81%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/clustertrainingruntime.go (99%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/containeroverride.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/coschedulingpodgrouppolicysource.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/datasetconfig.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/inputmodel.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/jobsettemplatespec.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/jobstatus.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/mlpolicy.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/mlpolicysource.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/modelconfig.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/mpimlpolicysource.go (97%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/outputmodel.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/podgrouppolicy.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/podgrouppolicysource.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/podspecoverride.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/podspecoverridetargetjob.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/runtimeref.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/torchelasticpolicy.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/torchmlpolicysource.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainer.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainingruntime.go (99%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainingruntimespec.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainjob.go (99%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainjobspec.go (100%) rename pkg/client/applyconfiguration/{kubeflow.org => trainer}/v2alpha1/trainjobstatus.go (100%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/clustertrainingruntime.go (80%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/doc.go (100%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/fake/doc.go (100%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/fake/fake_clustertrainingruntime.go (94%) rename pkg/client/clientset/versioned/typed/{kubeflow.org/v2alpha1/fake/fake_kubeflow.org_client.go => trainer/v2alpha1/fake/fake_trainer_client.go} (71%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/fake/fake_trainingruntime.go (94%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/fake/fake_trainjob.go (93%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/generated_expansion.go (100%) rename pkg/client/clientset/versioned/typed/{kubeflow.org/v2alpha1/kubeflow.org_client.go => trainer/v2alpha1/trainer_client.go} (64%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/trainingruntime.go (81%) rename pkg/client/clientset/versioned/typed/{kubeflow.org => trainer}/v2alpha1/trainjob.go (80%) rename pkg/client/informers/externalversions/{kubeflow.org => trainer}/interface.go (96%) rename pkg/client/informers/externalversions/{kubeflow.org => trainer}/v2alpha1/clustertrainingruntime.go (88%) rename pkg/client/informers/externalversions/{kubeflow.org => trainer}/v2alpha1/interface.go (100%) rename pkg/client/informers/externalversions/{kubeflow.org => trainer}/v2alpha1/trainingruntime.go (88%) rename pkg/client/informers/externalversions/{kubeflow.org => trainer}/v2alpha1/trainjob.go (89%) rename pkg/client/listers/{kubeflow.org => trainer}/v2alpha1/clustertrainingruntime.go (95%) rename pkg/client/listers/{kubeflow.org => trainer}/v2alpha1/expansion_generated.go (100%) rename pkg/client/listers/{kubeflow.org => trainer}/v2alpha1/trainingruntime.go (97%) rename pkg/client/listers/{kubeflow.org => trainer}/v2alpha1/trainjob.go (96%) delete mode 100644 sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeSpec.md rename sdk_v2/docs/{KubeflowOrgV2alpha1ClusterTrainingRuntime.md => TrainerV2alpha1ClusterTrainingRuntime.md} (88%) rename sdk_v2/docs/{KubeflowOrgV2alpha1ClusterTrainingRuntimeList.md => TrainerV2alpha1ClusterTrainingRuntimeList.md} (84%) rename sdk_v2/docs/{KubeflowOrgV2alpha1ContainerOverride.md => TrainerV2alpha1ContainerOverride.md} (97%) rename sdk_v2/docs/{KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md => TrainerV2alpha1CoschedulingPodGroupPolicySource.md} (92%) rename sdk_v2/docs/{KubeflowOrgV2alpha1DatasetConfig.md => TrainerV2alpha1DatasetConfig.md} (96%) rename sdk_v2/docs/{KubeflowOrgV2alpha1InputModel.md => TrainerV2alpha1InputModel.md} (95%) rename sdk_v2/docs/{KubeflowOrgV2alpha1JobSetTemplateSpec.md => TrainerV2alpha1JobSetTemplateSpec.md} (92%) rename sdk_v2/docs/{KubeflowOrgV2alpha1JobStatus.md => TrainerV2alpha1JobStatus.md} (96%) rename sdk_v2/docs/{KubeflowOrgV2alpha1MLPolicy.md => TrainerV2alpha1MLPolicy.md} (63%) rename sdk_v2/docs/{KubeflowOrgV2alpha1MLPolicySource.md => TrainerV2alpha1MLPolicySource.md} (60%) rename sdk_v2/docs/{KubeflowOrgV2alpha1MPIMLPolicySource.md => TrainerV2alpha1MPIMLPolicySource.md} (95%) rename sdk_v2/docs/{KubeflowOrgV2alpha1ModelConfig.md => TrainerV2alpha1ModelConfig.md} (58%) rename sdk_v2/docs/{KubeflowOrgV2alpha1OutputModel.md => TrainerV2alpha1OutputModel.md} (95%) rename sdk_v2/docs/{KubeflowOrgV2alpha1PodGroupPolicy.md => TrainerV2alpha1PodGroupPolicy.md} (65%) rename sdk_v2/docs/{KubeflowOrgV2alpha1PodGroupPolicySource.md => TrainerV2alpha1PodGroupPolicySource.md} (66%) rename sdk_v2/docs/{KubeflowOrgV2alpha1PodSpecOverride.md => TrainerV2alpha1PodSpecOverride.md} (55%) rename sdk_v2/docs/{KubeflowOrgV2alpha1PodSpecOverrideTargetJob.md => TrainerV2alpha1PodSpecOverrideTargetJob.md} (89%) rename sdk_v2/docs/{KubeflowOrgV2alpha1RuntimeRef.md => TrainerV2alpha1RuntimeRef.md} (88%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TorchElasticPolicy.md => TrainerV2alpha1TorchElasticPolicy.md} (97%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TorchMLPolicySource.md => TrainerV2alpha1TorchMLPolicySource.md} (79%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainJob.md => TrainerV2alpha1TrainJob.md} (81%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainJobList.md => TrainerV2alpha1TrainJobList.md} (88%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainJobSpec.md => TrainerV2alpha1TrainJobSpec.md} (69%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainJobStatus.md => TrainerV2alpha1TrainJobStatus.md} (69%) rename sdk_v2/docs/{KubeflowOrgV2alpha1Trainer.md => TrainerV2alpha1Trainer.md} (97%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainingRuntime.md => TrainerV2alpha1TrainingRuntime.md} (89%) rename sdk_v2/docs/{KubeflowOrgV2alpha1TrainingRuntimeList.md => TrainerV2alpha1TrainingRuntimeList.md} (86%) create mode 100644 sdk_v2/docs/TrainerV2alpha1TrainingRuntimeSpec.md rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_cluster_training_runtime.py => trainer_v2alpha1_cluster_training_runtime.py} (74%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_cluster_training_runtime_list.py => trainer_v2alpha1_cluster_training_runtime_list.py} (74%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_container_override.py => trainer_v2alpha1_container_override.py} (74%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_coscheduling_pod_group_policy_source.py => trainer_v2alpha1_coscheduling_pod_group_policy_source.py} (82%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_dataset_config.py => trainer_v2alpha1_dataset_config.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_input_model.py => trainer_v2alpha1_input_model.py} (78%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_job_set_template_spec.py => trainer_v2alpha1_job_set_template_spec.py} (78%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_job_status.py => trainer_v2alpha1_job_status.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_ml_policy.py => trainer_v2alpha1_ml_policy.py} (71%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_ml_policy_source.py => trainer_v2alpha1_ml_policy_source.py} (72%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_model_config.py => trainer_v2alpha1_model_config.py} (72%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_mpiml_policy_source.py => trainer_v2alpha1_mpiml_policy_source.py} (78%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_output_model.py => trainer_v2alpha1_output_model.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_pod_group_policy.py => trainer_v2alpha1_pod_group_policy.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_pod_group_policy_source.py => trainer_v2alpha1_pod_group_policy_source.py} (76%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_pod_spec_override.py => trainer_v2alpha1_pod_spec_override.py} (69%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_pod_spec_override_target_job.py => trainer_v2alpha1_pod_spec_override_target_job.py} (83%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_runtime_ref.py => trainer_v2alpha1_runtime_ref.py} (76%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_torch_elastic_policy.py => trainer_v2alpha1_torch_elastic_policy.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_torch_ml_policy_source.py => trainer_v2alpha1_torch_ml_policy_source.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_train_job.py => trainer_v2alpha1_train_job.py} (74%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_train_job_list.py => trainer_v2alpha1_train_job_list.py} (77%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_train_job_spec.py => trainer_v2alpha1_train_job_spec.py} (69%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_train_job_status.py => trainer_v2alpha1_train_job_status.py} (75%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_trainer.py => trainer_v2alpha1_trainer.py} (75%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_training_runtime.py => trainer_v2alpha1_training_runtime.py} (75%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_training_runtime_list.py => trainer_v2alpha1_training_runtime_list.py} (75%) rename sdk_v2/kubeflow/training/models/{kubeflow_org_v2alpha1_training_runtime_spec.py => trainer_v2alpha1_training_runtime_spec.py} (66%) diff --git a/Makefile b/Makefile index dcfa0507a5..50af559fec 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ scheduler-plugins-crd: ## Copy the CRDs from the Scheduler Plugins repository to .PHONY: manifests manifests: controller-gen ## Generate manifests. $(CONTROLLER_GEN) "crd:generateEmbeddedObjectMeta=true" rbac:roleName=training-operator-v2 webhook \ - paths="./pkg/apis/kubeflow.org/v2alpha1/...;./pkg/controller.v2/...;./pkg/runtime.v2/...;./pkg/webhooks.v2/...;./pkg/cert/..." \ + paths="./pkg/apis/trainer/v2alpha1/...;./pkg/controller.v2/...;./pkg/runtime.v2/...;./pkg/webhooks.v2/...;./pkg/cert/..." \ output:crd:artifacts:config=manifests/v2/base/crds \ output:rbac:artifacts:config=manifests/v2/base/rbac \ output:webhook:artifacts:config=manifests/v2/base/webhook @@ -102,7 +102,7 @@ endif # Instructions to run tests. .PHONY: test test: ## Run Go unit test. - go test ./pkg/apis/kubeflow.org/v2alpha1/... ./pkg/controller.v2/... ./pkg/runtime.v2/... ./pkg/webhooks.v2/... ./pkg/util.v2/... -coverprofile cover.out + go test ./pkg/apis/trainer/v2alpha1/... ./pkg/controller.v2/... ./pkg/runtime.v2/... ./pkg/webhooks.v2/... ./pkg/util.v2/... -coverprofile cover.out .PHONY: test-integration test-integration: envtest jobset-operator-crd scheduler-plugins-crd ## Run Go integration test. diff --git a/api.v2/openapi-spec/swagger.json b/api.v2/openapi-spec/swagger.json index 077820f620..2e351bd459 100644 --- a/api.v2/openapi-spec/swagger.json +++ b/api.v2/openapi-spec/swagger.json @@ -5,7 +5,7 @@ }, "paths": {}, "definitions": { - "kubeflow.org.v2alpha1.ClusterTrainingRuntime": { + "trainer.v2alpha1.ClusterTrainingRuntime": { "description": "ClusterTrainingRuntime represents a training runtime which can be referenced as part of `runtimeRef` API in TrainJob. This resource is a cluster-scoped and can be referenced by TrainJob that created in *any* namespace.", "type": "object", "properties": { @@ -25,11 +25,11 @@ "spec": { "description": "Specification of the desired ClusterTrainingRuntime.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainingRuntimeSpec" + "$ref": "#/definitions/trainer.v2alpha1.TrainingRuntimeSpec" } } }, - "kubeflow.org.v2alpha1.ClusterTrainingRuntimeList": { + "trainer.v2alpha1.ClusterTrainingRuntimeList": { "description": "ClusterTrainingRuntimeList is a collection of cluster training runtimes.", "type": "object", "required": [ @@ -45,7 +45,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.ClusterTrainingRuntime" + "$ref": "#/definitions/trainer.v2alpha1.ClusterTrainingRuntime" } }, "kind": { @@ -59,7 +59,7 @@ } } }, - "kubeflow.org.v2alpha1.ContainerOverride": { + "trainer.v2alpha1.ContainerOverride": { "description": "ContainerOverride represents parameters that can be overridden using PodSpecOverrides. Parameters from the Trainer, DatasetConfig, and ModelConfig will take precedence.", "type": "object", "required": [ @@ -124,7 +124,7 @@ } } }, - "kubeflow.org.v2alpha1.CoschedulingPodGroupPolicySource": { + "trainer.v2alpha1.CoschedulingPodGroupPolicySource": { "description": "CoschedulingPodGroupPolicySource represents configuration for coscheduling plugin. The number of min members in the PodGroupSpec is always equal to the number of nodes.", "type": "object", "properties": { @@ -135,7 +135,7 @@ } } }, - "kubeflow.org.v2alpha1.DatasetConfig": { + "trainer.v2alpha1.DatasetConfig": { "description": "DatasetConfig represents the desired dataset configuration. When this API is used, the training runtime must have the `dataset-initializer` container in the `Initializer` Job.", "type": "object", "properties": { @@ -161,7 +161,7 @@ } } }, - "kubeflow.org.v2alpha1.InputModel": { + "trainer.v2alpha1.InputModel": { "description": "InputModel represents the desired pre-trained model configuration.", "type": "object", "properties": { @@ -187,7 +187,7 @@ } } }, - "kubeflow.org.v2alpha1.JobSetTemplateSpec": { + "trainer.v2alpha1.JobSetTemplateSpec": { "description": "JobSetTemplateSpec represents a template of the desired JobSet.", "type": "object", "properties": { @@ -203,7 +203,7 @@ } } }, - "kubeflow.org.v2alpha1.JobStatus": { + "trainer.v2alpha1.JobStatus": { "type": "object", "required": [ "name", @@ -251,13 +251,13 @@ } } }, - "kubeflow.org.v2alpha1.MLPolicy": { + "trainer.v2alpha1.MLPolicy": { "description": "MLPolicy represents configuration for the model trining with ML-specific parameters.", "type": "object", "properties": { "mpi": { "description": "Configuration for the MPI Runtime.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.MPIMLPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.MPIMLPolicySource" }, "numNodes": { "description": "Number of training nodes. Defaults to 1.", @@ -266,25 +266,25 @@ }, "torch": { "description": "Configuration for the PyTorch runtime.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.TorchMLPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.TorchMLPolicySource" } } }, - "kubeflow.org.v2alpha1.MLPolicySource": { + "trainer.v2alpha1.MLPolicySource": { "description": "MLPolicySource represents the runtime-specific configuration for various technologies. One of the following specs can be set.", "type": "object", "properties": { "mpi": { "description": "Configuration for the MPI Runtime.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.MPIMLPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.MPIMLPolicySource" }, "torch": { "description": "Configuration for the PyTorch runtime.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.TorchMLPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.TorchMLPolicySource" } } }, - "kubeflow.org.v2alpha1.MPIMLPolicySource": { + "trainer.v2alpha1.MPIMLPolicySource": { "description": "MPIMLPolicySource represents a MPI runtime configuration.", "type": "object", "properties": { @@ -307,21 +307,21 @@ } } }, - "kubeflow.org.v2alpha1.ModelConfig": { + "trainer.v2alpha1.ModelConfig": { "description": "ModelConfig represents the desired model configuration.", "type": "object", "properties": { "input": { "description": "Configuration of the pre-trained model. When this API is used, the training runtime must have the `model-initializer` container in the `Initializer` Job.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.InputModel" + "$ref": "#/definitions/trainer.v2alpha1.InputModel" }, "output": { "description": "Configuration of the trained model. When this API is used, the training runtime must have the `model-exporter` container in the `Exporter` Job.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.OutputModel" + "$ref": "#/definitions/trainer.v2alpha1.OutputModel" } } }, - "kubeflow.org.v2alpha1.OutputModel": { + "trainer.v2alpha1.OutputModel": { "description": "OutputModel represents the desired trained model configuration.", "type": "object", "properties": { @@ -347,27 +347,27 @@ } } }, - "kubeflow.org.v2alpha1.PodGroupPolicy": { + "trainer.v2alpha1.PodGroupPolicy": { "description": "PodGroupPolicy represents a PodGroup configuration for gang-scheduling.", "type": "object", "properties": { "coscheduling": { "description": "Coscheduling plugin from the Kubernetes scheduler-plugins for gang-scheduling.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.CoschedulingPodGroupPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.CoschedulingPodGroupPolicySource" } } }, - "kubeflow.org.v2alpha1.PodGroupPolicySource": { + "trainer.v2alpha1.PodGroupPolicySource": { "description": "PodGroupPolicySource represents supported plugins for gang-scheduling. Only one of its members may be specified.", "type": "object", "properties": { "coscheduling": { "description": "Coscheduling plugin from the Kubernetes scheduler-plugins for gang-scheduling.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.CoschedulingPodGroupPolicySource" + "$ref": "#/definitions/trainer.v2alpha1.CoschedulingPodGroupPolicySource" } } }, - "kubeflow.org.v2alpha1.PodSpecOverride": { + "trainer.v2alpha1.PodSpecOverride": { "description": "PodSpecOverride represents the custom overrides that will be applied for the TrainJob's resources.", "type": "object", "required": [ @@ -379,7 +379,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.ContainerOverride" + "$ref": "#/definitions/trainer.v2alpha1.ContainerOverride" }, "x-kubernetes-list-map-keys": [ "name" @@ -391,7 +391,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.ContainerOverride" + "$ref": "#/definitions/trainer.v2alpha1.ContainerOverride" }, "x-kubernetes-list-map-keys": [ "name" @@ -415,7 +415,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.PodSpecOverrideTargetJob" + "$ref": "#/definitions/trainer.v2alpha1.PodSpecOverrideTargetJob" }, "x-kubernetes-list-type": "atomic" }, @@ -442,7 +442,7 @@ } } }, - "kubeflow.org.v2alpha1.PodSpecOverrideTargetJob": { + "trainer.v2alpha1.PodSpecOverrideTargetJob": { "type": "object", "required": [ "name" @@ -455,7 +455,7 @@ } } }, - "kubeflow.org.v2alpha1.RuntimeRef": { + "trainer.v2alpha1.RuntimeRef": { "description": "RuntimeRef represents the reference to the existing training runtime.", "type": "object", "required": [ @@ -463,7 +463,7 @@ ], "properties": { "apiGroup": { - "description": "APIGroup of the runtime being referenced. Defaults to `kubeflow.org`.", + "description": "APIGroup of the runtime being referenced. Defaults to `trainer.kubeflow.org`.", "type": "string" }, "kind": { @@ -477,7 +477,7 @@ } } }, - "kubeflow.org.v2alpha1.TorchElasticPolicy": { + "trainer.v2alpha1.TorchElasticPolicy": { "description": "TorchElasticPolicy represents a configuration for the PyTorch elastic training. If this policy is set, the `.spec.numNodes` parameter must be omitted, since min and max node is used to configure the `torchrun` CLI argument: `--nnodes=minNodes:maxNodes`. Only `c10d` backend is supported for the Rendezvous communication.", "type": "object", "properties": { @@ -507,13 +507,13 @@ } } }, - "kubeflow.org.v2alpha1.TorchMLPolicySource": { + "trainer.v2alpha1.TorchMLPolicySource": { "description": "TorchMLPolicySource represents a PyTorch runtime configuration.", "type": "object", "properties": { "elasticPolicy": { "description": "Elastic policy for the PyTorch training.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.TorchElasticPolicy" + "$ref": "#/definitions/trainer.v2alpha1.TorchElasticPolicy" }, "numProcPerNode": { "description": "Number of processes per node. This value is inserted into the `--nproc-per-node` argument of the `torchrun` CLI. Supported values: `auto`, `cpu`, `gpu`, or int value. Defaults to `auto`.", @@ -521,7 +521,7 @@ } } }, - "kubeflow.org.v2alpha1.TrainJob": { + "trainer.v2alpha1.TrainJob": { "description": "TrainJob represents configuration of a training job.", "type": "object", "properties": { @@ -541,16 +541,16 @@ "spec": { "description": "Specification of the desired TrainJob.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainJobSpec" + "$ref": "#/definitions/trainer.v2alpha1.TrainJobSpec" }, "status": { "description": "Current status of TrainJob.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainJobStatus" + "$ref": "#/definitions/trainer.v2alpha1.TrainJobStatus" } } }, - "kubeflow.org.v2alpha1.TrainJobList": { + "trainer.v2alpha1.TrainJobList": { "description": "TrainJobList is a collection of training jobs.", "type": "object", "required": [ @@ -566,7 +566,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainJob" + "$ref": "#/definitions/trainer.v2alpha1.TrainJob" } }, "kind": { @@ -580,7 +580,7 @@ } } }, - "kubeflow.org.v2alpha1.TrainJobSpec": { + "trainer.v2alpha1.TrainJobSpec": { "description": "TrainJobSpec represents specification of the desired TrainJob.", "type": "object", "required": [ @@ -597,7 +597,7 @@ }, "datasetConfig": { "description": "Configuration of the training dataset.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.DatasetConfig" + "$ref": "#/definitions/trainer.v2alpha1.DatasetConfig" }, "labels": { "description": "Labels to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values.", @@ -613,21 +613,21 @@ }, "modelConfig": { "description": "Configuration of the pre-trained and trained model.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.ModelConfig" + "$ref": "#/definitions/trainer.v2alpha1.ModelConfig" }, "podSpecOverrides": { "description": "Custom overrides for the training runtime.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.PodSpecOverride" + "$ref": "#/definitions/trainer.v2alpha1.PodSpecOverride" }, "x-kubernetes-list-type": "atomic" }, "runtimeRef": { "description": "Reference to the training runtime. The field is immutable.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.RuntimeRef" + "$ref": "#/definitions/trainer.v2alpha1.RuntimeRef" }, "suspend": { "description": "Whether the controller should suspend the running TrainJob. Defaults to false.", @@ -635,11 +635,11 @@ }, "trainer": { "description": "Configuration of the desired trainer.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.Trainer" + "$ref": "#/definitions/trainer.v2alpha1.Trainer" } } }, - "kubeflow.org.v2alpha1.TrainJobStatus": { + "trainer.v2alpha1.TrainJobStatus": { "description": "TrainJobStatus represents the current status of TrainJob.", "type": "object", "properties": { @@ -662,7 +662,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.JobStatus" + "$ref": "#/definitions/trainer.v2alpha1.JobStatus" }, "x-kubernetes-list-map-keys": [ "name" @@ -671,7 +671,7 @@ } } }, - "kubeflow.org.v2alpha1.Trainer": { + "trainer.v2alpha1.Trainer": { "description": "Trainer represents the desired trainer configuration. Every training runtime contains `trainer` container which represents Trainer.", "type": "object", "properties": { @@ -724,7 +724,7 @@ } } }, - "kubeflow.org.v2alpha1.TrainingRuntime": { + "trainer.v2alpha1.TrainingRuntime": { "description": "TrainingRuntime represents a training runtime which can be referenced as part of `runtimeRef` API in TrainJob. This resource is a namespaced-scoped and can be referenced by TrainJob that created in the *same* namespace as the TrainingRuntime.", "type": "object", "properties": { @@ -744,11 +744,11 @@ "spec": { "description": "Specification of the desired TrainingRuntime.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainingRuntimeSpec" + "$ref": "#/definitions/trainer.v2alpha1.TrainingRuntimeSpec" } } }, - "kubeflow.org.v2alpha1.TrainingRuntimeList": { + "trainer.v2alpha1.TrainingRuntimeList": { "description": "TrainingRuntimeList is a collection of training runtimes.", "type": "object", "required": [ @@ -764,7 +764,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.TrainingRuntime" + "$ref": "#/definitions/trainer.v2alpha1.TrainingRuntime" } }, "kind": { @@ -778,7 +778,7 @@ } } }, - "kubeflow.org.v2alpha1.TrainingRuntimeSpec": { + "trainer.v2alpha1.TrainingRuntimeSpec": { "description": "TrainingRuntimeSpec represents a specification of the desired training runtime.", "type": "object", "required": [ @@ -787,16 +787,16 @@ "properties": { "mlPolicy": { "description": "Configuration for the model training with ML-specific parameters.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.MLPolicy" + "$ref": "#/definitions/trainer.v2alpha1.MLPolicy" }, "podGroupPolicy": { "description": "Configuration for the PodGroup to enable gang-scheduling via supported plugins.", - "$ref": "#/definitions/kubeflow.org.v2alpha1.PodGroupPolicy" + "$ref": "#/definitions/trainer.v2alpha1.PodGroupPolicy" }, "template": { "description": "JobSet template which will be used by TrainJob.", "default": {}, - "$ref": "#/definitions/kubeflow.org.v2alpha1.JobSetTemplateSpec" + "$ref": "#/definitions/trainer.v2alpha1.JobSetTemplateSpec" } } } diff --git a/cmd/training-operator.v2alpha1/main.go b/cmd/training-operator.v2alpha1/main.go index 37b00571bb..b122507907 100644 --- a/cmd/training-operator.v2alpha1/main.go +++ b/cmd/training-operator.v2alpha1/main.go @@ -37,7 +37,7 @@ import ( jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/cert" controllerv2 "github.com/kubeflow/training-operator/pkg/controller.v2" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" diff --git a/docs/proposals/2170-kubeflow-training-v2/README.md b/docs/proposals/2170-kubeflow-training-v2/README.md index f3628ec60c..95381432f9 100644 --- a/docs/proposals/2170-kubeflow-training-v2/README.md +++ b/docs/proposals/2170-kubeflow-training-v2/README.md @@ -363,7 +363,7 @@ type RuntimeRef struct { Name string `json:"name"` // APIGroup of the runtime being referenced. - // Defaults to `kubeflow.org`. + // Defaults to `trainer.kubeflow.org`. APIGroup *string `json:"apiGroup,omitempty"` // Kind of the runtime being referenced. @@ -462,7 +462,7 @@ This table explains the rationale for each `TrainJob` parameter: ### Example of TrainJob ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: TrainJob metadata: name: torch-ddp @@ -520,7 +520,7 @@ TrainingClient().train( This example shows how to create `TrainJob` to fine-tune LLama 7b: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: TrainJob metadata: name: tune-llama-with-yelp @@ -761,7 +761,7 @@ After initial implementation of `TrainJob` and `TrainingRuntime`, we will suppor export the trained model. The following runtime can be implemented: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-tune-llama-7b-export @@ -927,7 +927,7 @@ This example shows how to override the user-identity for the sidecar container a trainer container. ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: TrainJob metadata: name: pytorch-distributed @@ -1126,7 +1126,7 @@ The following example shows example of runtime with gang-scheduling using cosche scheduler is not the same as `PodGroup` plugin. ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-distributed-multi-node @@ -1279,7 +1279,7 @@ Kubeflow community are planning to support the following runtimes. Initially, we will maintain only multi-node multi-worker runtime and PyTorch Elastic. ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-distributed-multi-node @@ -1311,7 +1311,7 @@ spec: Example of usage: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: TrainJob metadata: name: torch-test @@ -1332,7 +1332,7 @@ spec: Training runtime for PyTorch Elastic: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-distributed-elastic @@ -1376,7 +1376,7 @@ The following runtimes can be maintained in the future. Single worker training: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-simple @@ -1399,7 +1399,7 @@ spec: Single node multi worker training: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-distributed-single-worker @@ -1437,7 +1437,7 @@ for Fine-Tuning with PyTorch. The following runtime can be used for the Llama 7b model. ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-tune-llama-7b @@ -1522,7 +1522,7 @@ spec: The following runtime can be used for Gemma fine-tuning. ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: torch-tune-gemma-7b @@ -1638,7 +1638,7 @@ and [DeepSpeed](https://www.deepspeed.ai/training/) using the MPI Runtime. Example of simple OpenMPI runtime: ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: ClusterTrainingRuntime metadata: name: deepspeed @@ -1739,7 +1739,7 @@ spec: ``` ```yaml -apiVersion: kubeflow.org/v2alpha1 +apiVersion: trainer.kubeflow.org/v2alpha1 kind: TrainingRuntime metadata: name: torch-distributed-multi-node diff --git a/hack/swagger-v2/main.go b/hack/swagger-v2/main.go index 069656a0ea..33259eba01 100644 --- a/hack/swagger-v2/main.go +++ b/hack/swagger-v2/main.go @@ -25,7 +25,7 @@ import ( "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) // Generate Kubeflow Training OpenAPI specification. diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index df640f1ed7..291e3735f4 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -55,11 +55,11 @@ echo ">> Using ${OPENAPI_PKG}" echo "Generating OpenAPI specification for kubeflow.org/v2alpha1" go run ${OPENAPI_PKG}/cmd/openapi-gen \ --go-header-file "${TRAINING_OPERATOR_ROOT}/hack/boilerplate/boilerplate.go.txt" \ - --output-pkg "${TRAINING_OPERATOR_PKG}/pkg/apis/kubeflow.org/v2alpha1" \ - --output-dir "${TRAINING_OPERATOR_ROOT}/pkg/apis/kubeflow.org/v2alpha1" \ + --output-pkg "${TRAINING_OPERATOR_PKG}/pkg/apis/trainer/v2alpha1" \ + --output-dir "${TRAINING_OPERATOR_ROOT}/pkg/apis/trainer/v2alpha1" \ --output-file "zz_generated.openapi.go" \ --report-filename "${TRAINING_OPERATOR_ROOT}/hack/violation_exception_v2alpha1.list" \ - "${TRAINING_OPERATOR_ROOT}/pkg/apis/kubeflow.org/v2alpha1" + "${TRAINING_OPERATOR_ROOT}/pkg/apis/trainer/v2alpha1" # Generating OpenAPI Swagger for Kubeflow Trainer V2. echo "Generate OpenAPI Swagger for kubeflow.org/v2alpha1" diff --git a/manifests/v2/base/crds/kustomization.yaml b/manifests/v2/base/crds/kustomization.yaml index e032a0c16c..8200101ab7 100644 --- a/manifests/v2/base/crds/kustomization.yaml +++ b/manifests/v2/base/crds/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - kubeflow.org_clustertrainingruntimes.yaml - - kubeflow.org_trainingruntimes.yaml - - kubeflow.org_trainjobs.yaml + - trainer.kubeflow.org_clustertrainingruntimes.yaml + - trainer.kubeflow.org_trainingruntimes.yaml + - trainer.kubeflow.org_trainjobs.yaml diff --git a/manifests/v2/base/crds/kubeflow.org_clustertrainingruntimes.yaml b/manifests/v2/base/crds/trainer.kubeflow.org_clustertrainingruntimes.yaml similarity index 99% rename from manifests/v2/base/crds/kubeflow.org_clustertrainingruntimes.yaml rename to manifests/v2/base/crds/trainer.kubeflow.org_clustertrainingruntimes.yaml index 4d281801c1..503a732288 100644 --- a/manifests/v2/base/crds/kubeflow.org_clustertrainingruntimes.yaml +++ b/manifests/v2/base/crds/trainer.kubeflow.org_clustertrainingruntimes.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - name: clustertrainingruntimes.kubeflow.org + name: clustertrainingruntimes.trainer.kubeflow.org spec: - group: kubeflow.org + group: trainer.kubeflow.org names: kind: ClusterTrainingRuntime listKind: ClusterTrainingRuntimeList diff --git a/manifests/v2/base/crds/kubeflow.org_trainingruntimes.yaml b/manifests/v2/base/crds/trainer.kubeflow.org_trainingruntimes.yaml similarity index 99% rename from manifests/v2/base/crds/kubeflow.org_trainingruntimes.yaml rename to manifests/v2/base/crds/trainer.kubeflow.org_trainingruntimes.yaml index 0ae165315c..88091f47e8 100644 --- a/manifests/v2/base/crds/kubeflow.org_trainingruntimes.yaml +++ b/manifests/v2/base/crds/trainer.kubeflow.org_trainingruntimes.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - name: trainingruntimes.kubeflow.org + name: trainingruntimes.trainer.kubeflow.org spec: - group: kubeflow.org + group: trainer.kubeflow.org names: kind: TrainingRuntime listKind: TrainingRuntimeList diff --git a/manifests/v2/base/crds/kubeflow.org_trainjobs.yaml b/manifests/v2/base/crds/trainer.kubeflow.org_trainjobs.yaml similarity index 99% rename from manifests/v2/base/crds/kubeflow.org_trainjobs.yaml rename to manifests/v2/base/crds/trainer.kubeflow.org_trainjobs.yaml index 037e04191d..a4947f3670 100644 --- a/manifests/v2/base/crds/kubeflow.org_trainjobs.yaml +++ b/manifests/v2/base/crds/trainer.kubeflow.org_trainjobs.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - name: trainjobs.kubeflow.org + name: trainjobs.trainer.kubeflow.org spec: - group: kubeflow.org + group: trainer.kubeflow.org names: kind: TrainJob listKind: TrainJobList @@ -2961,10 +2961,10 @@ spec: The field is immutable. properties: apiGroup: - default: kubeflow.org + default: trainer.kubeflow.org description: |- APIGroup of the runtime being referenced. - Defaults to `kubeflow.org`. + Defaults to `trainer.kubeflow.org`. type: string kind: default: ClusterTrainingRuntime diff --git a/pkg/apis/kubeflow.org/v2alpha1/doc.go b/pkg/apis/trainer/v2alpha1/doc.go similarity index 95% rename from pkg/apis/kubeflow.org/v2alpha1/doc.go rename to pkg/apis/trainer/v2alpha1/doc.go index f2bda23573..6cf8659bf1 100644 --- a/pkg/apis/kubeflow.org/v2alpha1/doc.go +++ b/pkg/apis/trainer/v2alpha1/doc.go @@ -17,6 +17,6 @@ // +k8s:deepcopy-gen=package // Package v2alpha1 is the v2alpha1 version of the API. -// +groupName=kubeflow.org +// +groupName=trainer.kubeflow.org package v2alpha1 diff --git a/pkg/apis/kubeflow.org/v2alpha1/groupversion_info.go b/pkg/apis/trainer/v2alpha1/groupversion_info.go similarity index 85% rename from pkg/apis/kubeflow.org/v2alpha1/groupversion_info.go rename to pkg/apis/trainer/v2alpha1/groupversion_info.go index d6a4656b97..ed324cb2cc 100644 --- a/pkg/apis/kubeflow.org/v2alpha1/groupversion_info.go +++ b/pkg/apis/trainer/v2alpha1/groupversion_info.go @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v2alpha1 contains API Schema definitions for the kubeflow.org v2alpha1 API group +// Package v2alpha1 contains API Schema definitions for the trainer.kubeflow.org v2alpha1 API group // +kubebuilder:object:generate=true -// +groupName=kubeflow.org +// +groupName=trainer.kubeflow.org package v2alpha1 import ( @@ -26,7 +26,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "kubeflow.org", Version: "v2alpha1"} + GroupVersion = schema.GroupVersion{Group: "trainer.kubeflow.org", Version: "v2alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme. SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/pkg/apis/kubeflow.org/v2alpha1/trainingruntime_types.go b/pkg/apis/trainer/v2alpha1/trainingruntime_types.go similarity index 100% rename from pkg/apis/kubeflow.org/v2alpha1/trainingruntime_types.go rename to pkg/apis/trainer/v2alpha1/trainingruntime_types.go diff --git a/pkg/apis/kubeflow.org/v2alpha1/trainjob_types.go b/pkg/apis/trainer/v2alpha1/trainjob_types.go similarity index 99% rename from pkg/apis/kubeflow.org/v2alpha1/trainjob_types.go rename to pkg/apis/trainer/v2alpha1/trainjob_types.go index 04f995c1fa..d594af460c 100644 --- a/pkg/apis/kubeflow.org/v2alpha1/trainjob_types.go +++ b/pkg/apis/trainer/v2alpha1/trainjob_types.go @@ -154,8 +154,8 @@ type RuntimeRef struct { Name string `json:"name"` // APIGroup of the runtime being referenced. - // Defaults to `kubeflow.org`. - // +kubebuilder:default="kubeflow.org" + // Defaults to `trainer.kubeflow.org`. + // +kubebuilder:default="trainer.kubeflow.org" APIGroup *string `json:"apiGroup,omitempty"` // Kind of the runtime being referenced. diff --git a/pkg/apis/kubeflow.org/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/trainer/v2alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/kubeflow.org/v2alpha1/zz_generated.deepcopy.go rename to pkg/apis/trainer/v2alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/kubeflow.org/v2alpha1/zz_generated.defaults.go b/pkg/apis/trainer/v2alpha1/zz_generated.defaults.go similarity index 100% rename from pkg/apis/kubeflow.org/v2alpha1/zz_generated.defaults.go rename to pkg/apis/trainer/v2alpha1/zz_generated.defaults.go diff --git a/pkg/apis/kubeflow.org/v2alpha1/zz_generated.openapi.go b/pkg/apis/trainer/v2alpha1/zz_generated.openapi.go similarity index 81% rename from pkg/apis/kubeflow.org/v2alpha1/zz_generated.openapi.go rename to pkg/apis/trainer/v2alpha1/zz_generated.openapi.go index 5248d0ef02..7e7e669529 100644 --- a/pkg/apis/kubeflow.org/v2alpha1/zz_generated.openapi.go +++ b/pkg/apis/trainer/v2alpha1/zz_generated.openapi.go @@ -26,38 +26,38 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ClusterTrainingRuntime": schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntime(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ClusterTrainingRuntimeList": schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntimeList(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ContainerOverride": schema_pkg_apis_kubefloworg_v2alpha1_ContainerOverride(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.CoschedulingPodGroupPolicySource": schema_pkg_apis_kubefloworg_v2alpha1_CoschedulingPodGroupPolicySource(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.DatasetConfig": schema_pkg_apis_kubefloworg_v2alpha1_DatasetConfig(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.InputModel": schema_pkg_apis_kubefloworg_v2alpha1_InputModel(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobSetTemplateSpec": schema_pkg_apis_kubefloworg_v2alpha1_JobSetTemplateSpec(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobStatus": schema_pkg_apis_kubefloworg_v2alpha1_JobStatus(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MLPolicy": schema_pkg_apis_kubefloworg_v2alpha1_MLPolicy(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MLPolicySource": schema_pkg_apis_kubefloworg_v2alpha1_MLPolicySource(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MPIMLPolicySource": schema_pkg_apis_kubefloworg_v2alpha1_MPIMLPolicySource(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ModelConfig": schema_pkg_apis_kubefloworg_v2alpha1_ModelConfig(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.OutputModel": schema_pkg_apis_kubefloworg_v2alpha1_OutputModel(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodGroupPolicy": schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicy(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodGroupPolicySource": schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicySource(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverride": schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverrideTargetJob": schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverrideTargetJob(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.RuntimeRef": schema_pkg_apis_kubefloworg_v2alpha1_RuntimeRef(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchElasticPolicy": schema_pkg_apis_kubefloworg_v2alpha1_TorchElasticPolicy(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchMLPolicySource": schema_pkg_apis_kubefloworg_v2alpha1_TorchMLPolicySource(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJob": schema_pkg_apis_kubefloworg_v2alpha1_TrainJob(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobList": schema_pkg_apis_kubefloworg_v2alpha1_TrainJobList(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobSpec": schema_pkg_apis_kubefloworg_v2alpha1_TrainJobSpec(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobStatus": schema_pkg_apis_kubefloworg_v2alpha1_TrainJobStatus(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.Trainer": schema_pkg_apis_kubefloworg_v2alpha1_Trainer(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntime": schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntime(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeList": schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeList(ref), - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeSpec": schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeSpec(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ClusterTrainingRuntime": schema_pkg_apis_trainer_v2alpha1_ClusterTrainingRuntime(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ClusterTrainingRuntimeList": schema_pkg_apis_trainer_v2alpha1_ClusterTrainingRuntimeList(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ContainerOverride": schema_pkg_apis_trainer_v2alpha1_ContainerOverride(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.CoschedulingPodGroupPolicySource": schema_pkg_apis_trainer_v2alpha1_CoschedulingPodGroupPolicySource(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.DatasetConfig": schema_pkg_apis_trainer_v2alpha1_DatasetConfig(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.InputModel": schema_pkg_apis_trainer_v2alpha1_InputModel(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobSetTemplateSpec": schema_pkg_apis_trainer_v2alpha1_JobSetTemplateSpec(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobStatus": schema_pkg_apis_trainer_v2alpha1_JobStatus(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MLPolicy": schema_pkg_apis_trainer_v2alpha1_MLPolicy(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MLPolicySource": schema_pkg_apis_trainer_v2alpha1_MLPolicySource(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MPIMLPolicySource": schema_pkg_apis_trainer_v2alpha1_MPIMLPolicySource(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ModelConfig": schema_pkg_apis_trainer_v2alpha1_ModelConfig(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.OutputModel": schema_pkg_apis_trainer_v2alpha1_OutputModel(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodGroupPolicy": schema_pkg_apis_trainer_v2alpha1_PodGroupPolicy(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodGroupPolicySource": schema_pkg_apis_trainer_v2alpha1_PodGroupPolicySource(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverride": schema_pkg_apis_trainer_v2alpha1_PodSpecOverride(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverrideTargetJob": schema_pkg_apis_trainer_v2alpha1_PodSpecOverrideTargetJob(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.RuntimeRef": schema_pkg_apis_trainer_v2alpha1_RuntimeRef(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchElasticPolicy": schema_pkg_apis_trainer_v2alpha1_TorchElasticPolicy(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchMLPolicySource": schema_pkg_apis_trainer_v2alpha1_TorchMLPolicySource(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJob": schema_pkg_apis_trainer_v2alpha1_TrainJob(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobList": schema_pkg_apis_trainer_v2alpha1_TrainJobList(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobSpec": schema_pkg_apis_trainer_v2alpha1_TrainJobSpec(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobStatus": schema_pkg_apis_trainer_v2alpha1_TrainJobStatus(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.Trainer": schema_pkg_apis_trainer_v2alpha1_Trainer(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntime": schema_pkg_apis_trainer_v2alpha1_TrainingRuntime(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeList": schema_pkg_apis_trainer_v2alpha1_TrainingRuntimeList(ref), + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeSpec": schema_pkg_apis_trainer_v2alpha1_TrainingRuntimeSpec(ref), } } -func schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntime(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_ClusterTrainingRuntime(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -89,18 +89,18 @@ func schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntime(ref common.Refe SchemaProps: spec.SchemaProps{ Description: "Specification of the desired ClusterTrainingRuntime.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeSpec"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntimeList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_ClusterTrainingRuntimeList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -136,7 +136,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntimeList(ref common. Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ClusterTrainingRuntime"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ClusterTrainingRuntime"), }, }, }, @@ -147,11 +147,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_ClusterTrainingRuntimeList(ref common. }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ClusterTrainingRuntime", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ClusterTrainingRuntime", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_ContainerOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_ContainerOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -278,7 +278,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_ContainerOverride(ref common.Reference } } -func schema_pkg_apis_kubefloworg_v2alpha1_CoschedulingPodGroupPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_CoschedulingPodGroupPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -298,7 +298,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_CoschedulingPodGroupPolicySource(ref c } } -func schema_pkg_apis_kubefloworg_v2alpha1_DatasetConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_DatasetConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -348,7 +348,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_DatasetConfig(ref common.ReferenceCall } } -func schema_pkg_apis_kubefloworg_v2alpha1_InputModel(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_InputModel(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -398,7 +398,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_InputModel(ref common.ReferenceCallbac } } -func schema_pkg_apis_kubefloworg_v2alpha1_JobSetTemplateSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_JobSetTemplateSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -427,7 +427,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_JobSetTemplateSpec(ref common.Referenc } } -func schema_pkg_apis_kubefloworg_v2alpha1_JobStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_JobStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -488,7 +488,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_JobStatus(ref common.ReferenceCallback } } -func schema_pkg_apis_kubefloworg_v2alpha1_MLPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_MLPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -505,24 +505,24 @@ func schema_pkg_apis_kubefloworg_v2alpha1_MLPolicy(ref common.ReferenceCallback) "torch": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the PyTorch runtime.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchMLPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchMLPolicySource"), }, }, "mpi": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the MPI Runtime.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MPIMLPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MPIMLPolicySource"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MPIMLPolicySource", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchMLPolicySource"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MPIMLPolicySource", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchMLPolicySource"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_MLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_MLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -532,24 +532,24 @@ func schema_pkg_apis_kubefloworg_v2alpha1_MLPolicySource(ref common.ReferenceCal "torch": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the PyTorch runtime.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchMLPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchMLPolicySource"), }, }, "mpi": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the MPI Runtime.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MPIMLPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MPIMLPolicySource"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MPIMLPolicySource", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchMLPolicySource"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MPIMLPolicySource", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchMLPolicySource"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_MPIMLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_MPIMLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -590,7 +590,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_MPIMLPolicySource(ref common.Reference } } -func schema_pkg_apis_kubefloworg_v2alpha1_ModelConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_ModelConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -600,24 +600,24 @@ func schema_pkg_apis_kubefloworg_v2alpha1_ModelConfig(ref common.ReferenceCallba "input": { SchemaProps: spec.SchemaProps{ Description: "Configuration of the pre-trained model. When this API is used, the training runtime must have the `model-initializer` container in the `Initializer` Job.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.InputModel"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.InputModel"), }, }, "output": { SchemaProps: spec.SchemaProps{ Description: "Configuration of the trained model. When this API is used, the training runtime must have the `model-exporter` container in the `Exporter` Job.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.OutputModel"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.OutputModel"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.InputModel", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.OutputModel"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.InputModel", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.OutputModel"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_OutputModel(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_OutputModel(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -667,7 +667,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_OutputModel(ref common.ReferenceCallba } } -func schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_PodGroupPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -677,18 +677,18 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicy(ref common.ReferenceCal "coscheduling": { SchemaProps: spec.SchemaProps{ Description: "Coscheduling plugin from the Kubernetes scheduler-plugins for gang-scheduling.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.CoschedulingPodGroupPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.CoschedulingPodGroupPolicySource"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.CoschedulingPodGroupPolicySource"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.CoschedulingPodGroupPolicySource"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_PodGroupPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -698,18 +698,18 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodGroupPolicySource(ref common.Refere "coscheduling": { SchemaProps: spec.SchemaProps{ Description: "Coscheduling plugin from the Kubernetes scheduler-plugins for gang-scheduling.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.CoschedulingPodGroupPolicySource"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.CoschedulingPodGroupPolicySource"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.CoschedulingPodGroupPolicySource"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.CoschedulingPodGroupPolicySource"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_PodSpecOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -729,7 +729,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverrideTargetJob"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverrideTargetJob"), }, }, }, @@ -751,7 +751,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ContainerOverride"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ContainerOverride"), }, }, }, @@ -773,7 +773,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ContainerOverride"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ContainerOverride"), }, }, }, @@ -848,11 +848,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverride(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ContainerOverride", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverrideTargetJob", "k8s.io/api/core/v1.Toleration", "k8s.io/api/core/v1.Volume"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ContainerOverride", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverrideTargetJob", "k8s.io/api/core/v1.Toleration", "k8s.io/api/core/v1.Volume"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverrideTargetJob(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_PodSpecOverrideTargetJob(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -873,7 +873,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_PodSpecOverrideTargetJob(ref common.Re } } -func schema_pkg_apis_kubefloworg_v2alpha1_RuntimeRef(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_RuntimeRef(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -890,7 +890,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_RuntimeRef(ref common.ReferenceCallbac }, "apiGroup": { SchemaProps: spec.SchemaProps{ - Description: "APIGroup of the runtime being referenced. Defaults to `kubeflow.org`.", + Description: "APIGroup of the runtime being referenced. Defaults to `trainer.kubeflow.org`.", Type: []string{"string"}, Format: "", }, @@ -909,7 +909,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_RuntimeRef(ref common.ReferenceCallbac } } -func schema_pkg_apis_kubefloworg_v2alpha1_TorchElasticPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TorchElasticPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -964,7 +964,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TorchElasticPolicy(ref common.Referenc } } -func schema_pkg_apis_kubefloworg_v2alpha1_TorchMLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TorchMLPolicySource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -981,18 +981,18 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TorchMLPolicySource(ref common.Referen "elasticPolicy": { SchemaProps: spec.SchemaProps{ Description: "Elastic policy for the PyTorch training.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchElasticPolicy"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchElasticPolicy"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TorchElasticPolicy"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TorchElasticPolicy"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainJob(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainJob(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1024,25 +1024,25 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJob(ref common.ReferenceCallback) SchemaProps: spec.SchemaProps{ Description: "Specification of the desired TrainJob.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobSpec"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "Current status of TrainJob.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobStatus"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobSpec", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJobStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobSpec", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJobStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainJobList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1078,7 +1078,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobList(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJob"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJob"), }, }, }, @@ -1089,11 +1089,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobList(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainJob", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainJob", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainJobSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1104,25 +1104,25 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobSpec(ref common.ReferenceCallb SchemaProps: spec.SchemaProps{ Description: "Reference to the training runtime. The field is immutable.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.RuntimeRef"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.RuntimeRef"), }, }, "trainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration of the desired trainer.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.Trainer"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.Trainer"), }, }, "datasetConfig": { SchemaProps: spec.SchemaProps{ Description: "Configuration of the training dataset.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.DatasetConfig"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.DatasetConfig"), }, }, "modelConfig": { SchemaProps: spec.SchemaProps{ Description: "Configuration of the pre-trained and trained model.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ModelConfig"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ModelConfig"), }, }, "labels": { @@ -1170,7 +1170,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobSpec(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverride"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverride"), }, }, }, @@ -1195,11 +1195,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobSpec(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.DatasetConfig", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.ModelConfig", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodSpecOverride", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.RuntimeRef", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.Trainer"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.DatasetConfig", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.ModelConfig", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodSpecOverride", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.RuntimeRef", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.Trainer"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainJobStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1246,7 +1246,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobStatus(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobStatus"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobStatus"), }, }, }, @@ -1256,11 +1256,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainJobStatus(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_Trainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_Trainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1364,7 +1364,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_Trainer(ref common.ReferenceCallback) } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntime(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainingRuntime(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1396,18 +1396,18 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntime(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Description: "Specification of the desired TrainingRuntime.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeSpec"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntimeSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntimeSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainingRuntimeList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1443,7 +1443,7 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeList(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntime"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntime"), }, }, }, @@ -1454,11 +1454,11 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeList(ref common.Referen }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.TrainingRuntime", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.TrainingRuntime", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_trainer_v2alpha1_TrainingRuntimeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1468,20 +1468,20 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeSpec(ref common.Referen "mlPolicy": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the model training with ML-specific parameters.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MLPolicy"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MLPolicy"), }, }, "podGroupPolicy": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the PodGroup to enable gang-scheduling via supported plugins.", - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodGroupPolicy"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodGroupPolicy"), }, }, "template": { SchemaProps: spec.SchemaProps{ Description: "JobSet template which will be used by TrainJob.", Default: map[string]interface{}{}, - Ref: ref("github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobSetTemplateSpec"), + Ref: ref("github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobSetTemplateSpec"), }, }, }, @@ -1489,6 +1489,6 @@ func schema_pkg_apis_kubefloworg_v2alpha1_TrainingRuntimeSpec(ref common.Referen }, }, Dependencies: []string{ - "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.JobSetTemplateSpec", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.MLPolicy", "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1.PodGroupPolicy"}, + "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.JobSetTemplateSpec", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.MLPolicy", "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1.PodGroupPolicy"}, } } diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/clustertrainingruntime.go b/pkg/client/applyconfiguration/trainer/v2alpha1/clustertrainingruntime.go similarity index 99% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/clustertrainingruntime.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/clustertrainingruntime.go index 975aff515f..d036f3adb1 100644 --- a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/clustertrainingruntime.go +++ b/pkg/client/applyconfiguration/trainer/v2alpha1/clustertrainingruntime.go @@ -36,7 +36,7 @@ func ClusterTrainingRuntime(name string) *ClusterTrainingRuntimeApplyConfigurati b := &ClusterTrainingRuntimeApplyConfiguration{} b.WithName(name) b.WithKind("ClusterTrainingRuntime") - b.WithAPIVersion("kubeflow.org/v2alpha1") + b.WithAPIVersion("trainer.kubeflow.org/v2alpha1") return b } diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/containeroverride.go b/pkg/client/applyconfiguration/trainer/v2alpha1/containeroverride.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/containeroverride.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/containeroverride.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/coschedulingpodgrouppolicysource.go b/pkg/client/applyconfiguration/trainer/v2alpha1/coschedulingpodgrouppolicysource.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/coschedulingpodgrouppolicysource.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/coschedulingpodgrouppolicysource.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/datasetconfig.go b/pkg/client/applyconfiguration/trainer/v2alpha1/datasetconfig.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/datasetconfig.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/datasetconfig.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/inputmodel.go b/pkg/client/applyconfiguration/trainer/v2alpha1/inputmodel.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/inputmodel.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/inputmodel.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/jobsettemplatespec.go b/pkg/client/applyconfiguration/trainer/v2alpha1/jobsettemplatespec.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/jobsettemplatespec.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/jobsettemplatespec.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/jobstatus.go b/pkg/client/applyconfiguration/trainer/v2alpha1/jobstatus.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/jobstatus.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/jobstatus.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mlpolicy.go b/pkg/client/applyconfiguration/trainer/v2alpha1/mlpolicy.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mlpolicy.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/mlpolicy.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mlpolicysource.go b/pkg/client/applyconfiguration/trainer/v2alpha1/mlpolicysource.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mlpolicysource.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/mlpolicysource.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/modelconfig.go b/pkg/client/applyconfiguration/trainer/v2alpha1/modelconfig.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/modelconfig.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/modelconfig.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mpimlpolicysource.go b/pkg/client/applyconfiguration/trainer/v2alpha1/mpimlpolicysource.go similarity index 97% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mpimlpolicysource.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/mpimlpolicysource.go index d80f265253..84bbe237f3 100644 --- a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/mpimlpolicysource.go +++ b/pkg/client/applyconfiguration/trainer/v2alpha1/mpimlpolicysource.go @@ -17,7 +17,7 @@ package v2alpha1 import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) // MPIMLPolicySourceApplyConfiguration represents a declarative configuration of the MPIMLPolicySource type for use diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/outputmodel.go b/pkg/client/applyconfiguration/trainer/v2alpha1/outputmodel.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/outputmodel.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/outputmodel.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podgrouppolicy.go b/pkg/client/applyconfiguration/trainer/v2alpha1/podgrouppolicy.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podgrouppolicy.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/podgrouppolicy.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podgrouppolicysource.go b/pkg/client/applyconfiguration/trainer/v2alpha1/podgrouppolicysource.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podgrouppolicysource.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/podgrouppolicysource.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podspecoverride.go b/pkg/client/applyconfiguration/trainer/v2alpha1/podspecoverride.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podspecoverride.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/podspecoverride.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podspecoverridetargetjob.go b/pkg/client/applyconfiguration/trainer/v2alpha1/podspecoverridetargetjob.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/podspecoverridetargetjob.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/podspecoverridetargetjob.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/runtimeref.go b/pkg/client/applyconfiguration/trainer/v2alpha1/runtimeref.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/runtimeref.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/runtimeref.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/torchelasticpolicy.go b/pkg/client/applyconfiguration/trainer/v2alpha1/torchelasticpolicy.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/torchelasticpolicy.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/torchelasticpolicy.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/torchmlpolicysource.go b/pkg/client/applyconfiguration/trainer/v2alpha1/torchmlpolicysource.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/torchmlpolicysource.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/torchmlpolicysource.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainer.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainer.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainer.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainer.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainingruntime.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainingruntime.go similarity index 99% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainingruntime.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainingruntime.go index eaf31f4479..a7db2ce10a 100644 --- a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainingruntime.go +++ b/pkg/client/applyconfiguration/trainer/v2alpha1/trainingruntime.go @@ -37,7 +37,7 @@ func TrainingRuntime(name, namespace string) *TrainingRuntimeApplyConfiguration b.WithName(name) b.WithNamespace(namespace) b.WithKind("TrainingRuntime") - b.WithAPIVersion("kubeflow.org/v2alpha1") + b.WithAPIVersion("trainer.kubeflow.org/v2alpha1") return b } diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainingruntimespec.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainingruntimespec.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainingruntimespec.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainingruntimespec.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjob.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainjob.go similarity index 99% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjob.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainjob.go index 55ac69a875..e5693a9aa7 100644 --- a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjob.go +++ b/pkg/client/applyconfiguration/trainer/v2alpha1/trainjob.go @@ -38,7 +38,7 @@ func TrainJob(name, namespace string) *TrainJobApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("TrainJob") - b.WithAPIVersion("kubeflow.org/v2alpha1") + b.WithAPIVersion("trainer.kubeflow.org/v2alpha1") return b } diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjobspec.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainjobspec.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjobspec.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainjobspec.go diff --git a/pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjobstatus.go b/pkg/client/applyconfiguration/trainer/v2alpha1/trainjobstatus.go similarity index 100% rename from pkg/client/applyconfiguration/kubeflow.org/v2alpha1/trainjobstatus.go rename to pkg/client/applyconfiguration/trainer/v2alpha1/trainjobstatus.go diff --git a/pkg/client/applyconfiguration/utils.go b/pkg/client/applyconfiguration/utils.go index 7b3cdc7105..2f13317018 100644 --- a/pkg/client/applyconfiguration/utils.go +++ b/pkg/client/applyconfiguration/utils.go @@ -17,9 +17,9 @@ package applyconfiguration import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" internal "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/internal" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" testing "k8s.io/client-go/testing" @@ -29,57 +29,57 @@ import ( // apply configuration type exists for the given GroupVersionKind. func ForKind(kind schema.GroupVersionKind) interface{} { switch kind { - // Group=kubeflow.org, Version=v2alpha1 + // Group=trainer.kubeflow.org, Version=v2alpha1 case v2alpha1.SchemeGroupVersion.WithKind("ClusterTrainingRuntime"): - return &kubefloworgv2alpha1.ClusterTrainingRuntimeApplyConfiguration{} + return &trainerv2alpha1.ClusterTrainingRuntimeApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("ContainerOverride"): - return &kubefloworgv2alpha1.ContainerOverrideApplyConfiguration{} + return &trainerv2alpha1.ContainerOverrideApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("CoschedulingPodGroupPolicySource"): - return &kubefloworgv2alpha1.CoschedulingPodGroupPolicySourceApplyConfiguration{} + return &trainerv2alpha1.CoschedulingPodGroupPolicySourceApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("DatasetConfig"): - return &kubefloworgv2alpha1.DatasetConfigApplyConfiguration{} + return &trainerv2alpha1.DatasetConfigApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("InputModel"): - return &kubefloworgv2alpha1.InputModelApplyConfiguration{} + return &trainerv2alpha1.InputModelApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("JobSetTemplateSpec"): - return &kubefloworgv2alpha1.JobSetTemplateSpecApplyConfiguration{} + return &trainerv2alpha1.JobSetTemplateSpecApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("JobStatus"): - return &kubefloworgv2alpha1.JobStatusApplyConfiguration{} + return &trainerv2alpha1.JobStatusApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("MLPolicy"): - return &kubefloworgv2alpha1.MLPolicyApplyConfiguration{} + return &trainerv2alpha1.MLPolicyApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("MLPolicySource"): - return &kubefloworgv2alpha1.MLPolicySourceApplyConfiguration{} + return &trainerv2alpha1.MLPolicySourceApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("ModelConfig"): - return &kubefloworgv2alpha1.ModelConfigApplyConfiguration{} + return &trainerv2alpha1.ModelConfigApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("MPIMLPolicySource"): - return &kubefloworgv2alpha1.MPIMLPolicySourceApplyConfiguration{} + return &trainerv2alpha1.MPIMLPolicySourceApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("OutputModel"): - return &kubefloworgv2alpha1.OutputModelApplyConfiguration{} + return &trainerv2alpha1.OutputModelApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("PodGroupPolicy"): - return &kubefloworgv2alpha1.PodGroupPolicyApplyConfiguration{} + return &trainerv2alpha1.PodGroupPolicyApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("PodGroupPolicySource"): - return &kubefloworgv2alpha1.PodGroupPolicySourceApplyConfiguration{} + return &trainerv2alpha1.PodGroupPolicySourceApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("PodSpecOverride"): - return &kubefloworgv2alpha1.PodSpecOverrideApplyConfiguration{} + return &trainerv2alpha1.PodSpecOverrideApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("PodSpecOverrideTargetJob"): - return &kubefloworgv2alpha1.PodSpecOverrideTargetJobApplyConfiguration{} + return &trainerv2alpha1.PodSpecOverrideTargetJobApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("RuntimeRef"): - return &kubefloworgv2alpha1.RuntimeRefApplyConfiguration{} + return &trainerv2alpha1.RuntimeRefApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TorchElasticPolicy"): - return &kubefloworgv2alpha1.TorchElasticPolicyApplyConfiguration{} + return &trainerv2alpha1.TorchElasticPolicyApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TorchMLPolicySource"): - return &kubefloworgv2alpha1.TorchMLPolicySourceApplyConfiguration{} + return &trainerv2alpha1.TorchMLPolicySourceApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("Trainer"): - return &kubefloworgv2alpha1.TrainerApplyConfiguration{} + return &trainerv2alpha1.TrainerApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TrainingRuntime"): - return &kubefloworgv2alpha1.TrainingRuntimeApplyConfiguration{} + return &trainerv2alpha1.TrainingRuntimeApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TrainingRuntimeSpec"): - return &kubefloworgv2alpha1.TrainingRuntimeSpecApplyConfiguration{} + return &trainerv2alpha1.TrainingRuntimeSpecApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TrainJob"): - return &kubefloworgv2alpha1.TrainJobApplyConfiguration{} + return &trainerv2alpha1.TrainJobApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TrainJobSpec"): - return &kubefloworgv2alpha1.TrainJobSpecApplyConfiguration{} + return &trainerv2alpha1.TrainJobSpecApplyConfiguration{} case v2alpha1.SchemeGroupVersion.WithKind("TrainJobStatus"): - return &kubefloworgv2alpha1.TrainJobStatusApplyConfiguration{} + return &trainerv2alpha1.TrainJobStatusApplyConfiguration{} } return nil diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index a854037d06..2ba6c6bed1 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - kubeflowv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/trainer/v2alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -28,18 +28,18 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - KubeflowV2alpha1() kubeflowv2alpha1.KubeflowV2alpha1Interface + TrainerV2alpha1() trainerv2alpha1.TrainerV2alpha1Interface } // Clientset contains the clients for groups. type Clientset struct { *discovery.DiscoveryClient - kubeflowV2alpha1 *kubeflowv2alpha1.KubeflowV2alpha1Client + trainerV2alpha1 *trainerv2alpha1.TrainerV2alpha1Client } -// KubeflowV2alpha1 retrieves the KubeflowV2alpha1Client -func (c *Clientset) KubeflowV2alpha1() kubeflowv2alpha1.KubeflowV2alpha1Interface { - return c.kubeflowV2alpha1 +// TrainerV2alpha1 retrieves the TrainerV2alpha1Client +func (c *Clientset) TrainerV2alpha1() trainerv2alpha1.TrainerV2alpha1Interface { + return c.trainerV2alpha1 } // Discovery retrieves the DiscoveryClient @@ -86,7 +86,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, var cs Clientset var err error - cs.kubeflowV2alpha1, err = kubeflowv2alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) + cs.trainerV2alpha1, err = trainerv2alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.kubeflowV2alpha1 = kubeflowv2alpha1.New(c) + cs.trainerV2alpha1 = trainerv2alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index c6a14fb1cb..f0f42d7657 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,8 +19,8 @@ package fake import ( applyconfiguration "github.com/kubeflow/training-operator/pkg/client/applyconfiguration" clientset "github.com/kubeflow/training-operator/pkg/client/clientset/versioned" - kubeflowv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1" - fakekubeflowv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/trainer/v2alpha1" + faketrainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -114,7 +114,7 @@ var ( _ testing.FakeClient = &Clientset{} ) -// KubeflowV2alpha1 retrieves the KubeflowV2alpha1Client -func (c *Clientset) KubeflowV2alpha1() kubeflowv2alpha1.KubeflowV2alpha1Interface { - return &fakekubeflowv2alpha1.FakeKubeflowV2alpha1{Fake: &c.Fake} +// TrainerV2alpha1 retrieves the TrainerV2alpha1Client +func (c *Clientset) TrainerV2alpha1() trainerv2alpha1.TrainerV2alpha1Interface { + return &faketrainerv2alpha1.FakeTrainerV2alpha1{Fake: &c.Fake} } diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 854bed50c1..b6aaf9af83 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -17,7 +17,7 @@ package fake import ( - kubeflowv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -29,7 +29,7 @@ var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - kubeflowv2alpha1.AddToScheme, + trainerv2alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 9833636a9c..ecf4d3fa7d 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -17,7 +17,7 @@ package scheme import ( - kubeflowv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -29,7 +29,7 @@ var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - kubeflowv2alpha1.AddToScheme, + trainerv2alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/clustertrainingruntime.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/clustertrainingruntime.go similarity index 80% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/clustertrainingruntime.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/clustertrainingruntime.go index 8bfe2183a0..c1374255fd 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/clustertrainingruntime.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/clustertrainingruntime.go @@ -19,8 +19,8 @@ package v2alpha1 import ( "context" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" scheme "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -44,19 +44,19 @@ type ClusterTrainingRuntimeInterface interface { List(ctx context.Context, opts v1.ListOptions) (*v2alpha1.ClusterTrainingRuntimeList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.ClusterTrainingRuntime, err error) - Apply(ctx context.Context, clusterTrainingRuntime *kubefloworgv2alpha1.ClusterTrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.ClusterTrainingRuntime, err error) + Apply(ctx context.Context, clusterTrainingRuntime *trainerv2alpha1.ClusterTrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.ClusterTrainingRuntime, err error) ClusterTrainingRuntimeExpansion } // clusterTrainingRuntimes implements ClusterTrainingRuntimeInterface type clusterTrainingRuntimes struct { - *gentype.ClientWithListAndApply[*v2alpha1.ClusterTrainingRuntime, *v2alpha1.ClusterTrainingRuntimeList, *kubefloworgv2alpha1.ClusterTrainingRuntimeApplyConfiguration] + *gentype.ClientWithListAndApply[*v2alpha1.ClusterTrainingRuntime, *v2alpha1.ClusterTrainingRuntimeList, *trainerv2alpha1.ClusterTrainingRuntimeApplyConfiguration] } // newClusterTrainingRuntimes returns a ClusterTrainingRuntimes -func newClusterTrainingRuntimes(c *KubeflowV2alpha1Client) *clusterTrainingRuntimes { +func newClusterTrainingRuntimes(c *TrainerV2alpha1Client) *clusterTrainingRuntimes { return &clusterTrainingRuntimes{ - gentype.NewClientWithListAndApply[*v2alpha1.ClusterTrainingRuntime, *v2alpha1.ClusterTrainingRuntimeList, *kubefloworgv2alpha1.ClusterTrainingRuntimeApplyConfiguration]( + gentype.NewClientWithListAndApply[*v2alpha1.ClusterTrainingRuntime, *v2alpha1.ClusterTrainingRuntimeList, *trainerv2alpha1.ClusterTrainingRuntimeApplyConfiguration]( "clustertrainingruntimes", c.RESTClient(), scheme.ParameterCodec, diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/doc.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/doc.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/doc.go diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/doc.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/doc.go diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_clustertrainingruntime.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_clustertrainingruntime.go similarity index 94% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_clustertrainingruntime.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_clustertrainingruntime.go index 0321263668..deccb871ed 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_clustertrainingruntime.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_clustertrainingruntime.go @@ -21,8 +21,8 @@ import ( json "encoding/json" "fmt" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" @@ -32,7 +32,7 @@ import ( // FakeClusterTrainingRuntimes implements ClusterTrainingRuntimeInterface type FakeClusterTrainingRuntimes struct { - Fake *FakeKubeflowV2alpha1 + Fake *FakeTrainerV2alpha1 } var clustertrainingruntimesResource = v2alpha1.SchemeGroupVersion.WithResource("clustertrainingruntimes") @@ -127,7 +127,7 @@ func (c *FakeClusterTrainingRuntimes) Patch(ctx context.Context, name string, pt } // Apply takes the given apply declarative configuration, applies it and returns the applied clusterTrainingRuntime. -func (c *FakeClusterTrainingRuntimes) Apply(ctx context.Context, clusterTrainingRuntime *kubefloworgv2alpha1.ClusterTrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.ClusterTrainingRuntime, err error) { +func (c *FakeClusterTrainingRuntimes) Apply(ctx context.Context, clusterTrainingRuntime *trainerv2alpha1.ClusterTrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.ClusterTrainingRuntime, err error) { if clusterTrainingRuntime == nil { return nil, fmt.Errorf("clusterTrainingRuntime provided to Apply must not be nil") } diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_kubeflow.org_client.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainer_client.go similarity index 71% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_kubeflow.org_client.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainer_client.go index 5d9628e75e..969b657a14 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_kubeflow.org_client.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainer_client.go @@ -17,30 +17,30 @@ package fake import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/typed/trainer/v2alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeKubeflowV2alpha1 struct { +type FakeTrainerV2alpha1 struct { *testing.Fake } -func (c *FakeKubeflowV2alpha1) ClusterTrainingRuntimes() v2alpha1.ClusterTrainingRuntimeInterface { +func (c *FakeTrainerV2alpha1) ClusterTrainingRuntimes() v2alpha1.ClusterTrainingRuntimeInterface { return &FakeClusterTrainingRuntimes{c} } -func (c *FakeKubeflowV2alpha1) TrainJobs(namespace string) v2alpha1.TrainJobInterface { +func (c *FakeTrainerV2alpha1) TrainJobs(namespace string) v2alpha1.TrainJobInterface { return &FakeTrainJobs{c, namespace} } -func (c *FakeKubeflowV2alpha1) TrainingRuntimes(namespace string) v2alpha1.TrainingRuntimeInterface { +func (c *FakeTrainerV2alpha1) TrainingRuntimes(namespace string) v2alpha1.TrainingRuntimeInterface { return &FakeTrainingRuntimes{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeKubeflowV2alpha1) RESTClient() rest.Interface { +func (c *FakeTrainerV2alpha1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainingruntime.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainingruntime.go similarity index 94% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainingruntime.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainingruntime.go index 22a0b81d36..dd6dc23ee4 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainingruntime.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainingruntime.go @@ -21,8 +21,8 @@ import ( json "encoding/json" "fmt" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" @@ -32,7 +32,7 @@ import ( // FakeTrainingRuntimes implements TrainingRuntimeInterface type FakeTrainingRuntimes struct { - Fake *FakeKubeflowV2alpha1 + Fake *FakeTrainerV2alpha1 ns string } @@ -135,7 +135,7 @@ func (c *FakeTrainingRuntimes) Patch(ctx context.Context, name string, pt types. } // Apply takes the given apply declarative configuration, applies it and returns the applied trainingRuntime. -func (c *FakeTrainingRuntimes) Apply(ctx context.Context, trainingRuntime *kubefloworgv2alpha1.TrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainingRuntime, err error) { +func (c *FakeTrainingRuntimes) Apply(ctx context.Context, trainingRuntime *trainerv2alpha1.TrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainingRuntime, err error) { if trainingRuntime == nil { return nil, fmt.Errorf("trainingRuntime provided to Apply must not be nil") } diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainjob.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainjob.go similarity index 93% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainjob.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainjob.go index a00b899ee1..b7e3d1d68b 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/fake/fake_trainjob.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/fake/fake_trainjob.go @@ -21,8 +21,8 @@ import ( json "encoding/json" "fmt" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" @@ -32,7 +32,7 @@ import ( // FakeTrainJobs implements TrainJobInterface type FakeTrainJobs struct { - Fake *FakeKubeflowV2alpha1 + Fake *FakeTrainerV2alpha1 ns string } @@ -148,7 +148,7 @@ func (c *FakeTrainJobs) Patch(ctx context.Context, name string, pt types.PatchTy } // Apply takes the given apply declarative configuration, applies it and returns the applied trainJob. -func (c *FakeTrainJobs) Apply(ctx context.Context, trainJob *kubefloworgv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) { +func (c *FakeTrainJobs) Apply(ctx context.Context, trainJob *trainerv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) { if trainJob == nil { return nil, fmt.Errorf("trainJob provided to Apply must not be nil") } @@ -172,7 +172,7 @@ func (c *FakeTrainJobs) Apply(ctx context.Context, trainJob *kubefloworgv2alpha1 // ApplyStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeTrainJobs) ApplyStatus(ctx context.Context, trainJob *kubefloworgv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) { +func (c *FakeTrainJobs) ApplyStatus(ctx context.Context, trainJob *trainerv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) { if trainJob == nil { return nil, fmt.Errorf("trainJob provided to Apply must not be nil") } diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/generated_expansion.go similarity index 100% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/generated_expansion.go diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/kubeflow.org_client.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainer_client.go similarity index 64% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/kubeflow.org_client.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainer_client.go index fb7bd01dd7..2a55320378 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/kubeflow.org_client.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainer_client.go @@ -19,39 +19,39 @@ package v2alpha1 import ( "net/http" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type KubeflowV2alpha1Interface interface { +type TrainerV2alpha1Interface interface { RESTClient() rest.Interface ClusterTrainingRuntimesGetter TrainJobsGetter TrainingRuntimesGetter } -// KubeflowV2alpha1Client is used to interact with features provided by the kubeflow.org group. -type KubeflowV2alpha1Client struct { +// TrainerV2alpha1Client is used to interact with features provided by the trainer.kubeflow.org group. +type TrainerV2alpha1Client struct { restClient rest.Interface } -func (c *KubeflowV2alpha1Client) ClusterTrainingRuntimes() ClusterTrainingRuntimeInterface { +func (c *TrainerV2alpha1Client) ClusterTrainingRuntimes() ClusterTrainingRuntimeInterface { return newClusterTrainingRuntimes(c) } -func (c *KubeflowV2alpha1Client) TrainJobs(namespace string) TrainJobInterface { +func (c *TrainerV2alpha1Client) TrainJobs(namespace string) TrainJobInterface { return newTrainJobs(c, namespace) } -func (c *KubeflowV2alpha1Client) TrainingRuntimes(namespace string) TrainingRuntimeInterface { +func (c *TrainerV2alpha1Client) TrainingRuntimes(namespace string) TrainingRuntimeInterface { return newTrainingRuntimes(c, namespace) } -// NewForConfig creates a new KubeflowV2alpha1Client for the given config. +// NewForConfig creates a new TrainerV2alpha1Client for the given config. // NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), // where httpClient was generated with rest.HTTPClientFor(c). -func NewForConfig(c *rest.Config) (*KubeflowV2alpha1Client, error) { +func NewForConfig(c *rest.Config) (*TrainerV2alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -63,9 +63,9 @@ func NewForConfig(c *rest.Config) (*KubeflowV2alpha1Client, error) { return NewForConfigAndClient(&config, httpClient) } -// NewForConfigAndClient creates a new KubeflowV2alpha1Client for the given config and http client. +// NewForConfigAndClient creates a new TrainerV2alpha1Client for the given config and http client. // Note the http client provided takes precedence over the configured transport values. -func NewForConfigAndClient(c *rest.Config, h *http.Client) (*KubeflowV2alpha1Client, error) { +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*TrainerV2alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -74,12 +74,12 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*KubeflowV2alpha1Cli if err != nil { return nil, err } - return &KubeflowV2alpha1Client{client}, nil + return &TrainerV2alpha1Client{client}, nil } -// NewForConfigOrDie creates a new KubeflowV2alpha1Client for the given config and +// NewForConfigOrDie creates a new TrainerV2alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *KubeflowV2alpha1Client { +func NewForConfigOrDie(c *rest.Config) *TrainerV2alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -87,9 +87,9 @@ func NewForConfigOrDie(c *rest.Config) *KubeflowV2alpha1Client { return client } -// New creates a new KubeflowV2alpha1Client for the given RESTClient. -func New(c rest.Interface) *KubeflowV2alpha1Client { - return &KubeflowV2alpha1Client{c} +// New creates a new TrainerV2alpha1Client for the given RESTClient. +func New(c rest.Interface) *TrainerV2alpha1Client { + return &TrainerV2alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { @@ -107,7 +107,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *KubeflowV2alpha1Client) RESTClient() rest.Interface { +func (c *TrainerV2alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainingruntime.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainingruntime.go similarity index 81% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainingruntime.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainingruntime.go index 3102132958..b915b854b0 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainingruntime.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainingruntime.go @@ -19,8 +19,8 @@ package v2alpha1 import ( "context" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" scheme "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -44,19 +44,19 @@ type TrainingRuntimeInterface interface { List(ctx context.Context, opts v1.ListOptions) (*v2alpha1.TrainingRuntimeList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.TrainingRuntime, err error) - Apply(ctx context.Context, trainingRuntime *kubefloworgv2alpha1.TrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainingRuntime, err error) + Apply(ctx context.Context, trainingRuntime *trainerv2alpha1.TrainingRuntimeApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainingRuntime, err error) TrainingRuntimeExpansion } // trainingRuntimes implements TrainingRuntimeInterface type trainingRuntimes struct { - *gentype.ClientWithListAndApply[*v2alpha1.TrainingRuntime, *v2alpha1.TrainingRuntimeList, *kubefloworgv2alpha1.TrainingRuntimeApplyConfiguration] + *gentype.ClientWithListAndApply[*v2alpha1.TrainingRuntime, *v2alpha1.TrainingRuntimeList, *trainerv2alpha1.TrainingRuntimeApplyConfiguration] } // newTrainingRuntimes returns a TrainingRuntimes -func newTrainingRuntimes(c *KubeflowV2alpha1Client, namespace string) *trainingRuntimes { +func newTrainingRuntimes(c *TrainerV2alpha1Client, namespace string) *trainingRuntimes { return &trainingRuntimes{ - gentype.NewClientWithListAndApply[*v2alpha1.TrainingRuntime, *v2alpha1.TrainingRuntimeList, *kubefloworgv2alpha1.TrainingRuntimeApplyConfiguration]( + gentype.NewClientWithListAndApply[*v2alpha1.TrainingRuntime, *v2alpha1.TrainingRuntimeList, *trainerv2alpha1.TrainingRuntimeApplyConfiguration]( "trainingruntimes", c.RESTClient(), scheme.ParameterCodec, diff --git a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainjob.go b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainjob.go similarity index 80% rename from pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainjob.go rename to pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainjob.go index 45fbc86425..2301296e76 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow.org/v2alpha1/trainjob.go +++ b/pkg/client/clientset/versioned/typed/trainer/v2alpha1/trainjob.go @@ -19,8 +19,8 @@ package v2alpha1 import ( "context" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/client/applyconfiguration/trainer/v2alpha1" scheme "github.com/kubeflow/training-operator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -46,21 +46,21 @@ type TrainJobInterface interface { List(ctx context.Context, opts v1.ListOptions) (*v2alpha1.TrainJobList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.TrainJob, err error) - Apply(ctx context.Context, trainJob *kubefloworgv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) + Apply(ctx context.Context, trainJob *trainerv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, trainJob *kubefloworgv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) + ApplyStatus(ctx context.Context, trainJob *trainerv2alpha1.TrainJobApplyConfiguration, opts v1.ApplyOptions) (result *v2alpha1.TrainJob, err error) TrainJobExpansion } // trainJobs implements TrainJobInterface type trainJobs struct { - *gentype.ClientWithListAndApply[*v2alpha1.TrainJob, *v2alpha1.TrainJobList, *kubefloworgv2alpha1.TrainJobApplyConfiguration] + *gentype.ClientWithListAndApply[*v2alpha1.TrainJob, *v2alpha1.TrainJobList, *trainerv2alpha1.TrainJobApplyConfiguration] } // newTrainJobs returns a TrainJobs -func newTrainJobs(c *KubeflowV2alpha1Client, namespace string) *trainJobs { +func newTrainJobs(c *TrainerV2alpha1Client, namespace string) *trainJobs { return &trainJobs{ - gentype.NewClientWithListAndApply[*v2alpha1.TrainJob, *v2alpha1.TrainJobList, *kubefloworgv2alpha1.TrainJobApplyConfiguration]( + gentype.NewClientWithListAndApply[*v2alpha1.TrainJob, *v2alpha1.TrainJobList, *trainerv2alpha1.TrainJobApplyConfiguration]( "trainjobs", c.RESTClient(), scheme.ParameterCodec, diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 12a8c697b2..a279c673b2 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,7 +23,7 @@ import ( versioned "github.com/kubeflow/training-operator/pkg/client/clientset/versioned" internalinterfaces "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/internalinterfaces" - kubefloworg "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/kubeflow.org" + trainer "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/trainer" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -252,9 +252,9 @@ type SharedInformerFactory interface { // client. InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer - Kubeflow() kubefloworg.Interface + Trainer() trainer.Interface } -func (f *sharedInformerFactory) Kubeflow() kubefloworg.Interface { - return kubefloworg.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Trainer() trainer.Interface { + return trainer.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 579930a2db..99eb5568fd 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -19,7 +19,7 @@ package externalversions import ( "fmt" - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -50,13 +50,13 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=kubeflow.org, Version=v2alpha1 + // Group=trainer.kubeflow.org, Version=v2alpha1 case v2alpha1.SchemeGroupVersion.WithResource("clustertrainingruntimes"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Kubeflow().V2alpha1().ClusterTrainingRuntimes().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Trainer().V2alpha1().ClusterTrainingRuntimes().Informer()}, nil case v2alpha1.SchemeGroupVersion.WithResource("trainjobs"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Kubeflow().V2alpha1().TrainJobs().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Trainer().V2alpha1().TrainJobs().Informer()}, nil case v2alpha1.SchemeGroupVersion.WithResource("trainingruntimes"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Kubeflow().V2alpha1().TrainingRuntimes().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Trainer().V2alpha1().TrainingRuntimes().Informer()}, nil } diff --git a/pkg/client/informers/externalversions/kubeflow.org/interface.go b/pkg/client/informers/externalversions/trainer/interface.go similarity index 96% rename from pkg/client/informers/externalversions/kubeflow.org/interface.go rename to pkg/client/informers/externalversions/trainer/interface.go index 92bf00700c..1729f78a95 100644 --- a/pkg/client/informers/externalversions/kubeflow.org/interface.go +++ b/pkg/client/informers/externalversions/trainer/interface.go @@ -14,11 +14,11 @@ // Code generated by informer-gen. DO NOT EDIT. -package kubeflow +package trainer import ( internalinterfaces "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/internalinterfaces" - v2alpha1 "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/trainer/v2alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/clustertrainingruntime.go b/pkg/client/informers/externalversions/trainer/v2alpha1/clustertrainingruntime.go similarity index 88% rename from pkg/client/informers/externalversions/kubeflow.org/v2alpha1/clustertrainingruntime.go rename to pkg/client/informers/externalversions/trainer/v2alpha1/clustertrainingruntime.go index c024e30a29..533d3b0d04 100644 --- a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/clustertrainingruntime.go +++ b/pkg/client/informers/externalversions/trainer/v2alpha1/clustertrainingruntime.go @@ -20,10 +20,10 @@ import ( "context" time "time" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" versioned "github.com/kubeflow/training-operator/pkg/client/clientset/versioned" internalinterfaces "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/internalinterfaces" - v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -59,16 +59,16 @@ func NewFilteredClusterTrainingRuntimeInformer(client versioned.Interface, resyn if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().ClusterTrainingRuntimes().List(context.TODO(), options) + return client.TrainerV2alpha1().ClusterTrainingRuntimes().List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().ClusterTrainingRuntimes().Watch(context.TODO(), options) + return client.TrainerV2alpha1().ClusterTrainingRuntimes().Watch(context.TODO(), options) }, }, - &kubefloworgv2alpha1.ClusterTrainingRuntime{}, + &trainerv2alpha1.ClusterTrainingRuntime{}, resyncPeriod, indexers, ) @@ -79,7 +79,7 @@ func (f *clusterTrainingRuntimeInformer) defaultInformer(client versioned.Interf } func (f *clusterTrainingRuntimeInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubefloworgv2alpha1.ClusterTrainingRuntime{}, f.defaultInformer) + return f.factory.InformerFor(&trainerv2alpha1.ClusterTrainingRuntime{}, f.defaultInformer) } func (f *clusterTrainingRuntimeInformer) Lister() v2alpha1.ClusterTrainingRuntimeLister { diff --git a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/interface.go b/pkg/client/informers/externalversions/trainer/v2alpha1/interface.go similarity index 100% rename from pkg/client/informers/externalversions/kubeflow.org/v2alpha1/interface.go rename to pkg/client/informers/externalversions/trainer/v2alpha1/interface.go diff --git a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainingruntime.go b/pkg/client/informers/externalversions/trainer/v2alpha1/trainingruntime.go similarity index 88% rename from pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainingruntime.go rename to pkg/client/informers/externalversions/trainer/v2alpha1/trainingruntime.go index b605a037d2..c942bc5d68 100644 --- a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainingruntime.go +++ b/pkg/client/informers/externalversions/trainer/v2alpha1/trainingruntime.go @@ -20,10 +20,10 @@ import ( "context" time "time" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" versioned "github.com/kubeflow/training-operator/pkg/client/clientset/versioned" internalinterfaces "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/internalinterfaces" - v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -60,16 +60,16 @@ func NewFilteredTrainingRuntimeInformer(client versioned.Interface, namespace st if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().TrainingRuntimes(namespace).List(context.TODO(), options) + return client.TrainerV2alpha1().TrainingRuntimes(namespace).List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().TrainingRuntimes(namespace).Watch(context.TODO(), options) + return client.TrainerV2alpha1().TrainingRuntimes(namespace).Watch(context.TODO(), options) }, }, - &kubefloworgv2alpha1.TrainingRuntime{}, + &trainerv2alpha1.TrainingRuntime{}, resyncPeriod, indexers, ) @@ -80,7 +80,7 @@ func (f *trainingRuntimeInformer) defaultInformer(client versioned.Interface, re } func (f *trainingRuntimeInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubefloworgv2alpha1.TrainingRuntime{}, f.defaultInformer) + return f.factory.InformerFor(&trainerv2alpha1.TrainingRuntime{}, f.defaultInformer) } func (f *trainingRuntimeInformer) Lister() v2alpha1.TrainingRuntimeLister { diff --git a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainjob.go b/pkg/client/informers/externalversions/trainer/v2alpha1/trainjob.go similarity index 89% rename from pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainjob.go rename to pkg/client/informers/externalversions/trainer/v2alpha1/trainjob.go index 0df650744a..923628a829 100644 --- a/pkg/client/informers/externalversions/kubeflow.org/v2alpha1/trainjob.go +++ b/pkg/client/informers/externalversions/trainer/v2alpha1/trainjob.go @@ -20,10 +20,10 @@ import ( "context" time "time" - kubefloworgv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + trainerv2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" versioned "github.com/kubeflow/training-operator/pkg/client/clientset/versioned" internalinterfaces "github.com/kubeflow/training-operator/pkg/client/informers/externalversions/internalinterfaces" - v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/client/listers/trainer/v2alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -60,16 +60,16 @@ func NewFilteredTrainJobInformer(client versioned.Interface, namespace string, r if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().TrainJobs(namespace).List(context.TODO(), options) + return client.TrainerV2alpha1().TrainJobs(namespace).List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.KubeflowV2alpha1().TrainJobs(namespace).Watch(context.TODO(), options) + return client.TrainerV2alpha1().TrainJobs(namespace).Watch(context.TODO(), options) }, }, - &kubefloworgv2alpha1.TrainJob{}, + &trainerv2alpha1.TrainJob{}, resyncPeriod, indexers, ) @@ -80,7 +80,7 @@ func (f *trainJobInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *trainJobInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kubefloworgv2alpha1.TrainJob{}, f.defaultInformer) + return f.factory.InformerFor(&trainerv2alpha1.TrainJob{}, f.defaultInformer) } func (f *trainJobInformer) Lister() v2alpha1.TrainJobLister { diff --git a/pkg/client/listers/kubeflow.org/v2alpha1/clustertrainingruntime.go b/pkg/client/listers/trainer/v2alpha1/clustertrainingruntime.go similarity index 95% rename from pkg/client/listers/kubeflow.org/v2alpha1/clustertrainingruntime.go rename to pkg/client/listers/trainer/v2alpha1/clustertrainingruntime.go index f2d0c73a6c..b4d5eb6d2f 100644 --- a/pkg/client/listers/kubeflow.org/v2alpha1/clustertrainingruntime.go +++ b/pkg/client/listers/trainer/v2alpha1/clustertrainingruntime.go @@ -17,7 +17,7 @@ package v2alpha1 import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/listers" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/kubeflow.org/v2alpha1/expansion_generated.go b/pkg/client/listers/trainer/v2alpha1/expansion_generated.go similarity index 100% rename from pkg/client/listers/kubeflow.org/v2alpha1/expansion_generated.go rename to pkg/client/listers/trainer/v2alpha1/expansion_generated.go diff --git a/pkg/client/listers/kubeflow.org/v2alpha1/trainingruntime.go b/pkg/client/listers/trainer/v2alpha1/trainingruntime.go similarity index 97% rename from pkg/client/listers/kubeflow.org/v2alpha1/trainingruntime.go rename to pkg/client/listers/trainer/v2alpha1/trainingruntime.go index 6b322fb5d0..74ece272ec 100644 --- a/pkg/client/listers/kubeflow.org/v2alpha1/trainingruntime.go +++ b/pkg/client/listers/trainer/v2alpha1/trainingruntime.go @@ -17,7 +17,7 @@ package v2alpha1 import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/listers" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/kubeflow.org/v2alpha1/trainjob.go b/pkg/client/listers/trainer/v2alpha1/trainjob.go similarity index 96% rename from pkg/client/listers/kubeflow.org/v2alpha1/trainjob.go rename to pkg/client/listers/trainer/v2alpha1/trainjob.go index 7d897cf1aa..8342c90e23 100644 --- a/pkg/client/listers/kubeflow.org/v2alpha1/trainjob.go +++ b/pkg/client/listers/trainer/v2alpha1/trainjob.go @@ -17,7 +17,7 @@ package v2alpha1 import ( - v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + v2alpha1 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/listers" "k8s.io/client-go/tools/cache" diff --git a/pkg/controller.v2/trainjob_controller.go b/pkg/controller.v2/trainjob_controller.go index ad5fde4c8a..8046e90260 100644 --- a/pkg/controller.v2/trainjob_controller.go +++ b/pkg/controller.v2/trainjob_controller.go @@ -35,7 +35,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/controller" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" jobruntimes "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/runtime.v2/core/clustertrainingruntime.go b/pkg/runtime.v2/core/clustertrainingruntime.go index 6f2cb8bac3..8a93a9254a 100644 --- a/pkg/runtime.v2/core/clustertrainingruntime.go +++ b/pkg/runtime.v2/core/clustertrainingruntime.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/runtime.v2/core/clustertrainingruntime_test.go b/pkg/runtime.v2/core/clustertrainingruntime_test.go index 050d86a23a..a387c61e8a 100644 --- a/pkg/runtime.v2/core/clustertrainingruntime_test.go +++ b/pkg/runtime.v2/core/clustertrainingruntime_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" testingutil "github.com/kubeflow/training-operator/pkg/util.v2/testing" ) diff --git a/pkg/runtime.v2/core/trainingruntime.go b/pkg/runtime.v2/core/trainingruntime.go index 23a859a128..6ebb5a15c1 100644 --- a/pkg/runtime.v2/core/trainingruntime.go +++ b/pkg/runtime.v2/core/trainingruntime.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook/admission" jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" fwkcore "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/core" fwkplugins "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/plugins" diff --git a/pkg/runtime.v2/core/trainingruntime_test.go b/pkg/runtime.v2/core/trainingruntime_test.go index 2a11716cd3..b22b48aff7 100644 --- a/pkg/runtime.v2/core/trainingruntime_test.go +++ b/pkg/runtime.v2/core/trainingruntime_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" jobsetplugin "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/plugins/jobset" testingutil "github.com/kubeflow/training-operator/pkg/util.v2/testing" diff --git a/pkg/runtime.v2/framework/core/framework.go b/pkg/runtime.v2/framework/core/framework.go index e2ecfdca03..21869c9413 100644 --- a/pkg/runtime.v2/framework/core/framework.go +++ b/pkg/runtime.v2/framework/core/framework.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" fwkplugins "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/plugins" diff --git a/pkg/runtime.v2/framework/core/framework_test.go b/pkg/runtime.v2/framework/core/framework_test.go index 223603398a..956b949649 100644 --- a/pkg/runtime.v2/framework/core/framework_test.go +++ b/pkg/runtime.v2/framework/core/framework_test.go @@ -35,7 +35,7 @@ import ( jobsetconsts "sigs.k8s.io/jobset/pkg/constants" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" diff --git a/pkg/runtime.v2/framework/interface.go b/pkg/runtime.v2/framework/interface.go index fc385d217a..af165cb75c 100644 --- a/pkg/runtime.v2/framework/interface.go +++ b/pkg/runtime.v2/framework/interface.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/runtime.v2/framework/plugins/coscheduling/coscheduling.go b/pkg/runtime.v2/framework/plugins/coscheduling/coscheduling.go index 5521b17b93..88a223c189 100644 --- a/pkg/runtime.v2/framework/plugins/coscheduling/coscheduling.go +++ b/pkg/runtime.v2/framework/plugins/coscheduling/coscheduling.go @@ -45,7 +45,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" diff --git a/pkg/runtime.v2/framework/plugins/coscheduling/indexer.go b/pkg/runtime.v2/framework/plugins/coscheduling/indexer.go index 04a415ae3e..ba5efced72 100644 --- a/pkg/runtime.v2/framework/plugins/coscheduling/indexer.go +++ b/pkg/runtime.v2/framework/plugins/coscheduling/indexer.go @@ -19,7 +19,7 @@ package coscheduling import ( "sigs.k8s.io/controller-runtime/pkg/client" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) var ( diff --git a/pkg/runtime.v2/framework/plugins/jobset/builder.go b/pkg/runtime.v2/framework/plugins/jobset/builder.go index dc104bdd28..9b91bfa960 100644 --- a/pkg/runtime.v2/framework/plugins/jobset/builder.go +++ b/pkg/runtime.v2/framework/plugins/jobset/builder.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/runtime.v2/framework/plugins/jobset/jobset.go b/pkg/runtime.v2/framework/plugins/jobset/jobset.go index 684df0120e..6d572594b7 100644 --- a/pkg/runtime.v2/framework/plugins/jobset/jobset.go +++ b/pkg/runtime.v2/framework/plugins/jobset/jobset.go @@ -36,7 +36,7 @@ import ( ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" diff --git a/pkg/runtime.v2/framework/plugins/mpi/mpi.go b/pkg/runtime.v2/framework/plugins/mpi/mpi.go index 26e519222b..056184f6f7 100644 --- a/pkg/runtime.v2/framework/plugins/mpi/mpi.go +++ b/pkg/runtime.v2/framework/plugins/mpi/mpi.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" ) diff --git a/pkg/runtime.v2/framework/plugins/plainml/plainml.go b/pkg/runtime.v2/framework/plugins/plainml/plainml.go index f179b9935e..72a7972c51 100644 --- a/pkg/runtime.v2/framework/plugins/plainml/plainml.go +++ b/pkg/runtime.v2/framework/plugins/plainml/plainml.go @@ -22,7 +22,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" diff --git a/pkg/runtime.v2/framework/plugins/torch/torch.go b/pkg/runtime.v2/framework/plugins/torch/torch.go index 4e9c40585f..f2314263d6 100644 --- a/pkg/runtime.v2/framework/plugins/torch/torch.go +++ b/pkg/runtime.v2/framework/plugins/torch/torch.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" "github.com/kubeflow/training-operator/pkg/runtime.v2/framework" diff --git a/pkg/runtime.v2/indexer/indexer.go b/pkg/runtime.v2/indexer/indexer.go index 730f4267de..874960ed64 100644 --- a/pkg/runtime.v2/indexer/indexer.go +++ b/pkg/runtime.v2/indexer/indexer.go @@ -20,7 +20,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) const ( diff --git a/pkg/runtime.v2/interface.go b/pkg/runtime.v2/interface.go index 7c89200bbf..ba7e56f0e9 100644 --- a/pkg/runtime.v2/interface.go +++ b/pkg/runtime.v2/interface.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) type ReconcilerBuilder func(*builder.Builder, client.Client, cache.Cache) *builder.Builder diff --git a/pkg/runtime.v2/runtime.go b/pkg/runtime.v2/runtime.go index 46682f9338..9789be6f28 100644 --- a/pkg/runtime.v2/runtime.go +++ b/pkg/runtime.v2/runtime.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" kueuelr "sigs.k8s.io/kueue/pkg/util/limitrange" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) type Info struct { diff --git a/pkg/util.v2/testing/client.go b/pkg/util.v2/testing/client.go index 3f1209779c..937c259668 100644 --- a/pkg/util.v2/testing/client.go +++ b/pkg/util.v2/testing/client.go @@ -28,7 +28,7 @@ import ( jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" ) func NewClientBuilder(addToSchemes ...func(s *runtime.Scheme) error) *fake.ClientBuilder { diff --git a/pkg/util.v2/testing/wrapper.go b/pkg/util.v2/testing/wrapper.go index fdbb3dd6c7..6b086aa027 100644 --- a/pkg/util.v2/testing/wrapper.go +++ b/pkg/util.v2/testing/wrapper.go @@ -26,7 +26,7 @@ import ( jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" jobsetplugin "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/plugins/jobset" ) diff --git a/pkg/webhooks.v2/clustertrainingruntime_webhook.go b/pkg/webhooks.v2/clustertrainingruntime_webhook.go index 47b2bd3392..aa97e3c440 100644 --- a/pkg/webhooks.v2/clustertrainingruntime_webhook.go +++ b/pkg/webhooks.v2/clustertrainingruntime_webhook.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/webhooks.v2/setup.go b/pkg/webhooks.v2/setup.go index bd10cdf53e..1e7980eb6b 100644 --- a/pkg/webhooks.v2/setup.go +++ b/pkg/webhooks.v2/setup.go @@ -19,7 +19,7 @@ package webhooksv2 import ( ctrl "sigs.k8s.io/controller-runtime" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/webhooks.v2/trainingruntime_webhook.go b/pkg/webhooks.v2/trainingruntime_webhook.go index 8196e8ca3e..16ae7331b9 100644 --- a/pkg/webhooks.v2/trainingruntime_webhook.go +++ b/pkg/webhooks.v2/trainingruntime_webhook.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook/admission" jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/pkg/webhooks.v2/trainjob_webhook.go b/pkg/webhooks.v2/trainjob_webhook.go index bf8a594cc5..cdab416fd9 100644 --- a/pkg/webhooks.v2/trainjob_webhook.go +++ b/pkg/webhooks.v2/trainjob_webhook.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" runtime "github.com/kubeflow/training-operator/pkg/runtime.v2" ) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeSpec.md b/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeSpec.md deleted file mode 100644 index 70c994afc9..0000000000 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeSpec.md +++ /dev/null @@ -1,13 +0,0 @@ -# KubeflowOrgV2alpha1TrainingRuntimeSpec - -TrainingRuntimeSpec represents a specification of the desired training runtime. -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**ml_policy** | [**KubeflowOrgV2alpha1MLPolicy**](KubeflowOrgV2alpha1MLPolicy.md) | | [optional] -**pod_group_policy** | [**KubeflowOrgV2alpha1PodGroupPolicy**](KubeflowOrgV2alpha1PodGroupPolicy.md) | | [optional] -**template** | [**KubeflowOrgV2alpha1JobSetTemplateSpec**](KubeflowOrgV2alpha1JobSetTemplateSpec.md) | | - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntime.md b/sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntime.md similarity index 88% rename from sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntime.md rename to sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntime.md index c66ce33a67..1ca7338ff9 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntime.md +++ b/sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntime.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1ClusterTrainingRuntime +# TrainerV2alpha1ClusterTrainingRuntime ClusterTrainingRuntime represents a training runtime which can be referenced as part of `runtimeRef` API in TrainJob. This resource is a cluster-scoped and can be referenced by TrainJob that created in *any* namespace. ## Properties @@ -7,7 +7,7 @@ Name | Type | Description | Notes **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ObjectMeta**](V1ObjectMeta.md) | | [optional] -**spec** | [**KubeflowOrgV2alpha1TrainingRuntimeSpec**](KubeflowOrgV2alpha1TrainingRuntimeSpec.md) | | [optional] +**spec** | [**TrainerV2alpha1TrainingRuntimeSpec**](TrainerV2alpha1TrainingRuntimeSpec.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntimeList.md b/sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntimeList.md similarity index 84% rename from sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntimeList.md rename to sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntimeList.md index 6c0cdf3d42..58fe7aa5f6 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1ClusterTrainingRuntimeList.md +++ b/sdk_v2/docs/TrainerV2alpha1ClusterTrainingRuntimeList.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1ClusterTrainingRuntimeList +# TrainerV2alpha1ClusterTrainingRuntimeList ClusterTrainingRuntimeList is a collection of cluster training runtimes. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] -**items** | [**list[KubeflowOrgV2alpha1ClusterTrainingRuntime]**](KubeflowOrgV2alpha1ClusterTrainingRuntime.md) | List of ClusterTrainingRuntimes. | +**items** | [**list[TrainerV2alpha1ClusterTrainingRuntime]**](TrainerV2alpha1ClusterTrainingRuntime.md) | List of ClusterTrainingRuntimes. | **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ListMeta**](V1ListMeta.md) | | [optional] diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1ContainerOverride.md b/sdk_v2/docs/TrainerV2alpha1ContainerOverride.md similarity index 97% rename from sdk_v2/docs/KubeflowOrgV2alpha1ContainerOverride.md rename to sdk_v2/docs/TrainerV2alpha1ContainerOverride.md index 65a0128699..9042532698 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1ContainerOverride.md +++ b/sdk_v2/docs/TrainerV2alpha1ContainerOverride.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1ContainerOverride +# TrainerV2alpha1ContainerOverride ContainerOverride represents parameters that can be overridden using PodSpecOverrides. Parameters from the Trainer, DatasetConfig, and ModelConfig will take precedence. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md b/sdk_v2/docs/TrainerV2alpha1CoschedulingPodGroupPolicySource.md similarity index 92% rename from sdk_v2/docs/KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md rename to sdk_v2/docs/TrainerV2alpha1CoschedulingPodGroupPolicySource.md index 0bbb6cdf68..dc038ae709 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md +++ b/sdk_v2/docs/TrainerV2alpha1CoschedulingPodGroupPolicySource.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource +# TrainerV2alpha1CoschedulingPodGroupPolicySource CoschedulingPodGroupPolicySource represents configuration for coscheduling plugin. The number of min members in the PodGroupSpec is always equal to the number of nodes. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1DatasetConfig.md b/sdk_v2/docs/TrainerV2alpha1DatasetConfig.md similarity index 96% rename from sdk_v2/docs/KubeflowOrgV2alpha1DatasetConfig.md rename to sdk_v2/docs/TrainerV2alpha1DatasetConfig.md index 342306b212..54992bd6e4 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1DatasetConfig.md +++ b/sdk_v2/docs/TrainerV2alpha1DatasetConfig.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1DatasetConfig +# TrainerV2alpha1DatasetConfig DatasetConfig represents the desired dataset configuration. When this API is used, the training runtime must have the `dataset-initializer` container in the `Initializer` Job. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1InputModel.md b/sdk_v2/docs/TrainerV2alpha1InputModel.md similarity index 95% rename from sdk_v2/docs/KubeflowOrgV2alpha1InputModel.md rename to sdk_v2/docs/TrainerV2alpha1InputModel.md index 385295c819..98d5693d18 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1InputModel.md +++ b/sdk_v2/docs/TrainerV2alpha1InputModel.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1InputModel +# TrainerV2alpha1InputModel InputModel represents the desired pre-trained model configuration. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1JobSetTemplateSpec.md b/sdk_v2/docs/TrainerV2alpha1JobSetTemplateSpec.md similarity index 92% rename from sdk_v2/docs/KubeflowOrgV2alpha1JobSetTemplateSpec.md rename to sdk_v2/docs/TrainerV2alpha1JobSetTemplateSpec.md index 2e2d808ae3..d221797e6f 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1JobSetTemplateSpec.md +++ b/sdk_v2/docs/TrainerV2alpha1JobSetTemplateSpec.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1JobSetTemplateSpec +# TrainerV2alpha1JobSetTemplateSpec JobSetTemplateSpec represents a template of the desired JobSet. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1JobStatus.md b/sdk_v2/docs/TrainerV2alpha1JobStatus.md similarity index 96% rename from sdk_v2/docs/KubeflowOrgV2alpha1JobStatus.md rename to sdk_v2/docs/TrainerV2alpha1JobStatus.md index ec06fb2fa4..269fabf1ea 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1JobStatus.md +++ b/sdk_v2/docs/TrainerV2alpha1JobStatus.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1JobStatus +# TrainerV2alpha1JobStatus ## Properties Name | Type | Description | Notes diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1MLPolicy.md b/sdk_v2/docs/TrainerV2alpha1MLPolicy.md similarity index 63% rename from sdk_v2/docs/KubeflowOrgV2alpha1MLPolicy.md rename to sdk_v2/docs/TrainerV2alpha1MLPolicy.md index 20c9a250df..57b7daf8e3 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1MLPolicy.md +++ b/sdk_v2/docs/TrainerV2alpha1MLPolicy.md @@ -1,12 +1,12 @@ -# KubeflowOrgV2alpha1MLPolicy +# TrainerV2alpha1MLPolicy MLPolicy represents configuration for the model trining with ML-specific parameters. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**mpi** | [**KubeflowOrgV2alpha1MPIMLPolicySource**](KubeflowOrgV2alpha1MPIMLPolicySource.md) | | [optional] +**mpi** | [**TrainerV2alpha1MPIMLPolicySource**](TrainerV2alpha1MPIMLPolicySource.md) | | [optional] **num_nodes** | **int** | Number of training nodes. Defaults to 1. | [optional] -**torch** | [**KubeflowOrgV2alpha1TorchMLPolicySource**](KubeflowOrgV2alpha1TorchMLPolicySource.md) | | [optional] +**torch** | [**TrainerV2alpha1TorchMLPolicySource**](TrainerV2alpha1TorchMLPolicySource.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1MLPolicySource.md b/sdk_v2/docs/TrainerV2alpha1MLPolicySource.md similarity index 60% rename from sdk_v2/docs/KubeflowOrgV2alpha1MLPolicySource.md rename to sdk_v2/docs/TrainerV2alpha1MLPolicySource.md index fb324b21cc..b2e04e6fa1 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1MLPolicySource.md +++ b/sdk_v2/docs/TrainerV2alpha1MLPolicySource.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1MLPolicySource +# TrainerV2alpha1MLPolicySource MLPolicySource represents the runtime-specific configuration for various technologies. One of the following specs can be set. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**mpi** | [**KubeflowOrgV2alpha1MPIMLPolicySource**](KubeflowOrgV2alpha1MPIMLPolicySource.md) | | [optional] -**torch** | [**KubeflowOrgV2alpha1TorchMLPolicySource**](KubeflowOrgV2alpha1TorchMLPolicySource.md) | | [optional] +**mpi** | [**TrainerV2alpha1MPIMLPolicySource**](TrainerV2alpha1MPIMLPolicySource.md) | | [optional] +**torch** | [**TrainerV2alpha1TorchMLPolicySource**](TrainerV2alpha1TorchMLPolicySource.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1MPIMLPolicySource.md b/sdk_v2/docs/TrainerV2alpha1MPIMLPolicySource.md similarity index 95% rename from sdk_v2/docs/KubeflowOrgV2alpha1MPIMLPolicySource.md rename to sdk_v2/docs/TrainerV2alpha1MPIMLPolicySource.md index 4e95e49c19..1e4e3f6487 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1MPIMLPolicySource.md +++ b/sdk_v2/docs/TrainerV2alpha1MPIMLPolicySource.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1MPIMLPolicySource +# TrainerV2alpha1MPIMLPolicySource MPIMLPolicySource represents a MPI runtime configuration. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1ModelConfig.md b/sdk_v2/docs/TrainerV2alpha1ModelConfig.md similarity index 58% rename from sdk_v2/docs/KubeflowOrgV2alpha1ModelConfig.md rename to sdk_v2/docs/TrainerV2alpha1ModelConfig.md index 45a1f29093..dab5171213 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1ModelConfig.md +++ b/sdk_v2/docs/TrainerV2alpha1ModelConfig.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1ModelConfig +# TrainerV2alpha1ModelConfig ModelConfig represents the desired model configuration. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**input** | [**KubeflowOrgV2alpha1InputModel**](KubeflowOrgV2alpha1InputModel.md) | | [optional] -**output** | [**KubeflowOrgV2alpha1OutputModel**](KubeflowOrgV2alpha1OutputModel.md) | | [optional] +**input** | [**TrainerV2alpha1InputModel**](TrainerV2alpha1InputModel.md) | | [optional] +**output** | [**TrainerV2alpha1OutputModel**](TrainerV2alpha1OutputModel.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1OutputModel.md b/sdk_v2/docs/TrainerV2alpha1OutputModel.md similarity index 95% rename from sdk_v2/docs/KubeflowOrgV2alpha1OutputModel.md rename to sdk_v2/docs/TrainerV2alpha1OutputModel.md index 754c62ea76..8767be52a4 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1OutputModel.md +++ b/sdk_v2/docs/TrainerV2alpha1OutputModel.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1OutputModel +# TrainerV2alpha1OutputModel OutputModel represents the desired trained model configuration. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicy.md b/sdk_v2/docs/TrainerV2alpha1PodGroupPolicy.md similarity index 65% rename from sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicy.md rename to sdk_v2/docs/TrainerV2alpha1PodGroupPolicy.md index ed148dec19..e1b24d75f6 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicy.md +++ b/sdk_v2/docs/TrainerV2alpha1PodGroupPolicy.md @@ -1,10 +1,10 @@ -# KubeflowOrgV2alpha1PodGroupPolicy +# TrainerV2alpha1PodGroupPolicy PodGroupPolicy represents a PodGroup configuration for gang-scheduling. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**coscheduling** | [**KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource**](KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md) | | [optional] +**coscheduling** | [**TrainerV2alpha1CoschedulingPodGroupPolicySource**](TrainerV2alpha1CoschedulingPodGroupPolicySource.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicySource.md b/sdk_v2/docs/TrainerV2alpha1PodGroupPolicySource.md similarity index 66% rename from sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicySource.md rename to sdk_v2/docs/TrainerV2alpha1PodGroupPolicySource.md index 3407c7b18b..eae35bef00 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1PodGroupPolicySource.md +++ b/sdk_v2/docs/TrainerV2alpha1PodGroupPolicySource.md @@ -1,10 +1,10 @@ -# KubeflowOrgV2alpha1PodGroupPolicySource +# TrainerV2alpha1PodGroupPolicySource PodGroupPolicySource represents supported plugins for gang-scheduling. Only one of its members may be specified. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**coscheduling** | [**KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource**](KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource.md) | | [optional] +**coscheduling** | [**TrainerV2alpha1CoschedulingPodGroupPolicySource**](TrainerV2alpha1CoschedulingPodGroupPolicySource.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverride.md b/sdk_v2/docs/TrainerV2alpha1PodSpecOverride.md similarity index 55% rename from sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverride.md rename to sdk_v2/docs/TrainerV2alpha1PodSpecOverride.md index 0c7c7bbfb2..5350578717 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverride.md +++ b/sdk_v2/docs/TrainerV2alpha1PodSpecOverride.md @@ -1,14 +1,14 @@ -# KubeflowOrgV2alpha1PodSpecOverride +# TrainerV2alpha1PodSpecOverride PodSpecOverride represents the custom overrides that will be applied for the TrainJob's resources. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**containers** | [**list[KubeflowOrgV2alpha1ContainerOverride]**](KubeflowOrgV2alpha1ContainerOverride.md) | Overrides for the containers in the desired job templates. | [optional] -**init_containers** | [**list[KubeflowOrgV2alpha1ContainerOverride]**](KubeflowOrgV2alpha1ContainerOverride.md) | Overrides for the init container in the desired job templates. | [optional] +**containers** | [**list[TrainerV2alpha1ContainerOverride]**](TrainerV2alpha1ContainerOverride.md) | Overrides for the containers in the desired job templates. | [optional] +**init_containers** | [**list[TrainerV2alpha1ContainerOverride]**](TrainerV2alpha1ContainerOverride.md) | Overrides for the init container in the desired job templates. | [optional] **node_selector** | **dict(str, str)** | Override for the node selector to place Pod on the specific mode. | [optional] **service_account_name** | **str** | Override for the service account. | [optional] -**target_jobs** | [**list[KubeflowOrgV2alpha1PodSpecOverrideTargetJob]**](KubeflowOrgV2alpha1PodSpecOverrideTargetJob.md) | TrainJobs is the training job replicas in the training runtime template to apply the overrides. | +**target_jobs** | [**list[TrainerV2alpha1PodSpecOverrideTargetJob]**](TrainerV2alpha1PodSpecOverrideTargetJob.md) | TrainJobs is the training job replicas in the training runtime template to apply the overrides. | **tolerations** | [**list[V1Toleration]**](V1Toleration.md) | Override for the Pod's tolerations. | [optional] **volumes** | [**list[V1Volume]**](V1Volume.md) | Overrides for the Pod volume configuration. | [optional] diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverrideTargetJob.md b/sdk_v2/docs/TrainerV2alpha1PodSpecOverrideTargetJob.md similarity index 89% rename from sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverrideTargetJob.md rename to sdk_v2/docs/TrainerV2alpha1PodSpecOverrideTargetJob.md index 2651ada5be..99d3e747ce 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1PodSpecOverrideTargetJob.md +++ b/sdk_v2/docs/TrainerV2alpha1PodSpecOverrideTargetJob.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1PodSpecOverrideTargetJob +# TrainerV2alpha1PodSpecOverrideTargetJob ## Properties Name | Type | Description | Notes diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1RuntimeRef.md b/sdk_v2/docs/TrainerV2alpha1RuntimeRef.md similarity index 88% rename from sdk_v2/docs/KubeflowOrgV2alpha1RuntimeRef.md rename to sdk_v2/docs/TrainerV2alpha1RuntimeRef.md index 0e779f6171..e0d042da18 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1RuntimeRef.md +++ b/sdk_v2/docs/TrainerV2alpha1RuntimeRef.md @@ -1,10 +1,10 @@ -# KubeflowOrgV2alpha1RuntimeRef +# TrainerV2alpha1RuntimeRef RuntimeRef represents the reference to the existing training runtime. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**api_group** | **str** | APIGroup of the runtime being referenced. Defaults to `kubeflow.org`. | [optional] +**api_group** | **str** | APIGroup of the runtime being referenced. Defaults to `trainer.kubeflow.org`. | [optional] **kind** | **str** | Kind of the runtime being referenced. Defaults to ClusterTrainingRuntime. | [optional] **name** | **str** | Name of the runtime being referenced. When namespaced-scoped TrainingRuntime is used, the TrainJob must have the same namespace as the deployed runtime. | [default to ''] diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TorchElasticPolicy.md b/sdk_v2/docs/TrainerV2alpha1TorchElasticPolicy.md similarity index 97% rename from sdk_v2/docs/KubeflowOrgV2alpha1TorchElasticPolicy.md rename to sdk_v2/docs/TrainerV2alpha1TorchElasticPolicy.md index b7d7e41133..f5e3f76d08 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TorchElasticPolicy.md +++ b/sdk_v2/docs/TrainerV2alpha1TorchElasticPolicy.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1TorchElasticPolicy +# TrainerV2alpha1TorchElasticPolicy TorchElasticPolicy represents a configuration for the PyTorch elastic training. If this policy is set, the `.spec.numNodes` parameter must be omitted, since min and max node is used to configure the `torchrun` CLI argument: `--nnodes=minNodes:maxNodes`. Only `c10d` backend is supported for the Rendezvous communication. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TorchMLPolicySource.md b/sdk_v2/docs/TrainerV2alpha1TorchMLPolicySource.md similarity index 79% rename from sdk_v2/docs/KubeflowOrgV2alpha1TorchMLPolicySource.md rename to sdk_v2/docs/TrainerV2alpha1TorchMLPolicySource.md index 72c2a70129..8c0d367566 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TorchMLPolicySource.md +++ b/sdk_v2/docs/TrainerV2alpha1TorchMLPolicySource.md @@ -1,10 +1,10 @@ -# KubeflowOrgV2alpha1TorchMLPolicySource +# TrainerV2alpha1TorchMLPolicySource TorchMLPolicySource represents a PyTorch runtime configuration. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**elastic_policy** | [**KubeflowOrgV2alpha1TorchElasticPolicy**](KubeflowOrgV2alpha1TorchElasticPolicy.md) | | [optional] +**elastic_policy** | [**TrainerV2alpha1TorchElasticPolicy**](TrainerV2alpha1TorchElasticPolicy.md) | | [optional] **num_proc_per_node** | **str** | Number of processes per node. This value is inserted into the `--nproc-per-node` argument of the `torchrun` CLI. Supported values: `auto`, `cpu`, `gpu`, or int value. Defaults to `auto`. | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJob.md b/sdk_v2/docs/TrainerV2alpha1TrainJob.md similarity index 81% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainJob.md rename to sdk_v2/docs/TrainerV2alpha1TrainJob.md index 3b67821127..b08726be63 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJob.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainJob.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1TrainJob +# TrainerV2alpha1TrainJob TrainJob represents configuration of a training job. ## Properties @@ -7,8 +7,8 @@ Name | Type | Description | Notes **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ObjectMeta**](V1ObjectMeta.md) | | [optional] -**spec** | [**KubeflowOrgV2alpha1TrainJobSpec**](KubeflowOrgV2alpha1TrainJobSpec.md) | | [optional] -**status** | [**KubeflowOrgV2alpha1TrainJobStatus**](KubeflowOrgV2alpha1TrainJobStatus.md) | | [optional] +**spec** | [**TrainerV2alpha1TrainJobSpec**](TrainerV2alpha1TrainJobSpec.md) | | [optional] +**status** | [**TrainerV2alpha1TrainJobStatus**](TrainerV2alpha1TrainJobStatus.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobList.md b/sdk_v2/docs/TrainerV2alpha1TrainJobList.md similarity index 88% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainJobList.md rename to sdk_v2/docs/TrainerV2alpha1TrainJobList.md index 340b5de07c..b408fda8a3 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobList.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainJobList.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1TrainJobList +# TrainerV2alpha1TrainJobList TrainJobList is a collection of training jobs. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] -**items** | [**list[KubeflowOrgV2alpha1TrainJob]**](KubeflowOrgV2alpha1TrainJob.md) | List of TrainJobs. | +**items** | [**list[TrainerV2alpha1TrainJob]**](TrainerV2alpha1TrainJob.md) | List of TrainJobs. | **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ListMeta**](V1ListMeta.md) | | [optional] diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobSpec.md b/sdk_v2/docs/TrainerV2alpha1TrainJobSpec.md similarity index 69% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainJobSpec.md rename to sdk_v2/docs/TrainerV2alpha1TrainJobSpec.md index de0ed7656b..f430eb0e46 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobSpec.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainJobSpec.md @@ -1,18 +1,18 @@ -# KubeflowOrgV2alpha1TrainJobSpec +# TrainerV2alpha1TrainJobSpec TrainJobSpec represents specification of the desired TrainJob. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **annotations** | **dict(str, str)** | Annotations to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. | [optional] -**dataset_config** | [**KubeflowOrgV2alpha1DatasetConfig**](KubeflowOrgV2alpha1DatasetConfig.md) | | [optional] +**dataset_config** | [**TrainerV2alpha1DatasetConfig**](TrainerV2alpha1DatasetConfig.md) | | [optional] **labels** | **dict(str, str)** | Labels to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. | [optional] **managed_by** | **str** | ManagedBy is used to indicate the controller or entity that manages a TrainJob. The value must be either an empty, `kubeflow.org/trainjob-controller` or `kueue.x-k8s.io/multikueue`. The built-in TrainJob controller reconciles TrainJob which don't have this field at all or the field value is the reserved string `kubeflow.org/trainjob-controller`, but delegates reconciling TrainJobs with a 'kueue.x-k8s.io/multikueue' to the Kueue. The field is immutable. Defaults to `kubeflow.org/trainjob-controller` | [optional] -**model_config** | [**KubeflowOrgV2alpha1ModelConfig**](KubeflowOrgV2alpha1ModelConfig.md) | | [optional] -**pod_spec_overrides** | [**list[KubeflowOrgV2alpha1PodSpecOverride]**](KubeflowOrgV2alpha1PodSpecOverride.md) | Custom overrides for the training runtime. | [optional] -**runtime_ref** | [**KubeflowOrgV2alpha1RuntimeRef**](KubeflowOrgV2alpha1RuntimeRef.md) | | +**model_config** | [**TrainerV2alpha1ModelConfig**](TrainerV2alpha1ModelConfig.md) | | [optional] +**pod_spec_overrides** | [**list[TrainerV2alpha1PodSpecOverride]**](TrainerV2alpha1PodSpecOverride.md) | Custom overrides for the training runtime. | [optional] +**runtime_ref** | [**TrainerV2alpha1RuntimeRef**](TrainerV2alpha1RuntimeRef.md) | | **suspend** | **bool** | Whether the controller should suspend the running TrainJob. Defaults to false. | [optional] -**trainer** | [**KubeflowOrgV2alpha1Trainer**](KubeflowOrgV2alpha1Trainer.md) | | [optional] +**trainer** | [**TrainerV2alpha1Trainer**](TrainerV2alpha1Trainer.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobStatus.md b/sdk_v2/docs/TrainerV2alpha1TrainJobStatus.md similarity index 69% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainJobStatus.md rename to sdk_v2/docs/TrainerV2alpha1TrainJobStatus.md index 17675f4890..60f2c6ceda 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainJobStatus.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainJobStatus.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1TrainJobStatus +# TrainerV2alpha1TrainJobStatus TrainJobStatus represents the current status of TrainJob. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **conditions** | [**list[V1Condition]**](V1Condition.md) | Conditions for the TrainJob. | [optional] -**jobs_status** | [**list[KubeflowOrgV2alpha1JobStatus]**](KubeflowOrgV2alpha1JobStatus.md) | JobsStatus tracks the child Jobs in TrainJob. | [optional] +**jobs_status** | [**list[TrainerV2alpha1JobStatus]**](TrainerV2alpha1JobStatus.md) | JobsStatus tracks the child Jobs in TrainJob. | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1Trainer.md b/sdk_v2/docs/TrainerV2alpha1Trainer.md similarity index 97% rename from sdk_v2/docs/KubeflowOrgV2alpha1Trainer.md rename to sdk_v2/docs/TrainerV2alpha1Trainer.md index f69b5ba330..6ced94f779 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1Trainer.md +++ b/sdk_v2/docs/TrainerV2alpha1Trainer.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1Trainer +# TrainerV2alpha1Trainer Trainer represents the desired trainer configuration. Every training runtime contains `trainer` container which represents Trainer. ## Properties diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntime.md b/sdk_v2/docs/TrainerV2alpha1TrainingRuntime.md similarity index 89% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntime.md rename to sdk_v2/docs/TrainerV2alpha1TrainingRuntime.md index 8176601f92..15e50055d6 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntime.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainingRuntime.md @@ -1,4 +1,4 @@ -# KubeflowOrgV2alpha1TrainingRuntime +# TrainerV2alpha1TrainingRuntime TrainingRuntime represents a training runtime which can be referenced as part of `runtimeRef` API in TrainJob. This resource is a namespaced-scoped and can be referenced by TrainJob that created in the *same* namespace as the TrainingRuntime. ## Properties @@ -7,7 +7,7 @@ Name | Type | Description | Notes **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ObjectMeta**](V1ObjectMeta.md) | | [optional] -**spec** | [**KubeflowOrgV2alpha1TrainingRuntimeSpec**](KubeflowOrgV2alpha1TrainingRuntimeSpec.md) | | [optional] +**spec** | [**TrainerV2alpha1TrainingRuntimeSpec**](TrainerV2alpha1TrainingRuntimeSpec.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeList.md b/sdk_v2/docs/TrainerV2alpha1TrainingRuntimeList.md similarity index 86% rename from sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeList.md rename to sdk_v2/docs/TrainerV2alpha1TrainingRuntimeList.md index 3008606c7a..1ccf5022b2 100644 --- a/sdk_v2/docs/KubeflowOrgV2alpha1TrainingRuntimeList.md +++ b/sdk_v2/docs/TrainerV2alpha1TrainingRuntimeList.md @@ -1,11 +1,11 @@ -# KubeflowOrgV2alpha1TrainingRuntimeList +# TrainerV2alpha1TrainingRuntimeList TrainingRuntimeList is a collection of training runtimes. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **api_version** | **str** | APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | [optional] -**items** | [**list[KubeflowOrgV2alpha1TrainingRuntime]**](KubeflowOrgV2alpha1TrainingRuntime.md) | List of TrainingRuntimes. | +**items** | [**list[TrainerV2alpha1TrainingRuntime]**](TrainerV2alpha1TrainingRuntime.md) | List of TrainingRuntimes. | **kind** | **str** | Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | [optional] **metadata** | [**V1ListMeta**](V1ListMeta.md) | | [optional] diff --git a/sdk_v2/docs/TrainerV2alpha1TrainingRuntimeSpec.md b/sdk_v2/docs/TrainerV2alpha1TrainingRuntimeSpec.md new file mode 100644 index 0000000000..dbd9ecf48d --- /dev/null +++ b/sdk_v2/docs/TrainerV2alpha1TrainingRuntimeSpec.md @@ -0,0 +1,13 @@ +# TrainerV2alpha1TrainingRuntimeSpec + +TrainingRuntimeSpec represents a specification of the desired training runtime. +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ml_policy** | [**TrainerV2alpha1MLPolicy**](TrainerV2alpha1MLPolicy.md) | | [optional] +**pod_group_policy** | [**TrainerV2alpha1PodGroupPolicy**](TrainerV2alpha1PodGroupPolicy.md) | | [optional] +**template** | [**TrainerV2alpha1JobSetTemplateSpec**](TrainerV2alpha1JobSetTemplateSpec.md) | | + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/sdk_v2/kubeflow/training/api/training_client.py b/sdk_v2/kubeflow/training/api/training_client.py index d9e9c4d862..20e8b6ec1b 100644 --- a/sdk_v2/kubeflow/training/api/training_client.py +++ b/sdk_v2/kubeflow/training/api/training_client.py @@ -102,7 +102,7 @@ def list_runtimes(self) -> List[types.Runtime]: runtime = self.api_client.deserialize( utils.FakeResponse(item), - models.KubeflowOrgV2alpha1ClusterTrainingRuntime, + models.TrainerV2alpha1ClusterTrainingRuntime, ) ml_policy = runtime.spec.ml_policy # type: ignore metadata = runtime.metadata # type: ignore @@ -190,7 +190,7 @@ def train( train_job_name = random.choice(string.ascii_lowercase) + uuid.uuid4().hex[:11] # Build the Trainer. - trainer_crd = models.KubeflowOrgV2alpha1Trainer() + trainer_crd = models.TrainerV2alpha1Trainer() # Add number of nodes to the Trainer. if trainer and trainer.num_nodes: @@ -223,15 +223,15 @@ def train( trainer.fine_tuning_config.peft_config ) - train_job = models.KubeflowOrgV2alpha1TrainJob( + train_job = models.TrainerV2alpha1TrainJob( api_version=constants.API_VERSION, kind=constants.TRAINJOB_KIND, metadata=client.V1ObjectMeta(name=train_job_name), - spec=models.KubeflowOrgV2alpha1TrainJobSpec( - runtime_ref=models.KubeflowOrgV2alpha1RuntimeRef(name=runtime_ref), + spec=models.TrainerV2alpha1TrainJobSpec( + runtime_ref=models.TrainerV2alpha1RuntimeRef(name=runtime_ref), trainer=( trainer_crd - if trainer_crd != models.KubeflowOrgV2alpha1Trainer() + if trainer_crd != models.TrainerV2alpha1Trainer() else None ), dataset_config=utils.get_dataset_config(dataset_config), @@ -267,8 +267,8 @@ def list_jobs(self, runtime_ref: Optional[str] = None) -> List[types.TrainJob]: """List of all TrainJobs. Returns: - List[KubeflowOrgV2alpha1TrainJob]: List of created TrainJobs. It returns an empty list - if TrainJobs don't exist. + List[TrainerV2alpha1TrainJob]: List of created TrainJobs. + It returns an empty list if TrainJobs don't exist. Raises: TimeoutError: Timeout to list TrainJobs. @@ -295,7 +295,7 @@ def list_jobs(self, runtime_ref: Optional[str] = None) -> List[types.TrainJob]: continue trainjob = self.api_client.deserialize( utils.FakeResponse(item), - models.KubeflowOrgV2alpha1TrainJob, + models.TrainerV2alpha1TrainJob, ) result.append(self.__get_trainjob_from_crd(trainjob)) # type: ignore @@ -325,7 +325,7 @@ def get_job(self, name: str) -> types.TrainJob: trainjob = self.api_client.deserialize( utils.FakeResponse(thread.get(constants.DEFAULT_TIMEOUT)), # type: ignore - models.KubeflowOrgV2alpha1TrainJob, + models.TrainerV2alpha1TrainJob, ) except multiprocessing.TimeoutError: @@ -475,7 +475,7 @@ def delete_job(self, name: str): def __get_trainjob_from_crd( self, - trainjob_crd: models.KubeflowOrgV2alpha1TrainJob, + trainjob_crd: models.TrainerV2alpha1TrainJob, ) -> types.TrainJob: name = trainjob_crd.metadata.name # type: ignore diff --git a/sdk_v2/kubeflow/training/models/__init__.py b/sdk_v2/kubeflow/training/models/__init__.py index 9782e44860..f06af027a3 100644 --- a/sdk_v2/kubeflow/training/models/__init__.py +++ b/sdk_v2/kubeflow/training/models/__init__.py @@ -14,34 +14,34 @@ from __future__ import absolute_import # import models into model package -from kubeflow.training.models.kubeflow_org_v2alpha1_cluster_training_runtime import KubeflowOrgV2alpha1ClusterTrainingRuntime -from kubeflow.training.models.kubeflow_org_v2alpha1_cluster_training_runtime_list import KubeflowOrgV2alpha1ClusterTrainingRuntimeList -from kubeflow.training.models.kubeflow_org_v2alpha1_container_override import KubeflowOrgV2alpha1ContainerOverride -from kubeflow.training.models.kubeflow_org_v2alpha1_coscheduling_pod_group_policy_source import KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource -from kubeflow.training.models.kubeflow_org_v2alpha1_dataset_config import KubeflowOrgV2alpha1DatasetConfig -from kubeflow.training.models.kubeflow_org_v2alpha1_input_model import KubeflowOrgV2alpha1InputModel -from kubeflow.training.models.kubeflow_org_v2alpha1_job_set_template_spec import KubeflowOrgV2alpha1JobSetTemplateSpec -from kubeflow.training.models.kubeflow_org_v2alpha1_job_status import KubeflowOrgV2alpha1JobStatus -from kubeflow.training.models.kubeflow_org_v2alpha1_ml_policy import KubeflowOrgV2alpha1MLPolicy -from kubeflow.training.models.kubeflow_org_v2alpha1_ml_policy_source import KubeflowOrgV2alpha1MLPolicySource -from kubeflow.training.models.kubeflow_org_v2alpha1_mpiml_policy_source import KubeflowOrgV2alpha1MPIMLPolicySource -from kubeflow.training.models.kubeflow_org_v2alpha1_model_config import KubeflowOrgV2alpha1ModelConfig -from kubeflow.training.models.kubeflow_org_v2alpha1_output_model import KubeflowOrgV2alpha1OutputModel -from kubeflow.training.models.kubeflow_org_v2alpha1_pod_group_policy import KubeflowOrgV2alpha1PodGroupPolicy -from kubeflow.training.models.kubeflow_org_v2alpha1_pod_group_policy_source import KubeflowOrgV2alpha1PodGroupPolicySource -from kubeflow.training.models.kubeflow_org_v2alpha1_pod_spec_override import KubeflowOrgV2alpha1PodSpecOverride -from kubeflow.training.models.kubeflow_org_v2alpha1_pod_spec_override_target_job import KubeflowOrgV2alpha1PodSpecOverrideTargetJob -from kubeflow.training.models.kubeflow_org_v2alpha1_runtime_ref import KubeflowOrgV2alpha1RuntimeRef -from kubeflow.training.models.kubeflow_org_v2alpha1_torch_elastic_policy import KubeflowOrgV2alpha1TorchElasticPolicy -from kubeflow.training.models.kubeflow_org_v2alpha1_torch_ml_policy_source import KubeflowOrgV2alpha1TorchMLPolicySource -from kubeflow.training.models.kubeflow_org_v2alpha1_train_job import KubeflowOrgV2alpha1TrainJob -from kubeflow.training.models.kubeflow_org_v2alpha1_train_job_list import KubeflowOrgV2alpha1TrainJobList -from kubeflow.training.models.kubeflow_org_v2alpha1_train_job_spec import KubeflowOrgV2alpha1TrainJobSpec -from kubeflow.training.models.kubeflow_org_v2alpha1_train_job_status import KubeflowOrgV2alpha1TrainJobStatus -from kubeflow.training.models.kubeflow_org_v2alpha1_trainer import KubeflowOrgV2alpha1Trainer -from kubeflow.training.models.kubeflow_org_v2alpha1_training_runtime import KubeflowOrgV2alpha1TrainingRuntime -from kubeflow.training.models.kubeflow_org_v2alpha1_training_runtime_list import KubeflowOrgV2alpha1TrainingRuntimeList -from kubeflow.training.models.kubeflow_org_v2alpha1_training_runtime_spec import KubeflowOrgV2alpha1TrainingRuntimeSpec +from kubeflow.training.models.trainer_v2alpha1_cluster_training_runtime import TrainerV2alpha1ClusterTrainingRuntime +from kubeflow.training.models.trainer_v2alpha1_cluster_training_runtime_list import TrainerV2alpha1ClusterTrainingRuntimeList +from kubeflow.training.models.trainer_v2alpha1_container_override import TrainerV2alpha1ContainerOverride +from kubeflow.training.models.trainer_v2alpha1_coscheduling_pod_group_policy_source import TrainerV2alpha1CoschedulingPodGroupPolicySource +from kubeflow.training.models.trainer_v2alpha1_dataset_config import TrainerV2alpha1DatasetConfig +from kubeflow.training.models.trainer_v2alpha1_input_model import TrainerV2alpha1InputModel +from kubeflow.training.models.trainer_v2alpha1_job_set_template_spec import TrainerV2alpha1JobSetTemplateSpec +from kubeflow.training.models.trainer_v2alpha1_job_status import TrainerV2alpha1JobStatus +from kubeflow.training.models.trainer_v2alpha1_ml_policy import TrainerV2alpha1MLPolicy +from kubeflow.training.models.trainer_v2alpha1_ml_policy_source import TrainerV2alpha1MLPolicySource +from kubeflow.training.models.trainer_v2alpha1_mpiml_policy_source import TrainerV2alpha1MPIMLPolicySource +from kubeflow.training.models.trainer_v2alpha1_model_config import TrainerV2alpha1ModelConfig +from kubeflow.training.models.trainer_v2alpha1_output_model import TrainerV2alpha1OutputModel +from kubeflow.training.models.trainer_v2alpha1_pod_group_policy import TrainerV2alpha1PodGroupPolicy +from kubeflow.training.models.trainer_v2alpha1_pod_group_policy_source import TrainerV2alpha1PodGroupPolicySource +from kubeflow.training.models.trainer_v2alpha1_pod_spec_override import TrainerV2alpha1PodSpecOverride +from kubeflow.training.models.trainer_v2alpha1_pod_spec_override_target_job import TrainerV2alpha1PodSpecOverrideTargetJob +from kubeflow.training.models.trainer_v2alpha1_runtime_ref import TrainerV2alpha1RuntimeRef +from kubeflow.training.models.trainer_v2alpha1_torch_elastic_policy import TrainerV2alpha1TorchElasticPolicy +from kubeflow.training.models.trainer_v2alpha1_torch_ml_policy_source import TrainerV2alpha1TorchMLPolicySource +from kubeflow.training.models.trainer_v2alpha1_train_job import TrainerV2alpha1TrainJob +from kubeflow.training.models.trainer_v2alpha1_train_job_list import TrainerV2alpha1TrainJobList +from kubeflow.training.models.trainer_v2alpha1_train_job_spec import TrainerV2alpha1TrainJobSpec +from kubeflow.training.models.trainer_v2alpha1_train_job_status import TrainerV2alpha1TrainJobStatus +from kubeflow.training.models.trainer_v2alpha1_trainer import TrainerV2alpha1Trainer +from kubeflow.training.models.trainer_v2alpha1_training_runtime import TrainerV2alpha1TrainingRuntime +from kubeflow.training.models.trainer_v2alpha1_training_runtime_list import TrainerV2alpha1TrainingRuntimeList +from kubeflow.training.models.trainer_v2alpha1_training_runtime_spec import TrainerV2alpha1TrainingRuntimeSpec # Import JobSet models for the serialization. It imports the Kubernetes models. from jobset.models import * diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime.py similarity index 74% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime.py index 98ab4763ac..d7fc1a0770 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1ClusterTrainingRuntime(object): +class TrainerV2alpha1ClusterTrainingRuntime(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -36,7 +36,7 @@ class KubeflowOrgV2alpha1ClusterTrainingRuntime(object): 'api_version': 'str', 'kind': 'str', 'metadata': 'V1ObjectMeta', - 'spec': 'KubeflowOrgV2alpha1TrainingRuntimeSpec' + 'spec': 'TrainerV2alpha1TrainingRuntimeSpec' } attribute_map = { @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1ClusterTrainingRuntime(object): } def __init__(self, api_version=None, kind=None, metadata=None, spec=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1ClusterTrainingRuntime - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1ClusterTrainingRuntime - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -69,22 +69,22 @@ def __init__(self, api_version=None, kind=None, metadata=None, spec=None, local_ @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :return: The api_version of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntime. + """Sets the api_version of this TrainerV2alpha1ClusterTrainingRuntime. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :type: str """ @@ -92,22 +92,22 @@ def api_version(self, api_version): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + """Gets the kind of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :return: The kind of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1ClusterTrainingRuntime. + """Sets the kind of this TrainerV2alpha1ClusterTrainingRuntime. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :type: str """ @@ -115,20 +115,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :return: The metadata of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :rtype: V1ObjectMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntime. + """Sets the metadata of this TrainerV2alpha1ClusterTrainingRuntime. - :param metadata: The metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 :type: V1ObjectMeta """ @@ -136,21 +136,21 @@ def metadata(self, metadata): @property def spec(self): - """Gets the spec of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 + """Gets the spec of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 - :return: The spec of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TrainingRuntimeSpec + :return: The spec of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 + :rtype: TrainerV2alpha1TrainingRuntimeSpec """ return self._spec @spec.setter def spec(self, spec): - """Sets the spec of this KubeflowOrgV2alpha1ClusterTrainingRuntime. + """Sets the spec of this TrainerV2alpha1ClusterTrainingRuntime. - :param spec: The spec of this KubeflowOrgV2alpha1ClusterTrainingRuntime. # noqa: E501 - :type: KubeflowOrgV2alpha1TrainingRuntimeSpec + :param spec: The spec of this TrainerV2alpha1ClusterTrainingRuntime. # noqa: E501 + :type: TrainerV2alpha1TrainingRuntimeSpec """ self._spec = spec @@ -189,14 +189,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1ClusterTrainingRuntime): + if not isinstance(other, TrainerV2alpha1ClusterTrainingRuntime): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1ClusterTrainingRuntime): + if not isinstance(other, TrainerV2alpha1ClusterTrainingRuntime): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime_list.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime_list.py similarity index 74% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime_list.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime_list.py index 469fb277da..1181ce547c 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_cluster_training_runtime_list.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_cluster_training_runtime_list.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1ClusterTrainingRuntimeList(object): +class TrainerV2alpha1ClusterTrainingRuntimeList(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -34,7 +34,7 @@ class KubeflowOrgV2alpha1ClusterTrainingRuntimeList(object): """ openapi_types = { 'api_version': 'str', - 'items': 'list[KubeflowOrgV2alpha1ClusterTrainingRuntime]', + 'items': 'list[TrainerV2alpha1ClusterTrainingRuntime]', 'kind': 'str', 'metadata': 'V1ListMeta' } @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1ClusterTrainingRuntimeList(object): } def __init__(self, api_version=None, items=None, kind=None, metadata=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1ClusterTrainingRuntimeList - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1ClusterTrainingRuntimeList - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -68,22 +68,22 @@ def __init__(self, api_version=None, items=None, kind=None, metadata=None, local @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :return: The api_version of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. + """Sets the api_version of this TrainerV2alpha1ClusterTrainingRuntimeList. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :type: str """ @@ -91,23 +91,23 @@ def api_version(self, api_version): @property def items(self): - """Gets the items of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + """Gets the items of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 List of ClusterTrainingRuntimes. # noqa: E501 - :return: The items of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1ClusterTrainingRuntime] + :return: The items of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :rtype: list[TrainerV2alpha1ClusterTrainingRuntime] """ return self._items @items.setter def items(self, items): - """Sets the items of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. + """Sets the items of this TrainerV2alpha1ClusterTrainingRuntimeList. List of ClusterTrainingRuntimes. # noqa: E501 - :param items: The items of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 - :type: list[KubeflowOrgV2alpha1ClusterTrainingRuntime] + :param items: The items of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :type: list[TrainerV2alpha1ClusterTrainingRuntime] """ if self.local_vars_configuration.client_side_validation and items is None: # noqa: E501 raise ValueError("Invalid value for `items`, must not be `None`") # noqa: E501 @@ -116,22 +116,22 @@ def items(self, items): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + """Gets the kind of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :return: The kind of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. + """Sets the kind of this TrainerV2alpha1ClusterTrainingRuntimeList. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :type: str """ @@ -139,20 +139,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :return: The metadata of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :rtype: V1ListMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. + """Sets the metadata of this TrainerV2alpha1ClusterTrainingRuntimeList. - :param metadata: The metadata of this KubeflowOrgV2alpha1ClusterTrainingRuntimeList. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1ClusterTrainingRuntimeList. # noqa: E501 :type: V1ListMeta """ @@ -192,14 +192,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1ClusterTrainingRuntimeList): + if not isinstance(other, TrainerV2alpha1ClusterTrainingRuntimeList): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1ClusterTrainingRuntimeList): + if not isinstance(other, TrainerV2alpha1ClusterTrainingRuntimeList): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_container_override.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_container_override.py similarity index 74% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_container_override.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_container_override.py index fc3dbc562c..c04d108e1d 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_container_override.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_container_override.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1ContainerOverride(object): +class TrainerV2alpha1ContainerOverride(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -51,7 +51,7 @@ class KubeflowOrgV2alpha1ContainerOverride(object): } def __init__(self, args=None, command=None, env=None, env_from=None, name='', volume_mounts=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1ContainerOverride - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1ContainerOverride - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -78,22 +78,22 @@ def __init__(self, args=None, command=None, env=None, env_from=None, name='', vo @property def args(self): - """Gets the args of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the args of this TrainerV2alpha1ContainerOverride. # noqa: E501 Arguments to the entrypoint for the training container. # noqa: E501 - :return: The args of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The args of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: list[str] """ return self._args @args.setter def args(self, args): - """Sets the args of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the args of this TrainerV2alpha1ContainerOverride. Arguments to the entrypoint for the training container. # noqa: E501 - :param args: The args of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param args: The args of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: list[str] """ @@ -101,22 +101,22 @@ def args(self, args): @property def command(self): - """Gets the command of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the command of this TrainerV2alpha1ContainerOverride. # noqa: E501 Entrypoint commands for the training container. # noqa: E501 - :return: The command of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The command of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: list[str] """ return self._command @command.setter def command(self, command): - """Sets the command of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the command of this TrainerV2alpha1ContainerOverride. Entrypoint commands for the training container. # noqa: E501 - :param command: The command of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param command: The command of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: list[str] """ @@ -124,22 +124,22 @@ def command(self, command): @property def env(self): - """Gets the env of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the env of this TrainerV2alpha1ContainerOverride. # noqa: E501 List of environment variables to set in the container. These values will be merged with the TrainingRuntime's environments. # noqa: E501 - :return: The env of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The env of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: list[V1EnvVar] """ return self._env @env.setter def env(self, env): - """Sets the env of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the env of this TrainerV2alpha1ContainerOverride. List of environment variables to set in the container. These values will be merged with the TrainingRuntime's environments. # noqa: E501 - :param env: The env of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param env: The env of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: list[V1EnvVar] """ @@ -147,22 +147,22 @@ def env(self, env): @property def env_from(self): - """Gets the env_from of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the env_from of this TrainerV2alpha1ContainerOverride. # noqa: E501 List of sources to populate environment variables in the container. These values will be merged with the TrainingRuntime's environments. # noqa: E501 - :return: The env_from of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The env_from of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: list[V1EnvFromSource] """ return self._env_from @env_from.setter def env_from(self, env_from): - """Sets the env_from of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the env_from of this TrainerV2alpha1ContainerOverride. List of sources to populate environment variables in the container. These values will be merged with the TrainingRuntime's environments. # noqa: E501 - :param env_from: The env_from of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param env_from: The env_from of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: list[V1EnvFromSource] """ @@ -170,22 +170,22 @@ def env_from(self, env_from): @property def name(self): - """Gets the name of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the name of this TrainerV2alpha1ContainerOverride. # noqa: E501 Name for the container. TrainingRuntime must have this container. # noqa: E501 - :return: The name of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The name of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: str """ return self._name @name.setter def name(self, name): - """Sets the name of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the name of this TrainerV2alpha1ContainerOverride. Name for the container. TrainingRuntime must have this container. # noqa: E501 - :param name: The name of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param name: The name of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: str """ if self.local_vars_configuration.client_side_validation and name is None: # noqa: E501 @@ -195,22 +195,22 @@ def name(self, name): @property def volume_mounts(self): - """Gets the volume_mounts of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + """Gets the volume_mounts of this TrainerV2alpha1ContainerOverride. # noqa: E501 Pod volumes to mount into the container's filesystem. # noqa: E501 - :return: The volume_mounts of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :return: The volume_mounts of this TrainerV2alpha1ContainerOverride. # noqa: E501 :rtype: list[V1VolumeMount] """ return self._volume_mounts @volume_mounts.setter def volume_mounts(self, volume_mounts): - """Sets the volume_mounts of this KubeflowOrgV2alpha1ContainerOverride. + """Sets the volume_mounts of this TrainerV2alpha1ContainerOverride. Pod volumes to mount into the container's filesystem. # noqa: E501 - :param volume_mounts: The volume_mounts of this KubeflowOrgV2alpha1ContainerOverride. # noqa: E501 + :param volume_mounts: The volume_mounts of this TrainerV2alpha1ContainerOverride. # noqa: E501 :type: list[V1VolumeMount] """ @@ -250,14 +250,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1ContainerOverride): + if not isinstance(other, TrainerV2alpha1ContainerOverride): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1ContainerOverride): + if not isinstance(other, TrainerV2alpha1ContainerOverride): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_coscheduling_pod_group_policy_source.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_coscheduling_pod_group_policy_source.py similarity index 82% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_coscheduling_pod_group_policy_source.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_coscheduling_pod_group_policy_source.py index 694f1a0076..842ecc2953 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_coscheduling_pod_group_policy_source.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_coscheduling_pod_group_policy_source.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource(object): +class TrainerV2alpha1CoschedulingPodGroupPolicySource(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -41,7 +41,7 @@ class KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource(object): } def __init__(self, schedule_timeout_seconds=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1CoschedulingPodGroupPolicySource - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -54,22 +54,22 @@ def __init__(self, schedule_timeout_seconds=None, local_vars_configuration=None) @property def schedule_timeout_seconds(self): - """Gets the schedule_timeout_seconds of this KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 + """Gets the schedule_timeout_seconds of this TrainerV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 Time threshold to schedule PodGroup for gang-scheduling. If the scheduling timeout is equal to 0, the default value is used. Defaults to 60 seconds. # noqa: E501 - :return: The schedule_timeout_seconds of this KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 + :return: The schedule_timeout_seconds of this TrainerV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 :rtype: int """ return self._schedule_timeout_seconds @schedule_timeout_seconds.setter def schedule_timeout_seconds(self, schedule_timeout_seconds): - """Sets the schedule_timeout_seconds of this KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource. + """Sets the schedule_timeout_seconds of this TrainerV2alpha1CoschedulingPodGroupPolicySource. Time threshold to schedule PodGroup for gang-scheduling. If the scheduling timeout is equal to 0, the default value is used. Defaults to 60 seconds. # noqa: E501 - :param schedule_timeout_seconds: The schedule_timeout_seconds of this KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 + :param schedule_timeout_seconds: The schedule_timeout_seconds of this TrainerV2alpha1CoschedulingPodGroupPolicySource. # noqa: E501 :type: int """ @@ -109,14 +109,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource): + if not isinstance(other, TrainerV2alpha1CoschedulingPodGroupPolicySource): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource): + if not isinstance(other, TrainerV2alpha1CoschedulingPodGroupPolicySource): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_dataset_config.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_dataset_config.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_dataset_config.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_dataset_config.py index d706b36fa0..300974f6e8 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_dataset_config.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_dataset_config.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1DatasetConfig(object): +class TrainerV2alpha1DatasetConfig(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1DatasetConfig(object): } def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1DatasetConfig - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1DatasetConfig - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -64,22 +64,22 @@ def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_confi @property def env(self): - """Gets the env of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + """Gets the env of this TrainerV2alpha1DatasetConfig. # noqa: E501 List of environment variables to set in the dataset initializer container. These values will be merged with the TrainingRuntime's dataset initializer environments. # noqa: E501 - :return: The env of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :return: The env of this TrainerV2alpha1DatasetConfig. # noqa: E501 :rtype: list[V1EnvVar] """ return self._env @env.setter def env(self, env): - """Sets the env of this KubeflowOrgV2alpha1DatasetConfig. + """Sets the env of this TrainerV2alpha1DatasetConfig. List of environment variables to set in the dataset initializer container. These values will be merged with the TrainingRuntime's dataset initializer environments. # noqa: E501 - :param env: The env of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :param env: The env of this TrainerV2alpha1DatasetConfig. # noqa: E501 :type: list[V1EnvVar] """ @@ -87,20 +87,20 @@ def env(self, env): @property def secret_ref(self): - """Gets the secret_ref of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + """Gets the secret_ref of this TrainerV2alpha1DatasetConfig. # noqa: E501 - :return: The secret_ref of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :return: The secret_ref of this TrainerV2alpha1DatasetConfig. # noqa: E501 :rtype: V1LocalObjectReference """ return self._secret_ref @secret_ref.setter def secret_ref(self, secret_ref): - """Sets the secret_ref of this KubeflowOrgV2alpha1DatasetConfig. + """Sets the secret_ref of this TrainerV2alpha1DatasetConfig. - :param secret_ref: The secret_ref of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :param secret_ref: The secret_ref of this TrainerV2alpha1DatasetConfig. # noqa: E501 :type: V1LocalObjectReference """ @@ -108,22 +108,22 @@ def secret_ref(self, secret_ref): @property def storage_uri(self): - """Gets the storage_uri of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + """Gets the storage_uri of this TrainerV2alpha1DatasetConfig. # noqa: E501 Storage uri for the dataset provider. # noqa: E501 - :return: The storage_uri of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :return: The storage_uri of this TrainerV2alpha1DatasetConfig. # noqa: E501 :rtype: str """ return self._storage_uri @storage_uri.setter def storage_uri(self, storage_uri): - """Sets the storage_uri of this KubeflowOrgV2alpha1DatasetConfig. + """Sets the storage_uri of this TrainerV2alpha1DatasetConfig. Storage uri for the dataset provider. # noqa: E501 - :param storage_uri: The storage_uri of this KubeflowOrgV2alpha1DatasetConfig. # noqa: E501 + :param storage_uri: The storage_uri of this TrainerV2alpha1DatasetConfig. # noqa: E501 :type: str """ @@ -163,14 +163,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1DatasetConfig): + if not isinstance(other, TrainerV2alpha1DatasetConfig): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1DatasetConfig): + if not isinstance(other, TrainerV2alpha1DatasetConfig): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_input_model.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_input_model.py similarity index 78% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_input_model.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_input_model.py index 92038070ef..b8ab3fb7ed 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_input_model.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_input_model.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1InputModel(object): +class TrainerV2alpha1InputModel(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1InputModel(object): } def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1InputModel - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1InputModel - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -64,22 +64,22 @@ def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_confi @property def env(self): - """Gets the env of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + """Gets the env of this TrainerV2alpha1InputModel. # noqa: E501 List of environment variables to set in the model initializer container. These values will be merged with the TrainingRuntime's model initializer environments. # noqa: E501 - :return: The env of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :return: The env of this TrainerV2alpha1InputModel. # noqa: E501 :rtype: list[V1EnvVar] """ return self._env @env.setter def env(self, env): - """Sets the env of this KubeflowOrgV2alpha1InputModel. + """Sets the env of this TrainerV2alpha1InputModel. List of environment variables to set in the model initializer container. These values will be merged with the TrainingRuntime's model initializer environments. # noqa: E501 - :param env: The env of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :param env: The env of this TrainerV2alpha1InputModel. # noqa: E501 :type: list[V1EnvVar] """ @@ -87,20 +87,20 @@ def env(self, env): @property def secret_ref(self): - """Gets the secret_ref of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + """Gets the secret_ref of this TrainerV2alpha1InputModel. # noqa: E501 - :return: The secret_ref of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :return: The secret_ref of this TrainerV2alpha1InputModel. # noqa: E501 :rtype: V1LocalObjectReference """ return self._secret_ref @secret_ref.setter def secret_ref(self, secret_ref): - """Sets the secret_ref of this KubeflowOrgV2alpha1InputModel. + """Sets the secret_ref of this TrainerV2alpha1InputModel. - :param secret_ref: The secret_ref of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :param secret_ref: The secret_ref of this TrainerV2alpha1InputModel. # noqa: E501 :type: V1LocalObjectReference """ @@ -108,22 +108,22 @@ def secret_ref(self, secret_ref): @property def storage_uri(self): - """Gets the storage_uri of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + """Gets the storage_uri of this TrainerV2alpha1InputModel. # noqa: E501 Storage uri for the model provider. # noqa: E501 - :return: The storage_uri of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :return: The storage_uri of this TrainerV2alpha1InputModel. # noqa: E501 :rtype: str """ return self._storage_uri @storage_uri.setter def storage_uri(self, storage_uri): - """Sets the storage_uri of this KubeflowOrgV2alpha1InputModel. + """Sets the storage_uri of this TrainerV2alpha1InputModel. Storage uri for the model provider. # noqa: E501 - :param storage_uri: The storage_uri of this KubeflowOrgV2alpha1InputModel. # noqa: E501 + :param storage_uri: The storage_uri of this TrainerV2alpha1InputModel. # noqa: E501 :type: str """ @@ -163,14 +163,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1InputModel): + if not isinstance(other, TrainerV2alpha1InputModel): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1InputModel): + if not isinstance(other, TrainerV2alpha1InputModel): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_set_template_spec.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_set_template_spec.py similarity index 78% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_set_template_spec.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_set_template_spec.py index 4194980ab2..3d95e98826 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_set_template_spec.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_set_template_spec.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1JobSetTemplateSpec(object): +class TrainerV2alpha1JobSetTemplateSpec(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -43,7 +43,7 @@ class KubeflowOrgV2alpha1JobSetTemplateSpec(object): } def __init__(self, metadata=None, spec=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1JobSetTemplateSpec - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1JobSetTemplateSpec - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -59,20 +59,20 @@ def __init__(self, metadata=None, spec=None, local_vars_configuration=None): # @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + :return: The metadata of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 :rtype: V1ObjectMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1JobSetTemplateSpec. + """Sets the metadata of this TrainerV2alpha1JobSetTemplateSpec. - :param metadata: The metadata of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 :type: V1ObjectMeta """ @@ -80,20 +80,20 @@ def metadata(self, metadata): @property def spec(self): - """Gets the spec of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + """Gets the spec of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 - :return: The spec of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + :return: The spec of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 :rtype: JobsetV1alpha2JobSetSpec """ return self._spec @spec.setter def spec(self, spec): - """Sets the spec of this KubeflowOrgV2alpha1JobSetTemplateSpec. + """Sets the spec of this TrainerV2alpha1JobSetTemplateSpec. - :param spec: The spec of this KubeflowOrgV2alpha1JobSetTemplateSpec. # noqa: E501 + :param spec: The spec of this TrainerV2alpha1JobSetTemplateSpec. # noqa: E501 :type: JobsetV1alpha2JobSetSpec """ @@ -133,14 +133,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1JobSetTemplateSpec): + if not isinstance(other, TrainerV2alpha1JobSetTemplateSpec): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1JobSetTemplateSpec): + if not isinstance(other, TrainerV2alpha1JobSetTemplateSpec): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_status.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_status.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_status.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_status.py index c9a5b52851..5202b39b03 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_job_status.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_job_status.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1JobStatus(object): +class TrainerV2alpha1JobStatus(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -51,7 +51,7 @@ class KubeflowOrgV2alpha1JobStatus(object): } def __init__(self, active=0, failed=0, name='', ready=0, succeeded=0, suspended=0, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1JobStatus - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1JobStatus - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -73,22 +73,22 @@ def __init__(self, active=0, failed=0, name='', ready=0, succeeded=0, suspended= @property def active(self): - """Gets the active of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the active of this TrainerV2alpha1JobStatus. # noqa: E501 Active is the number of child Jobs with at least 1 pod in a running or pending state which are not marked for deletion. # noqa: E501 - :return: The active of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The active of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: int """ return self._active @active.setter def active(self, active): - """Sets the active of this KubeflowOrgV2alpha1JobStatus. + """Sets the active of this TrainerV2alpha1JobStatus. Active is the number of child Jobs with at least 1 pod in a running or pending state which are not marked for deletion. # noqa: E501 - :param active: The active of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param active: The active of this TrainerV2alpha1JobStatus. # noqa: E501 :type: int """ if self.local_vars_configuration.client_side_validation and active is None: # noqa: E501 @@ -98,22 +98,22 @@ def active(self, active): @property def failed(self): - """Gets the failed of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the failed of this TrainerV2alpha1JobStatus. # noqa: E501 Failed is the number of failed child Jobs. # noqa: E501 - :return: The failed of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The failed of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: int """ return self._failed @failed.setter def failed(self, failed): - """Sets the failed of this KubeflowOrgV2alpha1JobStatus. + """Sets the failed of this TrainerV2alpha1JobStatus. Failed is the number of failed child Jobs. # noqa: E501 - :param failed: The failed of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param failed: The failed of this TrainerV2alpha1JobStatus. # noqa: E501 :type: int """ if self.local_vars_configuration.client_side_validation and failed is None: # noqa: E501 @@ -123,22 +123,22 @@ def failed(self, failed): @property def name(self): - """Gets the name of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the name of this TrainerV2alpha1JobStatus. # noqa: E501 Name of the child Job. # noqa: E501 - :return: The name of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The name of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: str """ return self._name @name.setter def name(self, name): - """Sets the name of this KubeflowOrgV2alpha1JobStatus. + """Sets the name of this TrainerV2alpha1JobStatus. Name of the child Job. # noqa: E501 - :param name: The name of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param name: The name of this TrainerV2alpha1JobStatus. # noqa: E501 :type: str """ if self.local_vars_configuration.client_side_validation and name is None: # noqa: E501 @@ -148,22 +148,22 @@ def name(self, name): @property def ready(self): - """Gets the ready of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the ready of this TrainerV2alpha1JobStatus. # noqa: E501 Ready is the number of child Jobs where the number of ready pods and completed pods is greater than or equal to the total expected pod count for the child Job. # noqa: E501 - :return: The ready of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The ready of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: int """ return self._ready @ready.setter def ready(self, ready): - """Sets the ready of this KubeflowOrgV2alpha1JobStatus. + """Sets the ready of this TrainerV2alpha1JobStatus. Ready is the number of child Jobs where the number of ready pods and completed pods is greater than or equal to the total expected pod count for the child Job. # noqa: E501 - :param ready: The ready of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param ready: The ready of this TrainerV2alpha1JobStatus. # noqa: E501 :type: int """ if self.local_vars_configuration.client_side_validation and ready is None: # noqa: E501 @@ -173,22 +173,22 @@ def ready(self, ready): @property def succeeded(self): - """Gets the succeeded of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the succeeded of this TrainerV2alpha1JobStatus. # noqa: E501 Succeeded is the number of successfully completed child Jobs. # noqa: E501 - :return: The succeeded of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The succeeded of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: int """ return self._succeeded @succeeded.setter def succeeded(self, succeeded): - """Sets the succeeded of this KubeflowOrgV2alpha1JobStatus. + """Sets the succeeded of this TrainerV2alpha1JobStatus. Succeeded is the number of successfully completed child Jobs. # noqa: E501 - :param succeeded: The succeeded of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param succeeded: The succeeded of this TrainerV2alpha1JobStatus. # noqa: E501 :type: int """ if self.local_vars_configuration.client_side_validation and succeeded is None: # noqa: E501 @@ -198,22 +198,22 @@ def succeeded(self, succeeded): @property def suspended(self): - """Gets the suspended of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + """Gets the suspended of this TrainerV2alpha1JobStatus. # noqa: E501 Suspended is the number of child Jobs which are in a suspended state. # noqa: E501 - :return: The suspended of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :return: The suspended of this TrainerV2alpha1JobStatus. # noqa: E501 :rtype: int """ return self._suspended @suspended.setter def suspended(self, suspended): - """Sets the suspended of this KubeflowOrgV2alpha1JobStatus. + """Sets the suspended of this TrainerV2alpha1JobStatus. Suspended is the number of child Jobs which are in a suspended state. # noqa: E501 - :param suspended: The suspended of this KubeflowOrgV2alpha1JobStatus. # noqa: E501 + :param suspended: The suspended of this TrainerV2alpha1JobStatus. # noqa: E501 :type: int """ if self.local_vars_configuration.client_side_validation and suspended is None: # noqa: E501 @@ -255,14 +255,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1JobStatus): + if not isinstance(other, TrainerV2alpha1JobStatus): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1JobStatus): + if not isinstance(other, TrainerV2alpha1JobStatus): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy.py similarity index 71% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy.py index d01314a38d..24a75d1e0d 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1MLPolicy(object): +class TrainerV2alpha1MLPolicy(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,9 +33,9 @@ class KubeflowOrgV2alpha1MLPolicy(object): and the value is json key in definition. """ openapi_types = { - 'mpi': 'KubeflowOrgV2alpha1MPIMLPolicySource', + 'mpi': 'TrainerV2alpha1MPIMLPolicySource', 'num_nodes': 'int', - 'torch': 'KubeflowOrgV2alpha1TorchMLPolicySource' + 'torch': 'TrainerV2alpha1TorchMLPolicySource' } attribute_map = { @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1MLPolicy(object): } def __init__(self, mpi=None, num_nodes=None, torch=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1MLPolicy - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1MLPolicy - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -64,43 +64,43 @@ def __init__(self, mpi=None, num_nodes=None, torch=None, local_vars_configuratio @property def mpi(self): - """Gets the mpi of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 + """Gets the mpi of this TrainerV2alpha1MLPolicy. # noqa: E501 - :return: The mpi of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 - :rtype: KubeflowOrgV2alpha1MPIMLPolicySource + :return: The mpi of this TrainerV2alpha1MLPolicy. # noqa: E501 + :rtype: TrainerV2alpha1MPIMLPolicySource """ return self._mpi @mpi.setter def mpi(self, mpi): - """Sets the mpi of this KubeflowOrgV2alpha1MLPolicy. + """Sets the mpi of this TrainerV2alpha1MLPolicy. - :param mpi: The mpi of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 - :type: KubeflowOrgV2alpha1MPIMLPolicySource + :param mpi: The mpi of this TrainerV2alpha1MLPolicy. # noqa: E501 + :type: TrainerV2alpha1MPIMLPolicySource """ self._mpi = mpi @property def num_nodes(self): - """Gets the num_nodes of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 + """Gets the num_nodes of this TrainerV2alpha1MLPolicy. # noqa: E501 Number of training nodes. Defaults to 1. # noqa: E501 - :return: The num_nodes of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 + :return: The num_nodes of this TrainerV2alpha1MLPolicy. # noqa: E501 :rtype: int """ return self._num_nodes @num_nodes.setter def num_nodes(self, num_nodes): - """Sets the num_nodes of this KubeflowOrgV2alpha1MLPolicy. + """Sets the num_nodes of this TrainerV2alpha1MLPolicy. Number of training nodes. Defaults to 1. # noqa: E501 - :param num_nodes: The num_nodes of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 + :param num_nodes: The num_nodes of this TrainerV2alpha1MLPolicy. # noqa: E501 :type: int """ @@ -108,21 +108,21 @@ def num_nodes(self, num_nodes): @property def torch(self): - """Gets the torch of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 + """Gets the torch of this TrainerV2alpha1MLPolicy. # noqa: E501 - :return: The torch of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TorchMLPolicySource + :return: The torch of this TrainerV2alpha1MLPolicy. # noqa: E501 + :rtype: TrainerV2alpha1TorchMLPolicySource """ return self._torch @torch.setter def torch(self, torch): - """Sets the torch of this KubeflowOrgV2alpha1MLPolicy. + """Sets the torch of this TrainerV2alpha1MLPolicy. - :param torch: The torch of this KubeflowOrgV2alpha1MLPolicy. # noqa: E501 - :type: KubeflowOrgV2alpha1TorchMLPolicySource + :param torch: The torch of this TrainerV2alpha1MLPolicy. # noqa: E501 + :type: TrainerV2alpha1TorchMLPolicySource """ self._torch = torch @@ -161,14 +161,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1MLPolicy): + if not isinstance(other, TrainerV2alpha1MLPolicy): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1MLPolicy): + if not isinstance(other, TrainerV2alpha1MLPolicy): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy_source.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy_source.py similarity index 72% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy_source.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy_source.py index e8953cb810..ec1c1df6e0 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_ml_policy_source.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_ml_policy_source.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1MLPolicySource(object): +class TrainerV2alpha1MLPolicySource(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,8 +33,8 @@ class KubeflowOrgV2alpha1MLPolicySource(object): and the value is json key in definition. """ openapi_types = { - 'mpi': 'KubeflowOrgV2alpha1MPIMLPolicySource', - 'torch': 'KubeflowOrgV2alpha1TorchMLPolicySource' + 'mpi': 'TrainerV2alpha1MPIMLPolicySource', + 'torch': 'TrainerV2alpha1TorchMLPolicySource' } attribute_map = { @@ -43,7 +43,7 @@ class KubeflowOrgV2alpha1MLPolicySource(object): } def __init__(self, mpi=None, torch=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1MLPolicySource - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1MLPolicySource - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -59,42 +59,42 @@ def __init__(self, mpi=None, torch=None, local_vars_configuration=None): # noqa @property def mpi(self): - """Gets the mpi of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 + """Gets the mpi of this TrainerV2alpha1MLPolicySource. # noqa: E501 - :return: The mpi of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 - :rtype: KubeflowOrgV2alpha1MPIMLPolicySource + :return: The mpi of this TrainerV2alpha1MLPolicySource. # noqa: E501 + :rtype: TrainerV2alpha1MPIMLPolicySource """ return self._mpi @mpi.setter def mpi(self, mpi): - """Sets the mpi of this KubeflowOrgV2alpha1MLPolicySource. + """Sets the mpi of this TrainerV2alpha1MLPolicySource. - :param mpi: The mpi of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 - :type: KubeflowOrgV2alpha1MPIMLPolicySource + :param mpi: The mpi of this TrainerV2alpha1MLPolicySource. # noqa: E501 + :type: TrainerV2alpha1MPIMLPolicySource """ self._mpi = mpi @property def torch(self): - """Gets the torch of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 + """Gets the torch of this TrainerV2alpha1MLPolicySource. # noqa: E501 - :return: The torch of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TorchMLPolicySource + :return: The torch of this TrainerV2alpha1MLPolicySource. # noqa: E501 + :rtype: TrainerV2alpha1TorchMLPolicySource """ return self._torch @torch.setter def torch(self, torch): - """Sets the torch of this KubeflowOrgV2alpha1MLPolicySource. + """Sets the torch of this TrainerV2alpha1MLPolicySource. - :param torch: The torch of this KubeflowOrgV2alpha1MLPolicySource. # noqa: E501 - :type: KubeflowOrgV2alpha1TorchMLPolicySource + :param torch: The torch of this TrainerV2alpha1MLPolicySource. # noqa: E501 + :type: TrainerV2alpha1TorchMLPolicySource """ self._torch = torch @@ -133,14 +133,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1MLPolicySource): + if not isinstance(other, TrainerV2alpha1MLPolicySource): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1MLPolicySource): + if not isinstance(other, TrainerV2alpha1MLPolicySource): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_model_config.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_model_config.py similarity index 72% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_model_config.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_model_config.py index 6ac362cbe0..18a5a86902 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_model_config.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_model_config.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1ModelConfig(object): +class TrainerV2alpha1ModelConfig(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,8 +33,8 @@ class KubeflowOrgV2alpha1ModelConfig(object): and the value is json key in definition. """ openapi_types = { - 'input': 'KubeflowOrgV2alpha1InputModel', - 'output': 'KubeflowOrgV2alpha1OutputModel' + 'input': 'TrainerV2alpha1InputModel', + 'output': 'TrainerV2alpha1OutputModel' } attribute_map = { @@ -43,7 +43,7 @@ class KubeflowOrgV2alpha1ModelConfig(object): } def __init__(self, input=None, output=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1ModelConfig - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1ModelConfig - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -59,42 +59,42 @@ def __init__(self, input=None, output=None, local_vars_configuration=None): # n @property def input(self): - """Gets the input of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 + """Gets the input of this TrainerV2alpha1ModelConfig. # noqa: E501 - :return: The input of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 - :rtype: KubeflowOrgV2alpha1InputModel + :return: The input of this TrainerV2alpha1ModelConfig. # noqa: E501 + :rtype: TrainerV2alpha1InputModel """ return self._input @input.setter def input(self, input): - """Sets the input of this KubeflowOrgV2alpha1ModelConfig. + """Sets the input of this TrainerV2alpha1ModelConfig. - :param input: The input of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 - :type: KubeflowOrgV2alpha1InputModel + :param input: The input of this TrainerV2alpha1ModelConfig. # noqa: E501 + :type: TrainerV2alpha1InputModel """ self._input = input @property def output(self): - """Gets the output of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 + """Gets the output of this TrainerV2alpha1ModelConfig. # noqa: E501 - :return: The output of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 - :rtype: KubeflowOrgV2alpha1OutputModel + :return: The output of this TrainerV2alpha1ModelConfig. # noqa: E501 + :rtype: TrainerV2alpha1OutputModel """ return self._output @output.setter def output(self, output): - """Sets the output of this KubeflowOrgV2alpha1ModelConfig. + """Sets the output of this TrainerV2alpha1ModelConfig. - :param output: The output of this KubeflowOrgV2alpha1ModelConfig. # noqa: E501 - :type: KubeflowOrgV2alpha1OutputModel + :param output: The output of this TrainerV2alpha1ModelConfig. # noqa: E501 + :type: TrainerV2alpha1OutputModel """ self._output = output @@ -133,14 +133,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1ModelConfig): + if not isinstance(other, TrainerV2alpha1ModelConfig): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1ModelConfig): + if not isinstance(other, TrainerV2alpha1ModelConfig): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_mpiml_policy_source.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_mpiml_policy_source.py similarity index 78% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_mpiml_policy_source.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_mpiml_policy_source.py index 08afab12d3..993a9885da 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_mpiml_policy_source.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_mpiml_policy_source.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1MPIMLPolicySource(object): +class TrainerV2alpha1MPIMLPolicySource(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1MPIMLPolicySource(object): } def __init__(self, mpi_implementation=None, num_proc_per_node=None, run_launcher_as_node=None, ssh_auth_mount_path=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1MPIMLPolicySource - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1MPIMLPolicySource - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -69,22 +69,22 @@ def __init__(self, mpi_implementation=None, num_proc_per_node=None, run_launcher @property def mpi_implementation(self): - """Gets the mpi_implementation of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + """Gets the mpi_implementation of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 Implementation name for the MPI to create the appropriate hostfile. Defaults to OpenMPI. # noqa: E501 - :return: The mpi_implementation of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :return: The mpi_implementation of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :rtype: str """ return self._mpi_implementation @mpi_implementation.setter def mpi_implementation(self, mpi_implementation): - """Sets the mpi_implementation of this KubeflowOrgV2alpha1MPIMLPolicySource. + """Sets the mpi_implementation of this TrainerV2alpha1MPIMLPolicySource. Implementation name for the MPI to create the appropriate hostfile. Defaults to OpenMPI. # noqa: E501 - :param mpi_implementation: The mpi_implementation of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :param mpi_implementation: The mpi_implementation of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :type: str """ @@ -92,22 +92,22 @@ def mpi_implementation(self, mpi_implementation): @property def num_proc_per_node(self): - """Gets the num_proc_per_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + """Gets the num_proc_per_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 Number of processes per node. This value is equal to the number of slots for each node in the hostfile. # noqa: E501 - :return: The num_proc_per_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :return: The num_proc_per_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :rtype: int """ return self._num_proc_per_node @num_proc_per_node.setter def num_proc_per_node(self, num_proc_per_node): - """Sets the num_proc_per_node of this KubeflowOrgV2alpha1MPIMLPolicySource. + """Sets the num_proc_per_node of this TrainerV2alpha1MPIMLPolicySource. Number of processes per node. This value is equal to the number of slots for each node in the hostfile. # noqa: E501 - :param num_proc_per_node: The num_proc_per_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :param num_proc_per_node: The num_proc_per_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :type: int """ @@ -115,22 +115,22 @@ def num_proc_per_node(self, num_proc_per_node): @property def run_launcher_as_node(self): - """Gets the run_launcher_as_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + """Gets the run_launcher_as_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 Whether to run training process on the launcher Job. Defaults to false. # noqa: E501 - :return: The run_launcher_as_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :return: The run_launcher_as_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :rtype: bool """ return self._run_launcher_as_node @run_launcher_as_node.setter def run_launcher_as_node(self, run_launcher_as_node): - """Sets the run_launcher_as_node of this KubeflowOrgV2alpha1MPIMLPolicySource. + """Sets the run_launcher_as_node of this TrainerV2alpha1MPIMLPolicySource. Whether to run training process on the launcher Job. Defaults to false. # noqa: E501 - :param run_launcher_as_node: The run_launcher_as_node of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :param run_launcher_as_node: The run_launcher_as_node of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :type: bool """ @@ -138,22 +138,22 @@ def run_launcher_as_node(self, run_launcher_as_node): @property def ssh_auth_mount_path(self): - """Gets the ssh_auth_mount_path of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + """Gets the ssh_auth_mount_path of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 Directory where SSH keys are mounted. # noqa: E501 - :return: The ssh_auth_mount_path of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :return: The ssh_auth_mount_path of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :rtype: str """ return self._ssh_auth_mount_path @ssh_auth_mount_path.setter def ssh_auth_mount_path(self, ssh_auth_mount_path): - """Sets the ssh_auth_mount_path of this KubeflowOrgV2alpha1MPIMLPolicySource. + """Sets the ssh_auth_mount_path of this TrainerV2alpha1MPIMLPolicySource. Directory where SSH keys are mounted. # noqa: E501 - :param ssh_auth_mount_path: The ssh_auth_mount_path of this KubeflowOrgV2alpha1MPIMLPolicySource. # noqa: E501 + :param ssh_auth_mount_path: The ssh_auth_mount_path of this TrainerV2alpha1MPIMLPolicySource. # noqa: E501 :type: str """ @@ -193,14 +193,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1MPIMLPolicySource): + if not isinstance(other, TrainerV2alpha1MPIMLPolicySource): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1MPIMLPolicySource): + if not isinstance(other, TrainerV2alpha1MPIMLPolicySource): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_output_model.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_output_model.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_output_model.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_output_model.py index 22447d8559..1f5444375d 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_output_model.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_output_model.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1OutputModel(object): +class TrainerV2alpha1OutputModel(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1OutputModel(object): } def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1OutputModel - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1OutputModel - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -64,22 +64,22 @@ def __init__(self, env=None, secret_ref=None, storage_uri=None, local_vars_confi @property def env(self): - """Gets the env of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + """Gets the env of this TrainerV2alpha1OutputModel. # noqa: E501 List of environment variables to set in the model exporter container. These values will be merged with the TrainingRuntime's model exporter environments. # noqa: E501 - :return: The env of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :return: The env of this TrainerV2alpha1OutputModel. # noqa: E501 :rtype: list[V1EnvVar] """ return self._env @env.setter def env(self, env): - """Sets the env of this KubeflowOrgV2alpha1OutputModel. + """Sets the env of this TrainerV2alpha1OutputModel. List of environment variables to set in the model exporter container. These values will be merged with the TrainingRuntime's model exporter environments. # noqa: E501 - :param env: The env of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :param env: The env of this TrainerV2alpha1OutputModel. # noqa: E501 :type: list[V1EnvVar] """ @@ -87,20 +87,20 @@ def env(self, env): @property def secret_ref(self): - """Gets the secret_ref of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + """Gets the secret_ref of this TrainerV2alpha1OutputModel. # noqa: E501 - :return: The secret_ref of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :return: The secret_ref of this TrainerV2alpha1OutputModel. # noqa: E501 :rtype: V1LocalObjectReference """ return self._secret_ref @secret_ref.setter def secret_ref(self, secret_ref): - """Sets the secret_ref of this KubeflowOrgV2alpha1OutputModel. + """Sets the secret_ref of this TrainerV2alpha1OutputModel. - :param secret_ref: The secret_ref of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :param secret_ref: The secret_ref of this TrainerV2alpha1OutputModel. # noqa: E501 :type: V1LocalObjectReference """ @@ -108,22 +108,22 @@ def secret_ref(self, secret_ref): @property def storage_uri(self): - """Gets the storage_uri of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + """Gets the storage_uri of this TrainerV2alpha1OutputModel. # noqa: E501 Storage uri for the model exporter. # noqa: E501 - :return: The storage_uri of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :return: The storage_uri of this TrainerV2alpha1OutputModel. # noqa: E501 :rtype: str """ return self._storage_uri @storage_uri.setter def storage_uri(self, storage_uri): - """Sets the storage_uri of this KubeflowOrgV2alpha1OutputModel. + """Sets the storage_uri of this TrainerV2alpha1OutputModel. Storage uri for the model exporter. # noqa: E501 - :param storage_uri: The storage_uri of this KubeflowOrgV2alpha1OutputModel. # noqa: E501 + :param storage_uri: The storage_uri of this TrainerV2alpha1OutputModel. # noqa: E501 :type: str """ @@ -163,14 +163,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1OutputModel): + if not isinstance(other, TrainerV2alpha1OutputModel): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1OutputModel): + if not isinstance(other, TrainerV2alpha1OutputModel): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy.py index 46bb200a21..a56876d6d4 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1PodGroupPolicy(object): +class TrainerV2alpha1PodGroupPolicy(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,7 +33,7 @@ class KubeflowOrgV2alpha1PodGroupPolicy(object): and the value is json key in definition. """ openapi_types = { - 'coscheduling': 'KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource' + 'coscheduling': 'TrainerV2alpha1CoschedulingPodGroupPolicySource' } attribute_map = { @@ -41,7 +41,7 @@ class KubeflowOrgV2alpha1PodGroupPolicy(object): } def __init__(self, coscheduling=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1PodGroupPolicy - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1PodGroupPolicy - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -54,21 +54,21 @@ def __init__(self, coscheduling=None, local_vars_configuration=None): # noqa: E @property def coscheduling(self): - """Gets the coscheduling of this KubeflowOrgV2alpha1PodGroupPolicy. # noqa: E501 + """Gets the coscheduling of this TrainerV2alpha1PodGroupPolicy. # noqa: E501 - :return: The coscheduling of this KubeflowOrgV2alpha1PodGroupPolicy. # noqa: E501 - :rtype: KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource + :return: The coscheduling of this TrainerV2alpha1PodGroupPolicy. # noqa: E501 + :rtype: TrainerV2alpha1CoschedulingPodGroupPolicySource """ return self._coscheduling @coscheduling.setter def coscheduling(self, coscheduling): - """Sets the coscheduling of this KubeflowOrgV2alpha1PodGroupPolicy. + """Sets the coscheduling of this TrainerV2alpha1PodGroupPolicy. - :param coscheduling: The coscheduling of this KubeflowOrgV2alpha1PodGroupPolicy. # noqa: E501 - :type: KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource + :param coscheduling: The coscheduling of this TrainerV2alpha1PodGroupPolicy. # noqa: E501 + :type: TrainerV2alpha1CoschedulingPodGroupPolicySource """ self._coscheduling = coscheduling @@ -107,14 +107,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodGroupPolicy): + if not isinstance(other, TrainerV2alpha1PodGroupPolicy): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodGroupPolicy): + if not isinstance(other, TrainerV2alpha1PodGroupPolicy): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy_source.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy_source.py similarity index 76% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy_source.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy_source.py index 2fcceae7f1..cb40dc964a 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_group_policy_source.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_group_policy_source.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1PodGroupPolicySource(object): +class TrainerV2alpha1PodGroupPolicySource(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,7 +33,7 @@ class KubeflowOrgV2alpha1PodGroupPolicySource(object): and the value is json key in definition. """ openapi_types = { - 'coscheduling': 'KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource' + 'coscheduling': 'TrainerV2alpha1CoschedulingPodGroupPolicySource' } attribute_map = { @@ -41,7 +41,7 @@ class KubeflowOrgV2alpha1PodGroupPolicySource(object): } def __init__(self, coscheduling=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1PodGroupPolicySource - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1PodGroupPolicySource - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -54,21 +54,21 @@ def __init__(self, coscheduling=None, local_vars_configuration=None): # noqa: E @property def coscheduling(self): - """Gets the coscheduling of this KubeflowOrgV2alpha1PodGroupPolicySource. # noqa: E501 + """Gets the coscheduling of this TrainerV2alpha1PodGroupPolicySource. # noqa: E501 - :return: The coscheduling of this KubeflowOrgV2alpha1PodGroupPolicySource. # noqa: E501 - :rtype: KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource + :return: The coscheduling of this TrainerV2alpha1PodGroupPolicySource. # noqa: E501 + :rtype: TrainerV2alpha1CoschedulingPodGroupPolicySource """ return self._coscheduling @coscheduling.setter def coscheduling(self, coscheduling): - """Sets the coscheduling of this KubeflowOrgV2alpha1PodGroupPolicySource. + """Sets the coscheduling of this TrainerV2alpha1PodGroupPolicySource. - :param coscheduling: The coscheduling of this KubeflowOrgV2alpha1PodGroupPolicySource. # noqa: E501 - :type: KubeflowOrgV2alpha1CoschedulingPodGroupPolicySource + :param coscheduling: The coscheduling of this TrainerV2alpha1PodGroupPolicySource. # noqa: E501 + :type: TrainerV2alpha1CoschedulingPodGroupPolicySource """ self._coscheduling = coscheduling @@ -107,14 +107,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodGroupPolicySource): + if not isinstance(other, TrainerV2alpha1PodGroupPolicySource): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodGroupPolicySource): + if not isinstance(other, TrainerV2alpha1PodGroupPolicySource): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override.py similarity index 69% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override.py index 8b137acf0d..2d2beab358 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1PodSpecOverride(object): +class TrainerV2alpha1PodSpecOverride(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,11 +33,11 @@ class KubeflowOrgV2alpha1PodSpecOverride(object): and the value is json key in definition. """ openapi_types = { - 'containers': 'list[KubeflowOrgV2alpha1ContainerOverride]', - 'init_containers': 'list[KubeflowOrgV2alpha1ContainerOverride]', + 'containers': 'list[TrainerV2alpha1ContainerOverride]', + 'init_containers': 'list[TrainerV2alpha1ContainerOverride]', 'node_selector': 'dict(str, str)', 'service_account_name': 'str', - 'target_jobs': 'list[KubeflowOrgV2alpha1PodSpecOverrideTargetJob]', + 'target_jobs': 'list[TrainerV2alpha1PodSpecOverrideTargetJob]', 'tolerations': 'list[V1Toleration]', 'volumes': 'list[V1Volume]' } @@ -53,7 +53,7 @@ class KubeflowOrgV2alpha1PodSpecOverride(object): } def __init__(self, containers=None, init_containers=None, node_selector=None, service_account_name=None, target_jobs=None, tolerations=None, volumes=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1PodSpecOverride - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1PodSpecOverride - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -83,68 +83,68 @@ def __init__(self, containers=None, init_containers=None, node_selector=None, se @property def containers(self): - """Gets the containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Overrides for the containers in the desired job templates. # noqa: E501 - :return: The containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1ContainerOverride] + :return: The containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :rtype: list[TrainerV2alpha1ContainerOverride] """ return self._containers @containers.setter def containers(self, containers): - """Sets the containers of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the containers of this TrainerV2alpha1PodSpecOverride. Overrides for the containers in the desired job templates. # noqa: E501 - :param containers: The containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :type: list[KubeflowOrgV2alpha1ContainerOverride] + :param containers: The containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :type: list[TrainerV2alpha1ContainerOverride] """ self._containers = containers @property def init_containers(self): - """Gets the init_containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the init_containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Overrides for the init container in the desired job templates. # noqa: E501 - :return: The init_containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1ContainerOverride] + :return: The init_containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :rtype: list[TrainerV2alpha1ContainerOverride] """ return self._init_containers @init_containers.setter def init_containers(self, init_containers): - """Sets the init_containers of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the init_containers of this TrainerV2alpha1PodSpecOverride. Overrides for the init container in the desired job templates. # noqa: E501 - :param init_containers: The init_containers of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :type: list[KubeflowOrgV2alpha1ContainerOverride] + :param init_containers: The init_containers of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :type: list[TrainerV2alpha1ContainerOverride] """ self._init_containers = init_containers @property def node_selector(self): - """Gets the node_selector of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the node_selector of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Override for the node selector to place Pod on the specific mode. # noqa: E501 - :return: The node_selector of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :return: The node_selector of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :rtype: dict(str, str) """ return self._node_selector @node_selector.setter def node_selector(self, node_selector): - """Sets the node_selector of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the node_selector of this TrainerV2alpha1PodSpecOverride. Override for the node selector to place Pod on the specific mode. # noqa: E501 - :param node_selector: The node_selector of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :param node_selector: The node_selector of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :type: dict(str, str) """ @@ -152,22 +152,22 @@ def node_selector(self, node_selector): @property def service_account_name(self): - """Gets the service_account_name of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the service_account_name of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Override for the service account. # noqa: E501 - :return: The service_account_name of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :return: The service_account_name of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :rtype: str """ return self._service_account_name @service_account_name.setter def service_account_name(self, service_account_name): - """Sets the service_account_name of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the service_account_name of this TrainerV2alpha1PodSpecOverride. Override for the service account. # noqa: E501 - :param service_account_name: The service_account_name of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :param service_account_name: The service_account_name of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :type: str """ @@ -175,23 +175,23 @@ def service_account_name(self, service_account_name): @property def target_jobs(self): - """Gets the target_jobs of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the target_jobs of this TrainerV2alpha1PodSpecOverride. # noqa: E501 TrainJobs is the training job replicas in the training runtime template to apply the overrides. # noqa: E501 - :return: The target_jobs of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1PodSpecOverrideTargetJob] + :return: The target_jobs of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :rtype: list[TrainerV2alpha1PodSpecOverrideTargetJob] """ return self._target_jobs @target_jobs.setter def target_jobs(self, target_jobs): - """Sets the target_jobs of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the target_jobs of this TrainerV2alpha1PodSpecOverride. TrainJobs is the training job replicas in the training runtime template to apply the overrides. # noqa: E501 - :param target_jobs: The target_jobs of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 - :type: list[KubeflowOrgV2alpha1PodSpecOverrideTargetJob] + :param target_jobs: The target_jobs of this TrainerV2alpha1PodSpecOverride. # noqa: E501 + :type: list[TrainerV2alpha1PodSpecOverrideTargetJob] """ if self.local_vars_configuration.client_side_validation and target_jobs is None: # noqa: E501 raise ValueError("Invalid value for `target_jobs`, must not be `None`") # noqa: E501 @@ -200,22 +200,22 @@ def target_jobs(self, target_jobs): @property def tolerations(self): - """Gets the tolerations of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the tolerations of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Override for the Pod's tolerations. # noqa: E501 - :return: The tolerations of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :return: The tolerations of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :rtype: list[V1Toleration] """ return self._tolerations @tolerations.setter def tolerations(self, tolerations): - """Sets the tolerations of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the tolerations of this TrainerV2alpha1PodSpecOverride. Override for the Pod's tolerations. # noqa: E501 - :param tolerations: The tolerations of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :param tolerations: The tolerations of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :type: list[V1Toleration] """ @@ -223,22 +223,22 @@ def tolerations(self, tolerations): @property def volumes(self): - """Gets the volumes of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + """Gets the volumes of this TrainerV2alpha1PodSpecOverride. # noqa: E501 Overrides for the Pod volume configuration. # noqa: E501 - :return: The volumes of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :return: The volumes of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :rtype: list[V1Volume] """ return self._volumes @volumes.setter def volumes(self, volumes): - """Sets the volumes of this KubeflowOrgV2alpha1PodSpecOverride. + """Sets the volumes of this TrainerV2alpha1PodSpecOverride. Overrides for the Pod volume configuration. # noqa: E501 - :param volumes: The volumes of this KubeflowOrgV2alpha1PodSpecOverride. # noqa: E501 + :param volumes: The volumes of this TrainerV2alpha1PodSpecOverride. # noqa: E501 :type: list[V1Volume] """ @@ -278,14 +278,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodSpecOverride): + if not isinstance(other, TrainerV2alpha1PodSpecOverride): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodSpecOverride): + if not isinstance(other, TrainerV2alpha1PodSpecOverride): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override_target_job.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override_target_job.py similarity index 83% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override_target_job.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override_target_job.py index 1307c70c47..5ab24f6a5f 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_pod_spec_override_target_job.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_pod_spec_override_target_job.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1PodSpecOverrideTargetJob(object): +class TrainerV2alpha1PodSpecOverrideTargetJob(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -41,7 +41,7 @@ class KubeflowOrgV2alpha1PodSpecOverrideTargetJob(object): } def __init__(self, name='', local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1PodSpecOverrideTargetJob - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1PodSpecOverrideTargetJob - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -53,22 +53,22 @@ def __init__(self, name='', local_vars_configuration=None): # noqa: E501 @property def name(self): - """Gets the name of this KubeflowOrgV2alpha1PodSpecOverrideTargetJob. # noqa: E501 + """Gets the name of this TrainerV2alpha1PodSpecOverrideTargetJob. # noqa: E501 Name is the target training job name for which the PodSpec is overridden. # noqa: E501 - :return: The name of this KubeflowOrgV2alpha1PodSpecOverrideTargetJob. # noqa: E501 + :return: The name of this TrainerV2alpha1PodSpecOverrideTargetJob. # noqa: E501 :rtype: str """ return self._name @name.setter def name(self, name): - """Sets the name of this KubeflowOrgV2alpha1PodSpecOverrideTargetJob. + """Sets the name of this TrainerV2alpha1PodSpecOverrideTargetJob. Name is the target training job name for which the PodSpec is overridden. # noqa: E501 - :param name: The name of this KubeflowOrgV2alpha1PodSpecOverrideTargetJob. # noqa: E501 + :param name: The name of this TrainerV2alpha1PodSpecOverrideTargetJob. # noqa: E501 :type: str """ if self.local_vars_configuration.client_side_validation and name is None: # noqa: E501 @@ -110,14 +110,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodSpecOverrideTargetJob): + if not isinstance(other, TrainerV2alpha1PodSpecOverrideTargetJob): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1PodSpecOverrideTargetJob): + if not isinstance(other, TrainerV2alpha1PodSpecOverrideTargetJob): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_runtime_ref.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_runtime_ref.py similarity index 76% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_runtime_ref.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_runtime_ref.py index 63e6bd00bd..5eb2cc1f60 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_runtime_ref.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_runtime_ref.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1RuntimeRef(object): +class TrainerV2alpha1RuntimeRef(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1RuntimeRef(object): } def __init__(self, api_group=None, kind=None, name='', local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1RuntimeRef - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1RuntimeRef - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -63,22 +63,22 @@ def __init__(self, api_group=None, kind=None, name='', local_vars_configuration= @property def api_group(self): - """Gets the api_group of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + """Gets the api_group of this TrainerV2alpha1RuntimeRef. # noqa: E501 - APIGroup of the runtime being referenced. Defaults to `kubeflow.org`. # noqa: E501 + APIGroup of the runtime being referenced. Defaults to `trainer.kubeflow.org`. # noqa: E501 - :return: The api_group of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :return: The api_group of this TrainerV2alpha1RuntimeRef. # noqa: E501 :rtype: str """ return self._api_group @api_group.setter def api_group(self, api_group): - """Sets the api_group of this KubeflowOrgV2alpha1RuntimeRef. + """Sets the api_group of this TrainerV2alpha1RuntimeRef. - APIGroup of the runtime being referenced. Defaults to `kubeflow.org`. # noqa: E501 + APIGroup of the runtime being referenced. Defaults to `trainer.kubeflow.org`. # noqa: E501 - :param api_group: The api_group of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :param api_group: The api_group of this TrainerV2alpha1RuntimeRef. # noqa: E501 :type: str """ @@ -86,22 +86,22 @@ def api_group(self, api_group): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + """Gets the kind of this TrainerV2alpha1RuntimeRef. # noqa: E501 Kind of the runtime being referenced. Defaults to ClusterTrainingRuntime. # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :return: The kind of this TrainerV2alpha1RuntimeRef. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1RuntimeRef. + """Sets the kind of this TrainerV2alpha1RuntimeRef. Kind of the runtime being referenced. Defaults to ClusterTrainingRuntime. # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1RuntimeRef. # noqa: E501 :type: str """ @@ -109,22 +109,22 @@ def kind(self, kind): @property def name(self): - """Gets the name of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + """Gets the name of this TrainerV2alpha1RuntimeRef. # noqa: E501 Name of the runtime being referenced. When namespaced-scoped TrainingRuntime is used, the TrainJob must have the same namespace as the deployed runtime. # noqa: E501 - :return: The name of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :return: The name of this TrainerV2alpha1RuntimeRef. # noqa: E501 :rtype: str """ return self._name @name.setter def name(self, name): - """Sets the name of this KubeflowOrgV2alpha1RuntimeRef. + """Sets the name of this TrainerV2alpha1RuntimeRef. Name of the runtime being referenced. When namespaced-scoped TrainingRuntime is used, the TrainJob must have the same namespace as the deployed runtime. # noqa: E501 - :param name: The name of this KubeflowOrgV2alpha1RuntimeRef. # noqa: E501 + :param name: The name of this TrainerV2alpha1RuntimeRef. # noqa: E501 :type: str """ if self.local_vars_configuration.client_side_validation and name is None: # noqa: E501 @@ -166,14 +166,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1RuntimeRef): + if not isinstance(other, TrainerV2alpha1RuntimeRef): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1RuntimeRef): + if not isinstance(other, TrainerV2alpha1RuntimeRef): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_elastic_policy.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_elastic_policy.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_elastic_policy.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_elastic_policy.py index 9380564f08..392a9c7ecb 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_elastic_policy.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_elastic_policy.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TorchElasticPolicy(object): +class TrainerV2alpha1TorchElasticPolicy(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1TorchElasticPolicy(object): } def __init__(self, max_nodes=None, max_restarts=None, metrics=None, min_nodes=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TorchElasticPolicy - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TorchElasticPolicy - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -69,22 +69,22 @@ def __init__(self, max_nodes=None, max_restarts=None, metrics=None, min_nodes=No @property def max_nodes(self): - """Gets the max_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + """Gets the max_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 Upper limit for the number of nodes to which training job can scale up. # noqa: E501 - :return: The max_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :return: The max_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :rtype: int """ return self._max_nodes @max_nodes.setter def max_nodes(self, max_nodes): - """Sets the max_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. + """Sets the max_nodes of this TrainerV2alpha1TorchElasticPolicy. Upper limit for the number of nodes to which training job can scale up. # noqa: E501 - :param max_nodes: The max_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :param max_nodes: The max_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :type: int """ @@ -92,22 +92,22 @@ def max_nodes(self, max_nodes): @property def max_restarts(self): - """Gets the max_restarts of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + """Gets the max_restarts of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 How many times the training job can be restarted. This value is inserted into the `--max-restarts` argument of the `torchrun` CLI and the `.spec.failurePolicy.maxRestarts` parameter of the training Job. # noqa: E501 - :return: The max_restarts of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :return: The max_restarts of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :rtype: int """ return self._max_restarts @max_restarts.setter def max_restarts(self, max_restarts): - """Sets the max_restarts of this KubeflowOrgV2alpha1TorchElasticPolicy. + """Sets the max_restarts of this TrainerV2alpha1TorchElasticPolicy. How many times the training job can be restarted. This value is inserted into the `--max-restarts` argument of the `torchrun` CLI and the `.spec.failurePolicy.maxRestarts` parameter of the training Job. # noqa: E501 - :param max_restarts: The max_restarts of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :param max_restarts: The max_restarts of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :type: int """ @@ -115,22 +115,22 @@ def max_restarts(self, max_restarts): @property def metrics(self): - """Gets the metrics of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + """Gets the metrics of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 Specification which are used to calculate the desired number of nodes. See the individual metric source types for more information about how each type of metric must respond. The HPA will be created to perform auto-scaling. # noqa: E501 - :return: The metrics of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :return: The metrics of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :rtype: list[K8sIoApiAutoscalingV2MetricSpec] """ return self._metrics @metrics.setter def metrics(self, metrics): - """Sets the metrics of this KubeflowOrgV2alpha1TorchElasticPolicy. + """Sets the metrics of this TrainerV2alpha1TorchElasticPolicy. Specification which are used to calculate the desired number of nodes. See the individual metric source types for more information about how each type of metric must respond. The HPA will be created to perform auto-scaling. # noqa: E501 - :param metrics: The metrics of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :param metrics: The metrics of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :type: list[K8sIoApiAutoscalingV2MetricSpec] """ @@ -138,22 +138,22 @@ def metrics(self, metrics): @property def min_nodes(self): - """Gets the min_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + """Gets the min_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 Lower limit for the number of nodes to which training job can scale down. # noqa: E501 - :return: The min_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :return: The min_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :rtype: int """ return self._min_nodes @min_nodes.setter def min_nodes(self, min_nodes): - """Sets the min_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. + """Sets the min_nodes of this TrainerV2alpha1TorchElasticPolicy. Lower limit for the number of nodes to which training job can scale down. # noqa: E501 - :param min_nodes: The min_nodes of this KubeflowOrgV2alpha1TorchElasticPolicy. # noqa: E501 + :param min_nodes: The min_nodes of this TrainerV2alpha1TorchElasticPolicy. # noqa: E501 :type: int """ @@ -193,14 +193,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TorchElasticPolicy): + if not isinstance(other, TrainerV2alpha1TorchElasticPolicy): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TorchElasticPolicy): + if not isinstance(other, TrainerV2alpha1TorchElasticPolicy): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_ml_policy_source.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_ml_policy_source.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_ml_policy_source.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_ml_policy_source.py index 5cb0d5aa53..8d28f56cb7 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_torch_ml_policy_source.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_torch_ml_policy_source.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TorchMLPolicySource(object): +class TrainerV2alpha1TorchMLPolicySource(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,7 +33,7 @@ class KubeflowOrgV2alpha1TorchMLPolicySource(object): and the value is json key in definition. """ openapi_types = { - 'elastic_policy': 'KubeflowOrgV2alpha1TorchElasticPolicy', + 'elastic_policy': 'TrainerV2alpha1TorchElasticPolicy', 'num_proc_per_node': 'str' } @@ -43,7 +43,7 @@ class KubeflowOrgV2alpha1TorchMLPolicySource(object): } def __init__(self, elastic_policy=None, num_proc_per_node=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TorchMLPolicySource - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TorchMLPolicySource - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -59,43 +59,43 @@ def __init__(self, elastic_policy=None, num_proc_per_node=None, local_vars_confi @property def elastic_policy(self): - """Gets the elastic_policy of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 + """Gets the elastic_policy of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 - :return: The elastic_policy of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TorchElasticPolicy + :return: The elastic_policy of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 + :rtype: TrainerV2alpha1TorchElasticPolicy """ return self._elastic_policy @elastic_policy.setter def elastic_policy(self, elastic_policy): - """Sets the elastic_policy of this KubeflowOrgV2alpha1TorchMLPolicySource. + """Sets the elastic_policy of this TrainerV2alpha1TorchMLPolicySource. - :param elastic_policy: The elastic_policy of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 - :type: KubeflowOrgV2alpha1TorchElasticPolicy + :param elastic_policy: The elastic_policy of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 + :type: TrainerV2alpha1TorchElasticPolicy """ self._elastic_policy = elastic_policy @property def num_proc_per_node(self): - """Gets the num_proc_per_node of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 + """Gets the num_proc_per_node of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 Number of processes per node. This value is inserted into the `--nproc-per-node` argument of the `torchrun` CLI. Supported values: `auto`, `cpu`, `gpu`, or int value. Defaults to `auto`. # noqa: E501 - :return: The num_proc_per_node of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 + :return: The num_proc_per_node of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 :rtype: str """ return self._num_proc_per_node @num_proc_per_node.setter def num_proc_per_node(self, num_proc_per_node): - """Sets the num_proc_per_node of this KubeflowOrgV2alpha1TorchMLPolicySource. + """Sets the num_proc_per_node of this TrainerV2alpha1TorchMLPolicySource. Number of processes per node. This value is inserted into the `--nproc-per-node` argument of the `torchrun` CLI. Supported values: `auto`, `cpu`, `gpu`, or int value. Defaults to `auto`. # noqa: E501 - :param num_proc_per_node: The num_proc_per_node of this KubeflowOrgV2alpha1TorchMLPolicySource. # noqa: E501 + :param num_proc_per_node: The num_proc_per_node of this TrainerV2alpha1TorchMLPolicySource. # noqa: E501 :type: str """ @@ -135,14 +135,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TorchMLPolicySource): + if not isinstance(other, TrainerV2alpha1TorchMLPolicySource): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TorchMLPolicySource): + if not isinstance(other, TrainerV2alpha1TorchMLPolicySource): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job.py similarity index 74% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job.py index f0af810fdb..965e6ba52c 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainJob(object): +class TrainerV2alpha1TrainJob(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -36,8 +36,8 @@ class KubeflowOrgV2alpha1TrainJob(object): 'api_version': 'str', 'kind': 'str', 'metadata': 'V1ObjectMeta', - 'spec': 'KubeflowOrgV2alpha1TrainJobSpec', - 'status': 'KubeflowOrgV2alpha1TrainJobStatus' + 'spec': 'TrainerV2alpha1TrainJobSpec', + 'status': 'TrainerV2alpha1TrainJobStatus' } attribute_map = { @@ -49,7 +49,7 @@ class KubeflowOrgV2alpha1TrainJob(object): } def __init__(self, api_version=None, kind=None, metadata=None, spec=None, status=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainJob - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainJob - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -74,22 +74,22 @@ def __init__(self, api_version=None, kind=None, metadata=None, spec=None, status @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1TrainJob. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :return: The api_version of this TrainerV2alpha1TrainJob. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1TrainJob. + """Sets the api_version of this TrainerV2alpha1TrainJob. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1TrainJob. # noqa: E501 :type: str """ @@ -97,22 +97,22 @@ def api_version(self, api_version): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + """Gets the kind of this TrainerV2alpha1TrainJob. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :return: The kind of this TrainerV2alpha1TrainJob. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1TrainJob. + """Sets the kind of this TrainerV2alpha1TrainJob. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1TrainJob. # noqa: E501 :type: str """ @@ -120,20 +120,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1TrainJob. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :return: The metadata of this TrainerV2alpha1TrainJob. # noqa: E501 :rtype: V1ObjectMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1TrainJob. + """Sets the metadata of this TrainerV2alpha1TrainJob. - :param metadata: The metadata of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1TrainJob. # noqa: E501 :type: V1ObjectMeta """ @@ -141,42 +141,42 @@ def metadata(self, metadata): @property def spec(self): - """Gets the spec of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + """Gets the spec of this TrainerV2alpha1TrainJob. # noqa: E501 - :return: The spec of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TrainJobSpec + :return: The spec of this TrainerV2alpha1TrainJob. # noqa: E501 + :rtype: TrainerV2alpha1TrainJobSpec """ return self._spec @spec.setter def spec(self, spec): - """Sets the spec of this KubeflowOrgV2alpha1TrainJob. + """Sets the spec of this TrainerV2alpha1TrainJob. - :param spec: The spec of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 - :type: KubeflowOrgV2alpha1TrainJobSpec + :param spec: The spec of this TrainerV2alpha1TrainJob. # noqa: E501 + :type: TrainerV2alpha1TrainJobSpec """ self._spec = spec @property def status(self): - """Gets the status of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 + """Gets the status of this TrainerV2alpha1TrainJob. # noqa: E501 - :return: The status of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TrainJobStatus + :return: The status of this TrainerV2alpha1TrainJob. # noqa: E501 + :rtype: TrainerV2alpha1TrainJobStatus """ return self._status @status.setter def status(self, status): - """Sets the status of this KubeflowOrgV2alpha1TrainJob. + """Sets the status of this TrainerV2alpha1TrainJob. - :param status: The status of this KubeflowOrgV2alpha1TrainJob. # noqa: E501 - :type: KubeflowOrgV2alpha1TrainJobStatus + :param status: The status of this TrainerV2alpha1TrainJob. # noqa: E501 + :type: TrainerV2alpha1TrainJobStatus """ self._status = status @@ -215,14 +215,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJob): + if not isinstance(other, TrainerV2alpha1TrainJob): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJob): + if not isinstance(other, TrainerV2alpha1TrainJob): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_list.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_list.py similarity index 77% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_list.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_list.py index 64d4a8fc50..57bd621bfe 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_list.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_list.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainJobList(object): +class TrainerV2alpha1TrainJobList(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -34,7 +34,7 @@ class KubeflowOrgV2alpha1TrainJobList(object): """ openapi_types = { 'api_version': 'str', - 'items': 'list[KubeflowOrgV2alpha1TrainJob]', + 'items': 'list[TrainerV2alpha1TrainJob]', 'kind': 'str', 'metadata': 'V1ListMeta' } @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1TrainJobList(object): } def __init__(self, api_version=None, items=None, kind=None, metadata=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainJobList - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainJobList - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -68,22 +68,22 @@ def __init__(self, api_version=None, items=None, kind=None, metadata=None, local @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1TrainJobList. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :return: The api_version of this TrainerV2alpha1TrainJobList. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1TrainJobList. + """Sets the api_version of this TrainerV2alpha1TrainJobList. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1TrainJobList. # noqa: E501 :type: str """ @@ -91,23 +91,23 @@ def api_version(self, api_version): @property def items(self): - """Gets the items of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + """Gets the items of this TrainerV2alpha1TrainJobList. # noqa: E501 List of TrainJobs. # noqa: E501 - :return: The items of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1TrainJob] + :return: The items of this TrainerV2alpha1TrainJobList. # noqa: E501 + :rtype: list[TrainerV2alpha1TrainJob] """ return self._items @items.setter def items(self, items): - """Sets the items of this KubeflowOrgV2alpha1TrainJobList. + """Sets the items of this TrainerV2alpha1TrainJobList. List of TrainJobs. # noqa: E501 - :param items: The items of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 - :type: list[KubeflowOrgV2alpha1TrainJob] + :param items: The items of this TrainerV2alpha1TrainJobList. # noqa: E501 + :type: list[TrainerV2alpha1TrainJob] """ if self.local_vars_configuration.client_side_validation and items is None: # noqa: E501 raise ValueError("Invalid value for `items`, must not be `None`") # noqa: E501 @@ -116,22 +116,22 @@ def items(self, items): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + """Gets the kind of this TrainerV2alpha1TrainJobList. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :return: The kind of this TrainerV2alpha1TrainJobList. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1TrainJobList. + """Sets the kind of this TrainerV2alpha1TrainJobList. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1TrainJobList. # noqa: E501 :type: str """ @@ -139,20 +139,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1TrainJobList. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :return: The metadata of this TrainerV2alpha1TrainJobList. # noqa: E501 :rtype: V1ListMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1TrainJobList. + """Sets the metadata of this TrainerV2alpha1TrainJobList. - :param metadata: The metadata of this KubeflowOrgV2alpha1TrainJobList. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1TrainJobList. # noqa: E501 :type: V1ListMeta """ @@ -192,14 +192,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobList): + if not isinstance(other, TrainerV2alpha1TrainJobList): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobList): + if not isinstance(other, TrainerV2alpha1TrainJobList): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_spec.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_spec.py similarity index 69% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_spec.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_spec.py index f639e91d33..0448e57b78 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_spec.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_spec.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainJobSpec(object): +class TrainerV2alpha1TrainJobSpec(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -34,14 +34,14 @@ class KubeflowOrgV2alpha1TrainJobSpec(object): """ openapi_types = { 'annotations': 'dict(str, str)', - 'dataset_config': 'KubeflowOrgV2alpha1DatasetConfig', + 'dataset_config': 'TrainerV2alpha1DatasetConfig', 'labels': 'dict(str, str)', 'managed_by': 'str', - 'model_config': 'KubeflowOrgV2alpha1ModelConfig', - 'pod_spec_overrides': 'list[KubeflowOrgV2alpha1PodSpecOverride]', - 'runtime_ref': 'KubeflowOrgV2alpha1RuntimeRef', + 'model_config': 'TrainerV2alpha1ModelConfig', + 'pod_spec_overrides': 'list[TrainerV2alpha1PodSpecOverride]', + 'runtime_ref': 'TrainerV2alpha1RuntimeRef', 'suspend': 'bool', - 'trainer': 'KubeflowOrgV2alpha1Trainer' + 'trainer': 'TrainerV2alpha1Trainer' } attribute_map = { @@ -57,7 +57,7 @@ class KubeflowOrgV2alpha1TrainJobSpec(object): } def __init__(self, annotations=None, dataset_config=None, labels=None, managed_by=None, model_config=None, pod_spec_overrides=None, runtime_ref=None, suspend=None, trainer=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainJobSpec - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainJobSpec - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -93,22 +93,22 @@ def __init__(self, annotations=None, dataset_config=None, labels=None, managed_b @property def annotations(self): - """Gets the annotations of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the annotations of this TrainerV2alpha1TrainJobSpec. # noqa: E501 Annotations to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. # noqa: E501 - :return: The annotations of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :return: The annotations of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :rtype: dict(str, str) """ return self._annotations @annotations.setter def annotations(self, annotations): - """Sets the annotations of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the annotations of this TrainerV2alpha1TrainJobSpec. Annotations to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. # noqa: E501 - :param annotations: The annotations of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :param annotations: The annotations of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :type: dict(str, str) """ @@ -116,43 +116,43 @@ def annotations(self, annotations): @property def dataset_config(self): - """Gets the dataset_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the dataset_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 - :return: The dataset_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1DatasetConfig + :return: The dataset_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :rtype: TrainerV2alpha1DatasetConfig """ return self._dataset_config @dataset_config.setter def dataset_config(self, dataset_config): - """Sets the dataset_config of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the dataset_config of this TrainerV2alpha1TrainJobSpec. - :param dataset_config: The dataset_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1DatasetConfig + :param dataset_config: The dataset_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :type: TrainerV2alpha1DatasetConfig """ self._dataset_config = dataset_config @property def labels(self): - """Gets the labels of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the labels of this TrainerV2alpha1TrainJobSpec. # noqa: E501 Labels to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. # noqa: E501 - :return: The labels of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :return: The labels of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :rtype: dict(str, str) """ return self._labels @labels.setter def labels(self, labels): - """Sets the labels of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the labels of this TrainerV2alpha1TrainJobSpec. Labels to apply for the derivative JobSet and Jobs. They will be merged with the TrainingRuntime values. # noqa: E501 - :param labels: The labels of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :param labels: The labels of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :type: dict(str, str) """ @@ -160,22 +160,22 @@ def labels(self, labels): @property def managed_by(self): - """Gets the managed_by of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the managed_by of this TrainerV2alpha1TrainJobSpec. # noqa: E501 ManagedBy is used to indicate the controller or entity that manages a TrainJob. The value must be either an empty, `kubeflow.org/trainjob-controller` or `kueue.x-k8s.io/multikueue`. The built-in TrainJob controller reconciles TrainJob which don't have this field at all or the field value is the reserved string `kubeflow.org/trainjob-controller`, but delegates reconciling TrainJobs with a 'kueue.x-k8s.io/multikueue' to the Kueue. The field is immutable. Defaults to `kubeflow.org/trainjob-controller` # noqa: E501 - :return: The managed_by of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :return: The managed_by of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :rtype: str """ return self._managed_by @managed_by.setter def managed_by(self, managed_by): - """Sets the managed_by of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the managed_by of this TrainerV2alpha1TrainJobSpec. ManagedBy is used to indicate the controller or entity that manages a TrainJob. The value must be either an empty, `kubeflow.org/trainjob-controller` or `kueue.x-k8s.io/multikueue`. The built-in TrainJob controller reconciles TrainJob which don't have this field at all or the field value is the reserved string `kubeflow.org/trainjob-controller`, but delegates reconciling TrainJobs with a 'kueue.x-k8s.io/multikueue' to the Kueue. The field is immutable. Defaults to `kubeflow.org/trainjob-controller` # noqa: E501 - :param managed_by: The managed_by of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :param managed_by: The managed_by of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :type: str """ @@ -183,65 +183,65 @@ def managed_by(self, managed_by): @property def model_config(self): - """Gets the model_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the model_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 - :return: The model_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1ModelConfig + :return: The model_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :rtype: TrainerV2alpha1ModelConfig """ return self._model_config @model_config.setter def model_config(self, model_config): - """Sets the model_config of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the model_config of this TrainerV2alpha1TrainJobSpec. - :param model_config: The model_config of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1ModelConfig + :param model_config: The model_config of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :type: TrainerV2alpha1ModelConfig """ self._model_config = model_config @property def pod_spec_overrides(self): - """Gets the pod_spec_overrides of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the pod_spec_overrides of this TrainerV2alpha1TrainJobSpec. # noqa: E501 Custom overrides for the training runtime. # noqa: E501 - :return: The pod_spec_overrides of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1PodSpecOverride] + :return: The pod_spec_overrides of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :rtype: list[TrainerV2alpha1PodSpecOverride] """ return self._pod_spec_overrides @pod_spec_overrides.setter def pod_spec_overrides(self, pod_spec_overrides): - """Sets the pod_spec_overrides of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the pod_spec_overrides of this TrainerV2alpha1TrainJobSpec. Custom overrides for the training runtime. # noqa: E501 - :param pod_spec_overrides: The pod_spec_overrides of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :type: list[KubeflowOrgV2alpha1PodSpecOverride] + :param pod_spec_overrides: The pod_spec_overrides of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :type: list[TrainerV2alpha1PodSpecOverride] """ self._pod_spec_overrides = pod_spec_overrides @property def runtime_ref(self): - """Gets the runtime_ref of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the runtime_ref of this TrainerV2alpha1TrainJobSpec. # noqa: E501 - :return: The runtime_ref of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1RuntimeRef + :return: The runtime_ref of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :rtype: TrainerV2alpha1RuntimeRef """ return self._runtime_ref @runtime_ref.setter def runtime_ref(self, runtime_ref): - """Sets the runtime_ref of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the runtime_ref of this TrainerV2alpha1TrainJobSpec. - :param runtime_ref: The runtime_ref of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1RuntimeRef + :param runtime_ref: The runtime_ref of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :type: TrainerV2alpha1RuntimeRef """ if self.local_vars_configuration.client_side_validation and runtime_ref is None: # noqa: E501 raise ValueError("Invalid value for `runtime_ref`, must not be `None`") # noqa: E501 @@ -250,22 +250,22 @@ def runtime_ref(self, runtime_ref): @property def suspend(self): - """Gets the suspend of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the suspend of this TrainerV2alpha1TrainJobSpec. # noqa: E501 Whether the controller should suspend the running TrainJob. Defaults to false. # noqa: E501 - :return: The suspend of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :return: The suspend of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :rtype: bool """ return self._suspend @suspend.setter def suspend(self, suspend): - """Sets the suspend of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the suspend of this TrainerV2alpha1TrainJobSpec. Whether the controller should suspend the running TrainJob. Defaults to false. # noqa: E501 - :param suspend: The suspend of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + :param suspend: The suspend of this TrainerV2alpha1TrainJobSpec. # noqa: E501 :type: bool """ @@ -273,21 +273,21 @@ def suspend(self, suspend): @property def trainer(self): - """Gets the trainer of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 + """Gets the trainer of this TrainerV2alpha1TrainJobSpec. # noqa: E501 - :return: The trainer of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1Trainer + :return: The trainer of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :rtype: TrainerV2alpha1Trainer """ return self._trainer @trainer.setter def trainer(self, trainer): - """Sets the trainer of this KubeflowOrgV2alpha1TrainJobSpec. + """Sets the trainer of this TrainerV2alpha1TrainJobSpec. - :param trainer: The trainer of this KubeflowOrgV2alpha1TrainJobSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1Trainer + :param trainer: The trainer of this TrainerV2alpha1TrainJobSpec. # noqa: E501 + :type: TrainerV2alpha1Trainer """ self._trainer = trainer @@ -326,14 +326,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobSpec): + if not isinstance(other, TrainerV2alpha1TrainJobSpec): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobSpec): + if not isinstance(other, TrainerV2alpha1TrainJobSpec): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_status.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_status.py similarity index 75% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_status.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_status.py index c1bea06b54..9bce34a28d 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_train_job_status.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_train_job_status.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainJobStatus(object): +class TrainerV2alpha1TrainJobStatus(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -34,7 +34,7 @@ class KubeflowOrgV2alpha1TrainJobStatus(object): """ openapi_types = { 'conditions': 'list[V1Condition]', - 'jobs_status': 'list[KubeflowOrgV2alpha1JobStatus]' + 'jobs_status': 'list[TrainerV2alpha1JobStatus]' } attribute_map = { @@ -43,7 +43,7 @@ class KubeflowOrgV2alpha1TrainJobStatus(object): } def __init__(self, conditions=None, jobs_status=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainJobStatus - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainJobStatus - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -59,22 +59,22 @@ def __init__(self, conditions=None, jobs_status=None, local_vars_configuration=N @property def conditions(self): - """Gets the conditions of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 + """Gets the conditions of this TrainerV2alpha1TrainJobStatus. # noqa: E501 Conditions for the TrainJob. # noqa: E501 - :return: The conditions of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 + :return: The conditions of this TrainerV2alpha1TrainJobStatus. # noqa: E501 :rtype: list[V1Condition] """ return self._conditions @conditions.setter def conditions(self, conditions): - """Sets the conditions of this KubeflowOrgV2alpha1TrainJobStatus. + """Sets the conditions of this TrainerV2alpha1TrainJobStatus. Conditions for the TrainJob. # noqa: E501 - :param conditions: The conditions of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 + :param conditions: The conditions of this TrainerV2alpha1TrainJobStatus. # noqa: E501 :type: list[V1Condition] """ @@ -82,23 +82,23 @@ def conditions(self, conditions): @property def jobs_status(self): - """Gets the jobs_status of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 + """Gets the jobs_status of this TrainerV2alpha1TrainJobStatus. # noqa: E501 JobsStatus tracks the child Jobs in TrainJob. # noqa: E501 - :return: The jobs_status of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1JobStatus] + :return: The jobs_status of this TrainerV2alpha1TrainJobStatus. # noqa: E501 + :rtype: list[TrainerV2alpha1JobStatus] """ return self._jobs_status @jobs_status.setter def jobs_status(self, jobs_status): - """Sets the jobs_status of this KubeflowOrgV2alpha1TrainJobStatus. + """Sets the jobs_status of this TrainerV2alpha1TrainJobStatus. JobsStatus tracks the child Jobs in TrainJob. # noqa: E501 - :param jobs_status: The jobs_status of this KubeflowOrgV2alpha1TrainJobStatus. # noqa: E501 - :type: list[KubeflowOrgV2alpha1JobStatus] + :param jobs_status: The jobs_status of this TrainerV2alpha1TrainJobStatus. # noqa: E501 + :type: list[TrainerV2alpha1JobStatus] """ self._jobs_status = jobs_status @@ -137,14 +137,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobStatus): + if not isinstance(other, TrainerV2alpha1TrainJobStatus): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainJobStatus): + if not isinstance(other, TrainerV2alpha1TrainJobStatus): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_trainer.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_trainer.py similarity index 75% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_trainer.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_trainer.py index e82d160b96..98af15955b 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_trainer.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_trainer.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1Trainer(object): +class TrainerV2alpha1Trainer(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -53,7 +53,7 @@ class KubeflowOrgV2alpha1Trainer(object): } def __init__(self, args=None, command=None, env=None, image=None, num_nodes=None, num_proc_per_node=None, resources_per_node=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1Trainer - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1Trainer - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -84,22 +84,22 @@ def __init__(self, args=None, command=None, env=None, image=None, num_nodes=None @property def args(self): - """Gets the args of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the args of this TrainerV2alpha1Trainer. # noqa: E501 Arguments to the entrypoint for the training container. # noqa: E501 - :return: The args of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The args of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: list[str] """ return self._args @args.setter def args(self, args): - """Sets the args of this KubeflowOrgV2alpha1Trainer. + """Sets the args of this TrainerV2alpha1Trainer. Arguments to the entrypoint for the training container. # noqa: E501 - :param args: The args of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param args: The args of this TrainerV2alpha1Trainer. # noqa: E501 :type: list[str] """ @@ -107,22 +107,22 @@ def args(self, args): @property def command(self): - """Gets the command of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the command of this TrainerV2alpha1Trainer. # noqa: E501 Entrypoint commands for the training container. # noqa: E501 - :return: The command of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The command of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: list[str] """ return self._command @command.setter def command(self, command): - """Sets the command of this KubeflowOrgV2alpha1Trainer. + """Sets the command of this TrainerV2alpha1Trainer. Entrypoint commands for the training container. # noqa: E501 - :param command: The command of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param command: The command of this TrainerV2alpha1Trainer. # noqa: E501 :type: list[str] """ @@ -130,22 +130,22 @@ def command(self, command): @property def env(self): - """Gets the env of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the env of this TrainerV2alpha1Trainer. # noqa: E501 List of environment variables to set in the training container. These values will be merged with the TrainingRuntime's trainer environments. # noqa: E501 - :return: The env of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The env of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: list[V1EnvVar] """ return self._env @env.setter def env(self, env): - """Sets the env of this KubeflowOrgV2alpha1Trainer. + """Sets the env of this TrainerV2alpha1Trainer. List of environment variables to set in the training container. These values will be merged with the TrainingRuntime's trainer environments. # noqa: E501 - :param env: The env of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param env: The env of this TrainerV2alpha1Trainer. # noqa: E501 :type: list[V1EnvVar] """ @@ -153,22 +153,22 @@ def env(self, env): @property def image(self): - """Gets the image of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the image of this TrainerV2alpha1Trainer. # noqa: E501 Docker image for the training container. # noqa: E501 - :return: The image of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The image of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: str """ return self._image @image.setter def image(self, image): - """Sets the image of this KubeflowOrgV2alpha1Trainer. + """Sets the image of this TrainerV2alpha1Trainer. Docker image for the training container. # noqa: E501 - :param image: The image of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param image: The image of this TrainerV2alpha1Trainer. # noqa: E501 :type: str """ @@ -176,22 +176,22 @@ def image(self, image): @property def num_nodes(self): - """Gets the num_nodes of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the num_nodes of this TrainerV2alpha1Trainer. # noqa: E501 Number of training nodes. # noqa: E501 - :return: The num_nodes of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The num_nodes of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: int """ return self._num_nodes @num_nodes.setter def num_nodes(self, num_nodes): - """Sets the num_nodes of this KubeflowOrgV2alpha1Trainer. + """Sets the num_nodes of this TrainerV2alpha1Trainer. Number of training nodes. # noqa: E501 - :param num_nodes: The num_nodes of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param num_nodes: The num_nodes of this TrainerV2alpha1Trainer. # noqa: E501 :type: int """ @@ -199,22 +199,22 @@ def num_nodes(self, num_nodes): @property def num_proc_per_node(self): - """Gets the num_proc_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the num_proc_per_node of this TrainerV2alpha1Trainer. # noqa: E501 Number of processes/workers/slots on every training node. For the Torch runtime: `auto`, `cpu`, `gpu`, or int value can be set. For the MPI runtime only int value can be set. # noqa: E501 - :return: The num_proc_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The num_proc_per_node of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: str """ return self._num_proc_per_node @num_proc_per_node.setter def num_proc_per_node(self, num_proc_per_node): - """Sets the num_proc_per_node of this KubeflowOrgV2alpha1Trainer. + """Sets the num_proc_per_node of this TrainerV2alpha1Trainer. Number of processes/workers/slots on every training node. For the Torch runtime: `auto`, `cpu`, `gpu`, or int value can be set. For the MPI runtime only int value can be set. # noqa: E501 - :param num_proc_per_node: The num_proc_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param num_proc_per_node: The num_proc_per_node of this TrainerV2alpha1Trainer. # noqa: E501 :type: str """ @@ -222,20 +222,20 @@ def num_proc_per_node(self, num_proc_per_node): @property def resources_per_node(self): - """Gets the resources_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + """Gets the resources_per_node of this TrainerV2alpha1Trainer. # noqa: E501 - :return: The resources_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :return: The resources_per_node of this TrainerV2alpha1Trainer. # noqa: E501 :rtype: V1ResourceRequirements """ return self._resources_per_node @resources_per_node.setter def resources_per_node(self, resources_per_node): - """Sets the resources_per_node of this KubeflowOrgV2alpha1Trainer. + """Sets the resources_per_node of this TrainerV2alpha1Trainer. - :param resources_per_node: The resources_per_node of this KubeflowOrgV2alpha1Trainer. # noqa: E501 + :param resources_per_node: The resources_per_node of this TrainerV2alpha1Trainer. # noqa: E501 :type: V1ResourceRequirements """ @@ -275,14 +275,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1Trainer): + if not isinstance(other, TrainerV2alpha1Trainer): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1Trainer): + if not isinstance(other, TrainerV2alpha1Trainer): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime.py similarity index 75% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime.py index 561067b006..bd870574a2 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainingRuntime(object): +class TrainerV2alpha1TrainingRuntime(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -36,7 +36,7 @@ class KubeflowOrgV2alpha1TrainingRuntime(object): 'api_version': 'str', 'kind': 'str', 'metadata': 'V1ObjectMeta', - 'spec': 'KubeflowOrgV2alpha1TrainingRuntimeSpec' + 'spec': 'TrainerV2alpha1TrainingRuntimeSpec' } attribute_map = { @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1TrainingRuntime(object): } def __init__(self, api_version=None, kind=None, metadata=None, spec=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainingRuntime - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainingRuntime - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -69,22 +69,22 @@ def __init__(self, api_version=None, kind=None, metadata=None, spec=None, local_ @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1TrainingRuntime. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :return: The api_version of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1TrainingRuntime. + """Sets the api_version of this TrainerV2alpha1TrainingRuntime. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :type: str """ @@ -92,22 +92,22 @@ def api_version(self, api_version): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + """Gets the kind of this TrainerV2alpha1TrainingRuntime. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :return: The kind of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1TrainingRuntime. + """Sets the kind of this TrainerV2alpha1TrainingRuntime. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :type: str """ @@ -115,20 +115,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1TrainingRuntime. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :return: The metadata of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :rtype: V1ObjectMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1TrainingRuntime. + """Sets the metadata of this TrainerV2alpha1TrainingRuntime. - :param metadata: The metadata of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1TrainingRuntime. # noqa: E501 :type: V1ObjectMeta """ @@ -136,21 +136,21 @@ def metadata(self, metadata): @property def spec(self): - """Gets the spec of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 + """Gets the spec of this TrainerV2alpha1TrainingRuntime. # noqa: E501 - :return: The spec of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 - :rtype: KubeflowOrgV2alpha1TrainingRuntimeSpec + :return: The spec of this TrainerV2alpha1TrainingRuntime. # noqa: E501 + :rtype: TrainerV2alpha1TrainingRuntimeSpec """ return self._spec @spec.setter def spec(self, spec): - """Sets the spec of this KubeflowOrgV2alpha1TrainingRuntime. + """Sets the spec of this TrainerV2alpha1TrainingRuntime. - :param spec: The spec of this KubeflowOrgV2alpha1TrainingRuntime. # noqa: E501 - :type: KubeflowOrgV2alpha1TrainingRuntimeSpec + :param spec: The spec of this TrainerV2alpha1TrainingRuntime. # noqa: E501 + :type: TrainerV2alpha1TrainingRuntimeSpec """ self._spec = spec @@ -189,14 +189,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntime): + if not isinstance(other, TrainerV2alpha1TrainingRuntime): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntime): + if not isinstance(other, TrainerV2alpha1TrainingRuntime): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_list.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_list.py similarity index 75% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_list.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_list.py index 4e0536522e..fe22f9d905 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_list.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_list.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainingRuntimeList(object): +class TrainerV2alpha1TrainingRuntimeList(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -34,7 +34,7 @@ class KubeflowOrgV2alpha1TrainingRuntimeList(object): """ openapi_types = { 'api_version': 'str', - 'items': 'list[KubeflowOrgV2alpha1TrainingRuntime]', + 'items': 'list[TrainerV2alpha1TrainingRuntime]', 'kind': 'str', 'metadata': 'V1ListMeta' } @@ -47,7 +47,7 @@ class KubeflowOrgV2alpha1TrainingRuntimeList(object): } def __init__(self, api_version=None, items=None, kind=None, metadata=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainingRuntimeList - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainingRuntimeList - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -68,22 +68,22 @@ def __init__(self, api_version=None, items=None, kind=None, metadata=None, local @property def api_version(self): - """Gets the api_version of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + """Gets the api_version of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :return: The api_version of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :return: The api_version of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :rtype: str """ return self._api_version @api_version.setter def api_version(self, api_version): - """Sets the api_version of this KubeflowOrgV2alpha1TrainingRuntimeList. + """Sets the api_version of this TrainerV2alpha1TrainingRuntimeList. APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources # noqa: E501 - :param api_version: The api_version of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :param api_version: The api_version of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :type: str """ @@ -91,23 +91,23 @@ def api_version(self, api_version): @property def items(self): - """Gets the items of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + """Gets the items of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 List of TrainingRuntimes. # noqa: E501 - :return: The items of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 - :rtype: list[KubeflowOrgV2alpha1TrainingRuntime] + :return: The items of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 + :rtype: list[TrainerV2alpha1TrainingRuntime] """ return self._items @items.setter def items(self, items): - """Sets the items of this KubeflowOrgV2alpha1TrainingRuntimeList. + """Sets the items of this TrainerV2alpha1TrainingRuntimeList. List of TrainingRuntimes. # noqa: E501 - :param items: The items of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 - :type: list[KubeflowOrgV2alpha1TrainingRuntime] + :param items: The items of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 + :type: list[TrainerV2alpha1TrainingRuntime] """ if self.local_vars_configuration.client_side_validation and items is None: # noqa: E501 raise ValueError("Invalid value for `items`, must not be `None`") # noqa: E501 @@ -116,22 +116,22 @@ def items(self, items): @property def kind(self): - """Gets the kind of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + """Gets the kind of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :return: The kind of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :return: The kind of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :rtype: str """ return self._kind @kind.setter def kind(self, kind): - """Sets the kind of this KubeflowOrgV2alpha1TrainingRuntimeList. + """Sets the kind of this TrainerV2alpha1TrainingRuntimeList. Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds # noqa: E501 - :param kind: The kind of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :param kind: The kind of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :type: str """ @@ -139,20 +139,20 @@ def kind(self, kind): @property def metadata(self): - """Gets the metadata of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + """Gets the metadata of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 - :return: The metadata of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :return: The metadata of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :rtype: V1ListMeta """ return self._metadata @metadata.setter def metadata(self, metadata): - """Sets the metadata of this KubeflowOrgV2alpha1TrainingRuntimeList. + """Sets the metadata of this TrainerV2alpha1TrainingRuntimeList. - :param metadata: The metadata of this KubeflowOrgV2alpha1TrainingRuntimeList. # noqa: E501 + :param metadata: The metadata of this TrainerV2alpha1TrainingRuntimeList. # noqa: E501 :type: V1ListMeta """ @@ -192,14 +192,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntimeList): + if not isinstance(other, TrainerV2alpha1TrainingRuntimeList): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntimeList): + if not isinstance(other, TrainerV2alpha1TrainingRuntimeList): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_spec.py b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_spec.py similarity index 66% rename from sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_spec.py rename to sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_spec.py index 5669df5552..66a3925eac 100644 --- a/sdk_v2/kubeflow/training/models/kubeflow_org_v2alpha1_training_runtime_spec.py +++ b/sdk_v2/kubeflow/training/models/trainer_v2alpha1_training_runtime_spec.py @@ -18,7 +18,7 @@ from kubeflow.training.configuration import Configuration -class KubeflowOrgV2alpha1TrainingRuntimeSpec(object): +class TrainerV2alpha1TrainingRuntimeSpec(object): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech @@ -33,9 +33,9 @@ class KubeflowOrgV2alpha1TrainingRuntimeSpec(object): and the value is json key in definition. """ openapi_types = { - 'ml_policy': 'KubeflowOrgV2alpha1MLPolicy', - 'pod_group_policy': 'KubeflowOrgV2alpha1PodGroupPolicy', - 'template': 'KubeflowOrgV2alpha1JobSetTemplateSpec' + 'ml_policy': 'TrainerV2alpha1MLPolicy', + 'pod_group_policy': 'TrainerV2alpha1PodGroupPolicy', + 'template': 'TrainerV2alpha1JobSetTemplateSpec' } attribute_map = { @@ -45,7 +45,7 @@ class KubeflowOrgV2alpha1TrainingRuntimeSpec(object): } def __init__(self, ml_policy=None, pod_group_policy=None, template=None, local_vars_configuration=None): # noqa: E501 - """KubeflowOrgV2alpha1TrainingRuntimeSpec - a model defined in OpenAPI""" # noqa: E501 + """TrainerV2alpha1TrainingRuntimeSpec - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() self.local_vars_configuration = local_vars_configuration @@ -63,63 +63,63 @@ def __init__(self, ml_policy=None, pod_group_policy=None, template=None, local_v @property def ml_policy(self): - """Gets the ml_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 + """Gets the ml_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 - :return: The ml_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1MLPolicy + :return: The ml_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :rtype: TrainerV2alpha1MLPolicy """ return self._ml_policy @ml_policy.setter def ml_policy(self, ml_policy): - """Sets the ml_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. + """Sets the ml_policy of this TrainerV2alpha1TrainingRuntimeSpec. - :param ml_policy: The ml_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1MLPolicy + :param ml_policy: The ml_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :type: TrainerV2alpha1MLPolicy """ self._ml_policy = ml_policy @property def pod_group_policy(self): - """Gets the pod_group_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 + """Gets the pod_group_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 - :return: The pod_group_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1PodGroupPolicy + :return: The pod_group_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :rtype: TrainerV2alpha1PodGroupPolicy """ return self._pod_group_policy @pod_group_policy.setter def pod_group_policy(self, pod_group_policy): - """Sets the pod_group_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. + """Sets the pod_group_policy of this TrainerV2alpha1TrainingRuntimeSpec. - :param pod_group_policy: The pod_group_policy of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1PodGroupPolicy + :param pod_group_policy: The pod_group_policy of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :type: TrainerV2alpha1PodGroupPolicy """ self._pod_group_policy = pod_group_policy @property def template(self): - """Gets the template of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 + """Gets the template of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 - :return: The template of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :rtype: KubeflowOrgV2alpha1JobSetTemplateSpec + :return: The template of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :rtype: TrainerV2alpha1JobSetTemplateSpec """ return self._template @template.setter def template(self, template): - """Sets the template of this KubeflowOrgV2alpha1TrainingRuntimeSpec. + """Sets the template of this TrainerV2alpha1TrainingRuntimeSpec. - :param template: The template of this KubeflowOrgV2alpha1TrainingRuntimeSpec. # noqa: E501 - :type: KubeflowOrgV2alpha1JobSetTemplateSpec + :param template: The template of this TrainerV2alpha1TrainingRuntimeSpec. # noqa: E501 + :type: TrainerV2alpha1JobSetTemplateSpec """ if self.local_vars_configuration.client_side_validation and template is None: # noqa: E501 raise ValueError("Invalid value for `template`, must not be `None`") # noqa: E501 @@ -160,14 +160,14 @@ def __repr__(self): def __eq__(self, other): """Returns true if both objects are equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntimeSpec): + if not isinstance(other, TrainerV2alpha1TrainingRuntimeSpec): return False return self.to_dict() == other.to_dict() def __ne__(self, other): """Returns true if both objects are not equal""" - if not isinstance(other, KubeflowOrgV2alpha1TrainingRuntimeSpec): + if not isinstance(other, TrainerV2alpha1TrainingRuntimeSpec): return True return self.to_dict() != other.to_dict() diff --git a/sdk_v2/kubeflow/training/utils/utils.py b/sdk_v2/kubeflow/training/utils/utils.py index cc21b96aa7..57c50c985d 100644 --- a/sdk_v2/kubeflow/training/utils/utils.py +++ b/sdk_v2/kubeflow/training/utils/utils.py @@ -224,7 +224,7 @@ def get_lora_config(lora_config: types.LoraConfig) -> List[client.V1EnvVar]: def get_dataset_config( dataset_config: Optional[types.HuggingFaceDatasetConfig] = None, -) -> Optional[models.KubeflowOrgV2alpha1DatasetConfig]: +) -> Optional[models.TrainerV2alpha1DatasetConfig]: """ Get the TrainJob DatasetConfig from the given config. """ @@ -232,7 +232,7 @@ def get_dataset_config( return None # TODO (andreyvelich): Support more parameters. - ds_config = models.KubeflowOrgV2alpha1DatasetConfig( + ds_config = models.TrainerV2alpha1DatasetConfig( storage_uri=( dataset_config.storage_uri if dataset_config.storage_uri.startswith("hf://") @@ -245,7 +245,7 @@ def get_dataset_config( def get_model_config( model_config: Optional[types.HuggingFaceModelInputConfig] = None, -) -> Optional[models.KubeflowOrgV2alpha1ModelConfig]: +) -> Optional[models.TrainerV2alpha1ModelConfig]: """ Get the TrainJob ModelConfig from the given config. """ @@ -253,8 +253,8 @@ def get_model_config( return None # TODO (andreyvelich): Support more parameters. - m_config = models.KubeflowOrgV2alpha1ModelConfig( - input=models.KubeflowOrgV2alpha1InputModel(storage_uri=model_config.storage_uri) + m_config = models.TrainerV2alpha1ModelConfig( + input=models.TrainergV2alpha1InputModel(storage_uri=model_config.storage_uri) ) return m_config diff --git a/test/integration/controller.v2/trainjob_controller_test.go b/test/integration/controller.v2/trainjob_controller_test.go index 8dd7b0e9c3..5e450e29b8 100644 --- a/test/integration/controller.v2/trainjob_controller_test.go +++ b/test/integration/controller.v2/trainjob_controller_test.go @@ -32,7 +32,7 @@ import ( jobsetconsts "sigs.k8s.io/jobset/pkg/constants" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" "github.com/kubeflow/training-operator/pkg/constants" jobsetplugin "github.com/kubeflow/training-operator/pkg/runtime.v2/framework/plugins/jobset" testingutil "github.com/kubeflow/training-operator/pkg/util.v2/testing" diff --git a/test/integration/framework/framework.go b/test/integration/framework/framework.go index e9612f9fdf..95e9ca6f2b 100644 --- a/test/integration/framework/framework.go +++ b/test/integration/framework/framework.go @@ -41,7 +41,7 @@ import ( jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2" schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" controllerv2 "github.com/kubeflow/training-operator/pkg/controller.v2" runtimecore "github.com/kubeflow/training-operator/pkg/runtime.v2/core" webhooksv2 "github.com/kubeflow/training-operator/pkg/webhooks.v2" diff --git a/test/integration/webhook.v2/clustertrainingruntime_test.go b/test/integration/webhook.v2/clustertrainingruntime_test.go index d419193f7a..eb85365251 100644 --- a/test/integration/webhook.v2/clustertrainingruntime_test.go +++ b/test/integration/webhook.v2/clustertrainingruntime_test.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" testingutil "github.com/kubeflow/training-operator/pkg/util.v2/testing" "github.com/kubeflow/training-operator/test/integration/framework" ) diff --git a/test/integration/webhook.v2/trainingruntime_test.go b/test/integration/webhook.v2/trainingruntime_test.go index e627d6a52f..f2d2179f7f 100644 --- a/test/integration/webhook.v2/trainingruntime_test.go +++ b/test/integration/webhook.v2/trainingruntime_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v2alpha1" + kubeflowv2 "github.com/kubeflow/training-operator/pkg/apis/trainer/v2alpha1" testingutil "github.com/kubeflow/training-operator/pkg/util.v2/testing" "github.com/kubeflow/training-operator/test/integration/framework" )