Skip to content

Commit 4cff0cf

Browse files
ajaykarpurajaykarpur
authored
feature: add support for af-south-1 and eu-south-1 (#126)
1 parent 20f43d7 commit 4cff0cf

File tree

7 files changed

+64
-6
lines changed

7 files changed

+64
-6
lines changed

‎sagemaker-spark-sdk/build.sbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ version := {
3030

3131
libraryDependencies ++= Seq(
3232
"org.apache.hadoop" % "hadoop-aws" % "2.8.1",
33-
"com.amazonaws" % "aws-java-sdk-s3" % "1.11.613",
34-
"com.amazonaws" % "aws-java-sdk-sts" % "1.11.613",
35-
"com.amazonaws" % "aws-java-sdk-sagemaker" % "1.11.613",
36-
"com.amazonaws" % "aws-java-sdk-sagemakerruntime" % "1.11.613",
33+
"com.amazonaws" % "aws-java-sdk-s3" % "1.11.835",
34+
"com.amazonaws" % "aws-java-sdk-sts" % "1.11.835",
35+
"com.amazonaws" % "aws-java-sdk-sagemaker" % "1.11.835",
36+
"com.amazonaws" % "aws-java-sdk-sagemakerruntime" % "1.11.835",
3737
"org.apache.spark" %% "spark-core" % sparkVersion % "provided",
3838
"org.apache.spark" %% "spark-mllib" % sparkVersion % "provided",
3939
"org.apache.spark" %% "spark-sql" % sparkVersion % "provided",

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ private[algorithms] object SagerMakerRegionAccountMaps {
6565
Regions.EU_WEST_3.getName -> "749696950732",
6666
Regions.ME_SOUTH_1.getName -> "249704162688",
6767
Regions.CN_NORTH_1.getName -> "390948362332",
68-
Regions.CN_NORTHWEST_1.getName -> "387376663083"
68+
Regions.CN_NORTHWEST_1.getName -> "387376663083",
69+
Regions.AF_SOUTH_1.getName -> "455444449433",
70+
Regions.EU_SOUTH_1.getName -> "257386234256"
6971
)
7072

7173
// For LDA
@@ -109,7 +111,9 @@ private[algorithms] object SagerMakerRegionAccountMaps {
109111
Regions.EU_WEST_3.getName -> "749696950732",
110112
Regions.ME_SOUTH_1.getName -> "249704162688",
111113
Regions.CN_NORTH_1.getName -> "390948362332",
112-
Regions.CN_NORTHWEST_1.getName -> "387376663083"
114+
Regions.CN_NORTHWEST_1.getName -> "387376663083",
115+
Regions.AF_SOUTH_1.getName -> "455444449433",
116+
Regions.EU_SOUTH_1.getName -> "257386234256"
113117
)
114118
}
115119

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,16 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
161161
createFactorizationMachinesBinaryClassifier(region = Regions.CN_NORTHWEST_1.getName)
162162
assert(estimatorCNNorthWest1.trainingImage ==
163163
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/factorization-machines:1")
164+
165+
val estimatorAFSouth1 =
166+
createFactorizationMachinesBinaryClassifier(region = Regions.AF_SOUTH_1.getName)
167+
assert(estimatorAFSouth1.trainingImage ==
168+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/factorization-machines:1")
169+
170+
val estimatorEUSouth1 =
171+
createFactorizationMachinesBinaryClassifier(region = Regions.EU_SOUTH_1.getName)
172+
assert(estimatorEUSouth1.trainingImage ==
173+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/factorization-machines:1")
164174
}
165175

166176
it should "use the correct defaults for regressor" in {
@@ -273,6 +283,16 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
273283
createFactorizationMachinesRegressor(region = Regions.CN_NORTHWEST_1.getName)
274284
assert(estimatorCNNorthWest1.trainingImage ==
275285
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/factorization-machines:1")
286+
287+
val estimatorAFSouth1 =
288+
createFactorizationMachinesRegressor(region = Regions.AF_SOUTH_1.getName)
289+
assert(estimatorAFSouth1.trainingImage ==
290+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/factorization-machines:1")
291+
292+
val estimatorEUSouth1 =
293+
createFactorizationMachinesRegressor(region = Regions.EU_SOUTH_1.getName)
294+
assert(estimatorEUSouth1.trainingImage ==
295+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/factorization-machines:1")
276296
}
277297

278298
it should "setFeatureDim" in {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@ class KMeansSageMakerEstimatorTests extends FlatSpec with Matchers with MockitoS
136136
val estimatorCNNorthWest1 = createKMeansEstimator(region = Regions.CN_NORTHWEST_1.getName)
137137
assert(estimatorCNNorthWest1.trainingImage ==
138138
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/kmeans:1")
139+
140+
val estimatorAFSouth1 = createKMeansEstimator(region = Regions.AF_SOUTH_1.getName)
141+
assert(estimatorAFSouth1.trainingImage ==
142+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/kmeans:1")
143+
144+
val estimatorEUSouth1 = createKMeansEstimator(region = Regions.EU_SOUTH_1.getName)
145+
assert(estimatorEUSouth1.trainingImage ==
146+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/kmeans:1")
139147
}
140148

141149
it should "setK" in {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,16 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
392392
createLinearLearnerRegressor(region = Regions.CN_NORTHWEST_1.getName)
393393
assert(estimatorCNNorthWest1.trainingImage ==
394394
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/linear-learner:1")
395+
396+
val estimatorAFSouth1 =
397+
createLinearLearnerRegressor(region = Regions.AF_SOUTH_1.getName)
398+
assert(estimatorAFSouth1.trainingImage ==
399+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/linear-learner:1")
400+
401+
val estimatorEUSouth1 =
402+
createLinearLearnerRegressor(region = Regions.EU_SOUTH_1.getName)
403+
assert(estimatorEUSouth1.trainingImage ==
404+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/linear-learner:1")
395405
}
396406

397407
it should "setFeatureDim" in {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ class PCASageMakerEstimatorTests extends FlatSpec with MockitoSugar {
116116
val estimatorCNNorthWest1 = createPCAEstimator(region = Regions.CN_NORTHWEST_1.getName)
117117
assert(estimatorCNNorthWest1.trainingImage ==
118118
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/pca:1")
119+
120+
val estimatorAFSouth1 = createPCAEstimator(region = Regions.AF_SOUTH_1.getName)
121+
assert(estimatorAFSouth1.trainingImage ==
122+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/pca:1")
123+
124+
val estimatorEUSouth1 = createPCAEstimator(region = Regions.EU_SOUTH_1.getName)
125+
assert(estimatorEUSouth1.trainingImage ==
126+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/pca:1")
119127
}
120128

121129
it should "use the correct defaults" in {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ class XGBoostSageMakerEstimatorTests extends FlatSpec with Matchers with Mockito
135135
val estimatorCNNorthWest1 = createXGBoostEstimator(region = Regions.CN_NORTHWEST_1.getName)
136136
assert(estimatorCNNorthWest1.trainingImage ==
137137
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/xgboost:1")
138+
139+
val estimatorAFSouth1 = createXGBoostEstimator(region = Regions.AF_SOUTH_1.getName)
140+
assert(estimatorAFSouth1.trainingImage ==
141+
"455444449433.dkr.ecr.af-south-1.amazonaws.com/xgboost:1")
142+
143+
val estimatorEUSouth1 = createXGBoostEstimator(region = Regions.EU_SOUTH_1.getName)
144+
assert(estimatorEUSouth1.trainingImage ==
145+
"257386234256.dkr.ecr.eu-south-1.amazonaws.com/xgboost:1")
138146
}
139147

140148
it should "setBooster" in {

0 commit comments

Comments
 (0)