Skip to content

Commit b1dc4b0

Browse files
Sriram AnanthakrishnanMaxrovr
authored andcommitted
Added - Support for ODSC - Distributed Training V2 (DTv2)
1 parent f8a9dfb commit b1dc4b0

20 files changed

+3075
-261
lines changed

examples/datascience/job/job.tf

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,64 @@ resource "oci_datascience_job" "job" {
6464
artifact_content_length = 1380
6565
artifact_content_disposition = "attachment; filename=job_artifact.py"
6666
delete_related_job_runs = true
67-
# optional parameter
68-
# opc_parent_rpt_url = ""
67+
job_storage_mount_configuration_details_list {
68+
destination_directory_name = "fss"
69+
storage_type = "FILE_STORAGE"
70+
destination_path = "/mnt"
71+
export_id = "<export_id>"
72+
mount_target_id = "<mount_id>"
6973

70-
job_configuration_details {
71-
job_type = "DEFAULT"
72-
maximum_runtime_in_minutes = 30
7374
}
75+
# optional parameter
76+
# opc_parent_rpt_url = ""
7477

75-
job_infrastructure_configuration_details {
76-
job_infrastructure_type = "STANDALONE"
77-
shape_name = "VM.Standard3.Flex"
78-
block_storage_size_in_gbs = 100
79-
subnet_id = oci_core_subnet.tf_subnet.id
80-
81-
# Optional
82-
job_shape_config_details {
83-
memory_in_gbs = 16
84-
ocpus = 2
78+
# job_configuration_details {
79+
# job_type = "DEFAULT"
80+
# maximum_runtime_in_minutes = 30
81+
# }
82+
83+
# job_infrastructure_configuration_details {
84+
# job_infrastructure_type = "STANDALONE"
85+
# shape_name = "VM.Standard3.Flex"
86+
# block_storage_size_in_gbs = 100
87+
# subnet_id = oci_core_subnet.tf_subnet.id
88+
89+
# # Optional
90+
# job_shape_config_details {
91+
# memory_in_gbs = 16
92+
# ocpus = 2
93+
# }
94+
# }
95+
96+
# New Optional parameter for Multi Node
97+
job_node_configuration_details {
98+
job_node_type = "MULTI_NODE"
99+
job_network_configuration {
100+
job_network_type = "CUSTOM_NETWORK"
101+
subnet_id= "<subnet_id>"
85102
}
103+
job_node_group_configuration_details_list {
104+
name= "replica1"
105+
job_configuration_details {
106+
job_type= "DEFAULT"
107+
command_line_arguments= "commandLineArguments"
108+
}
109+
job_infrastructure_configuration_details {
110+
job_infrastructure_type = "MULTI_NODE"
111+
shape_name = "VM.Standard3.Flex"
112+
block_storage_size_in_gbs = 50
113+
subnet_id = "<subnet_id>"
114+
115+
# Optional
116+
job_shape_config_details {
117+
memory_in_gbs = 16
118+
ocpus = 3
119+
}
120+
}
121+
minimum_success_replicas=1
122+
replicas=1
123+
}
124+
startup_order = "IN_ORDER"
86125
}
87126

88127
job_environment_configuration_details {

examples/datascience/pipeline/pipeline.tf

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,21 @@ resource "oci_datascience_pipeline_run" "test_pipeline_run" {
575575
# # log_group_id = oci_logging_log_group.pipeline_run.id
576576
# # # log_id = oci_logging_log.test_log.id
577577
# # }
578+
# New Optional parameter
579+
# # infrastructure_configuration_override_details {
580+
# #Required
581+
# block_storage_size_in_gbs = var.pipeline_infrastructure_configuration_details_block_storage_size_in_gbs
582+
# shape_name = "VM.Standard2.1"
583+
# # optional for custom networking
584+
# subnet_id = var.subnet_id
585+
# #Optional ONLY required if the shape is a flex shape
586+
# # shape_config_details {
587+
588+
# # #Optional
589+
# # memory_in_gbs = var.pipeline_infrastructure_configuration_details_shape_config_details_memory_in_gbs
590+
# # ocpus = var.pipeline_infrastructure_configuration_details_shape_config_details_ocpus
591+
# # }
592+
# }
578593
# project_id = oci_datascience_project.pipeline.id
579594
# step_override_details {
580595
# #Required

internal/integrationtest/datascience_job_run_test.go

Lines changed: 96 additions & 18 deletions
Large diffs are not rendered by default.

internal/integrationtest/datascience_job_test.go

Lines changed: 178 additions & 35 deletions
Large diffs are not rendered by default.

internal/integrationtest/datascience_pipeline_run_test.go

Lines changed: 63 additions & 39 deletions
Large diffs are not rendered by default.

internal/service/datascience/datascience_job_data_source.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ func (s *DatascienceJobDataSourceCrud) SetData() error {
124124
s.D.Set("job_log_configuration_details", nil)
125125
}
126126

127+
if s.Res.JobNodeConfigurationDetails != nil {
128+
jobNodeConfigurationDetailsArray := []interface{}{}
129+
if jobNodeConfigurationDetailsMap := JobNodeConfigurationDetailsToMap(&s.Res.JobNodeConfigurationDetails); jobNodeConfigurationDetailsMap != nil {
130+
jobNodeConfigurationDetailsArray = append(jobNodeConfigurationDetailsArray, jobNodeConfigurationDetailsMap)
131+
}
132+
s.D.Set("job_node_configuration_details", jobNodeConfigurationDetailsArray)
133+
} else {
134+
s.D.Set("job_node_configuration_details", nil)
135+
}
136+
127137
jobStorageMountConfigurationDetailsList := []interface{}{}
128138
for _, item := range s.Res.JobStorageMountConfigurationDetailsList {
129139
jobStorageMountConfigurationDetailsList = append(jobStorageMountConfigurationDetailsList, StorageMountConfigurationDetailsToMap(item))

0 commit comments

Comments
 (0)