Skip to content

Commit 6c494d8

Browse files
SomnathSIknakad
SomnathSI
authored and
knakad
committed
add region support to HKG/GRU/CDG/ARN (#92)
Update 1P algorithms accounts for the new regions.
1 parent 9b90bdf commit 6c494d8

File tree

6 files changed

+159
-2
lines changed

6 files changed

+159
-2
lines changed

‎sagemaker-spark-sdk/src/main/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/ImageURIProvider.scala

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ private[algorithms] object SagerMakerRegionAccountMaps {
4646
Regions.AP_SOUTHEAST_1.getName -> "475088953585",
4747
Regions.CA_CENTRAL_1.getName -> "469771592824",
4848
Regions.EU_WEST_2.getName -> "644912444149",
49-
Regions.US_WEST_1.getName -> "632365934929"
49+
Regions.US_WEST_1.getName -> "632365934929",
50+
Regions.AP_EAST_1.getName -> "286214385809",
51+
Regions.SA_EAST_1.getName -> "855470959533",
52+
Regions.EU_NORTH_1.getName -> "669576153137",
53+
Regions.EU_WEST_3.getName -> "749696950732"
5054
)
5155

5256
// For LDA
@@ -82,7 +86,11 @@ private[algorithms] object SagerMakerRegionAccountMaps {
8286
Regions.AP_SOUTHEAST_1.getName -> "475088953585",
8387
Regions.CA_CENTRAL_1.getName -> "469771592824",
8488
Regions.EU_WEST_2.getName -> "644912444149",
85-
Regions.US_WEST_1.getName -> "632365934929"
89+
Regions.US_WEST_1.getName -> "632365934929",
90+
Regions.AP_EAST_1.getName -> "286214385809",
91+
Regions.SA_EAST_1.getName -> "855470959533",
92+
Regions.EU_NORTH_1.getName -> "669576153137",
93+
Regions.EU_WEST_3.getName -> "749696950732"
8694
)
8795
}
8896

‎sagemaker-spark-sdk/src/test/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/FactorizationMachinesSageMakerEstimatorTests.scala

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,26 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
126126
createFactorizationMachinesBinaryClassifier(region = Regions.US_WEST_1.getName)
127127
assert(estimatorUSWest1.trainingImage ==
128128
"632365934929.dkr.ecr.us-west-1.amazonaws.com/factorization-machines:1")
129+
130+
val estimatorAPEast1 =
131+
createFactorizationMachinesBinaryClassifier(region = Regions.AP_EAST_1.getName)
132+
assert(estimatorAPEast1.trainingImage ==
133+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/factorization-machines:1")
134+
135+
val estimatorSAEast1 =
136+
createFactorizationMachinesBinaryClassifier(region = Regions.SA_EAST_1.getName)
137+
assert(estimatorSAEast1.trainingImage ==
138+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/factorization-machines:1")
139+
140+
val estimatorEUNorth1 =
141+
createFactorizationMachinesBinaryClassifier(region = Regions.EU_NORTH_1.getName)
142+
assert(estimatorEUNorth1.trainingImage ==
143+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/factorization-machines:1")
144+
145+
val estimatorEUWest3 =
146+
createFactorizationMachinesBinaryClassifier(region = Regions.EU_WEST_3.getName)
147+
assert(estimatorEUWest3.trainingImage ==
148+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/factorization-machines:1")
129149
}
130150

131151
it should "use the correct defaults for regressor" in {
@@ -202,6 +222,27 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
202222
createFactorizationMachinesRegressor(region = Regions.US_WEST_1.getName)
203223
assert(estimatorUSWest1.trainingImage ==
204224
"632365934929.dkr.ecr.us-west-1.amazonaws.com/factorization-machines:1")
225+
226+
val estimatorAPEast1 =
227+
createFactorizationMachinesRegressor(region = Regions.AP_EAST_1.getName)
228+
assert(estimatorAPEast1.trainingImage ==
229+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/factorization-machines:1")
230+
231+
val estimatorSAEast1 =
232+
createFactorizationMachinesRegressor(region = Regions.SA_EAST_1.getName)
233+
assert(estimatorSAEast1.trainingImage ==
234+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/factorization-machines:1")
235+
236+
237+
val estimatorEUNorth1 =
238+
createFactorizationMachinesRegressor(region = Regions.EU_NORTH_1.getName)
239+
assert(estimatorEUNorth1.trainingImage ==
240+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/factorization-machines:1")
241+
242+
val estimatorEUWest3 =
243+
createFactorizationMachinesRegressor(region = Regions.EU_WEST_3.getName)
244+
assert(estimatorEUWest3.trainingImage ==
245+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/factorization-machines:1")
205246
}
206247

207248
it should "setFeatureDim" in {

‎sagemaker-spark-sdk/src/test/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/KMeansSageMakerEstimatorTests.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,22 @@ class KMeansSageMakerEstimatorTests extends FlatSpec with Matchers with MockitoS
108108
val estimatorUSWest1 = createKMeansEstimator(region = Regions.US_WEST_1.getName)
109109
assert(estimatorUSWest1.trainingImage ==
110110
"632365934929.dkr.ecr.us-west-1.amazonaws.com/kmeans:1")
111+
112+
val estimatorAPEast1 = createKMeansEstimator(region = Regions.AP_EAST_1.getName)
113+
assert(estimatorAPEast1.trainingImage ==
114+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/kmeans:1")
115+
116+
val estimatorSAEast1 = createKMeansEstimator(region = Regions.SA_EAST_1.getName)
117+
assert(estimatorSAEast1.trainingImage ==
118+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/kmeans:1")
119+
120+
val estimatorEUNorth1 = createKMeansEstimator(region = Regions.EU_NORTH_1.getName)
121+
assert(estimatorEUNorth1.trainingImage ==
122+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/kmeans:1")
123+
124+
val estimatorEUWest3 = createKMeansEstimator(region = Regions.EU_WEST_3.getName)
125+
assert(estimatorEUWest3.trainingImage ==
126+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/kmeans:1")
111127
}
112128

113129
it should "setK" in {

‎sagemaker-spark-sdk/src/test/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/LinearLearnerSageMakerEstimatorTests.scala

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,26 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
131131
createLinearLearnerBinaryClassifier(region = Regions.US_WEST_1.getName)
132132
assert(estimatorUSWest1.trainingImage ==
133133
"632365934929.dkr.ecr.us-west-1.amazonaws.com/linear-learner:1")
134+
135+
val estimatorAPEast1 =
136+
createLinearLearnerBinaryClassifier(region = Regions.AP_EAST_1.getName)
137+
assert(estimatorAPEast1.trainingImage ==
138+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/linear-learner:1")
139+
140+
val estimatorSAEast1 =
141+
createLinearLearnerBinaryClassifier(region = Regions.SA_EAST_1.getName)
142+
assert(estimatorSAEast1.trainingImage ==
143+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/linear-learner:1")
144+
145+
val estimatorEUNorth1 =
146+
createLinearLearnerBinaryClassifier(region = Regions.EU_NORTH_1.getName)
147+
assert(estimatorEUNorth1.trainingImage ==
148+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/linear-learner:1")
149+
150+
val estimatorEUWest3 =
151+
createLinearLearnerBinaryClassifier(region = Regions.EU_WEST_3.getName)
152+
assert(estimatorEUWest3.trainingImage ==
153+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/linear-learner:1")
134154
}
135155

136156
it should "use the correct defaults for multiclass classifier" in {
@@ -211,6 +231,26 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
211231
createLinearLearnerMultiClassClassifier(region = Regions.US_WEST_1.getName)
212232
assert(estimatorUSWest1.trainingImage ==
213233
"632365934929.dkr.ecr.us-west-1.amazonaws.com/linear-learner:1")
234+
235+
val estimatorAPEast1 =
236+
createLinearLearnerMultiClassClassifier(region = Regions.AP_EAST_1.getName)
237+
assert(estimatorAPEast1.trainingImage ==
238+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/linear-learner:1")
239+
240+
val estimatorSAEast1 =
241+
createLinearLearnerMultiClassClassifier(region = Regions.SA_EAST_1.getName)
242+
assert(estimatorSAEast1.trainingImage ==
243+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/linear-learner:1")
244+
245+
val estimatorEUNorth1 =
246+
createLinearLearnerMultiClassClassifier(region = Regions.EU_NORTH_1.getName)
247+
assert(estimatorEUNorth1.trainingImage ==
248+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/linear-learner:1")
249+
250+
val estimatorEUWest3 =
251+
createLinearLearnerMultiClassClassifier(region = Regions.EU_WEST_3.getName)
252+
assert(estimatorEUWest3.trainingImage ==
253+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/linear-learner:1")
214254
}
215255

216256
it should "use the correct defaults for regressor" in {
@@ -287,6 +327,26 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
287327
createLinearLearnerRegressor(region = Regions.US_WEST_1.getName)
288328
assert(estimatorUSWest1.trainingImage ==
289329
"632365934929.dkr.ecr.us-west-1.amazonaws.com/linear-learner:1")
330+
331+
val estimatorAPEast1 =
332+
createLinearLearnerRegressor(region = Regions.AP_EAST_1.getName)
333+
assert(estimatorAPEast1.trainingImage ==
334+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/linear-learner:1")
335+
336+
val estimatorSAEast1 =
337+
createLinearLearnerRegressor(region = Regions.SA_EAST_1.getName)
338+
assert(estimatorSAEast1.trainingImage ==
339+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/linear-learner:1")
340+
341+
val estimatorEUNorth1 =
342+
createLinearLearnerRegressor(region = Regions.EU_NORTH_1.getName)
343+
assert(estimatorEUNorth1.trainingImage ==
344+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/linear-learner:1")
345+
346+
val estimatorEUWest3 =
347+
createLinearLearnerRegressor(region = Regions.EU_WEST_3.getName)
348+
assert(estimatorEUWest3.trainingImage ==
349+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/linear-learner:1")
290350
}
291351

292352
it should "setFeatureDim" in {

‎sagemaker-spark-sdk/src/test/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/PCASageMakerEstimatorTests.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,22 @@ class PCASageMakerEstimatorTests extends FlatSpec with MockitoSugar {
8888
val estimatorUSWest1 = createPCAEstimator(region = Regions.US_WEST_1.getName)
8989
assert(estimatorUSWest1.trainingImage ==
9090
"632365934929.dkr.ecr.us-west-1.amazonaws.com/pca:1")
91+
92+
val estimatorAPEast1 = createPCAEstimator(region = Regions.AP_EAST_1.getName)
93+
assert(estimatorAPEast1.trainingImage ==
94+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/pca:1")
95+
96+
val estimatorSAEast1 = createPCAEstimator(region = Regions.SA_EAST_1.getName)
97+
assert(estimatorSAEast1.trainingImage ==
98+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/pca:1")
99+
100+
val estimatorEUNorth1 = createPCAEstimator(region = Regions.EU_NORTH_1.getName)
101+
assert(estimatorEUNorth1.trainingImage ==
102+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/pca:1")
103+
104+
val estimatorEUWest3 = createPCAEstimator(region = Regions.EU_WEST_3.getName)
105+
assert(estimatorEUWest3.trainingImage ==
106+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/pca:1")
91107
}
92108

93109
it should "use the correct defaults" in {

‎sagemaker-spark-sdk/src/test/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/XGBoostSageMakerEstimatorTests.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,22 @@ class XGBoostSageMakerEstimatorTests extends FlatSpec with Matchers with Mockito
107107
val estimatorUSWest1 = createXGBoostEstimator(region = Regions.US_WEST_1.getName)
108108
assert(estimatorUSWest1.trainingImage ==
109109
"632365934929.dkr.ecr.us-west-1.amazonaws.com/xgboost:1")
110+
111+
val estimatorAPEast1 = createXGBoostEstimator(region = Regions.AP_EAST_1.getName)
112+
assert(estimatorAPEast1.trainingImage ==
113+
"286214385809.dkr.ecr.ap-east-1.amazonaws.com/xgboost:1")
114+
115+
val estimatorSAEast1 = createXGBoostEstimator(region = Regions.SA_EAST_1.getName)
116+
assert(estimatorSAEast1.trainingImage ==
117+
"855470959533.dkr.ecr.sa-east-1.amazonaws.com/xgboost:1")
118+
119+
val estimatorEUNorth1 = createXGBoostEstimator(region = Regions.EU_NORTH_1.getName)
120+
assert(estimatorEUNorth1.trainingImage ==
121+
"669576153137.dkr.ecr.eu-north-1.amazonaws.com/xgboost:1")
122+
123+
val estimatorEUWest3 = createXGBoostEstimator(region = Regions.EU_WEST_3.getName)
124+
assert(estimatorEUWest3.trainingImage ==
125+
"749696950732.dkr.ecr.eu-west-3.amazonaws.com/xgboost:1")
110126
}
111127

112128
it should "setBooster" in {

0 commit comments

Comments
 (0)