Skip to content

feature: add support for cn-north-1 and cn-northwest-1 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knakad merged 2 commits into from
Mar 30, 2020
Merged

feature: add support for cn-north-1 and cn-northwest-1 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4ea86
feature: add support for cn-north-1 and cn-northwest-1
knakad Mar 30, 2020
41b032d
Merge branch 'master' into 20200326-region-expansion
knakad Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions ...rc/main/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/ImageURIProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,24 @@ import com.amazonaws.regions.Regions

private[algorithms] object SageMakerImageURIProvider {

def isChinaRegion(region: String): Boolean = {
val chinaRegions = Set(
Regions.CN_NORTH_1.getName,
Regions.CN_NORTHWEST_1.getName
)
chinaRegions.contains(region)
}

def getImage(region: String, regionAccountMap: Map[String, String],
algorithmName: String, algorithmTag: String): String = {
val account = regionAccountMap.get(region)
account match {
case None => throw new RuntimeException(s"The region $region is not supported." +
s"Supported Regions: ${regionAccountMap.keys.mkString(", ")}")
case _ => s"${account.get}.dkr.ecr.${region}.amazonaws.com/${algorithmName}:${algorithmTag}"
case _ if isChinaRegion(region) =>
s"${account.get}.dkr.ecr.${region}.amazonaws.com.cn/${algorithmName}:${algorithmTag}"
case _ =>
s"${account.get}.dkr.ecr.${region}.amazonaws.com/${algorithmName}:${algorithmTag}"
}
}
}
Expand All @@ -52,7 +63,9 @@ private[algorithms] object SagerMakerRegionAccountMaps {
Regions.EU_NORTH_1.getName -> "669576153137",
Regions.EU_WEST_3.getName -> "749696950732",
Regions.EU_WEST_3.getName -> "749696950732",
Regions.ME_SOUTH_1.getName -> "249704162688"
Regions.ME_SOUTH_1.getName -> "249704162688",
Regions.CN_NORTH_1.getName -> "390948362332",
Regions.CN_NORTHWEST_1.getName -> "387376663083"
)

// For LDA
Expand Down Expand Up @@ -94,7 +107,9 @@ private[algorithms] object SagerMakerRegionAccountMaps {
Regions.EU_NORTH_1.getName -> "669576153137",
Regions.EU_WEST_3.getName -> "749696950732",
Regions.EU_WEST_3.getName -> "749696950732",
Regions.ME_SOUTH_1.getName -> "249704162688"
Regions.ME_SOUTH_1.getName -> "249704162688",
Regions.CN_NORTH_1.getName -> "390948362332",
Regions.CN_NORTHWEST_1.getName -> "387376663083"
)
}

20 changes: 20 additions & 0 deletions ...services/sagemaker/sparksdk/algorithms/FactorizationMachinesSageMakerEstimatorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
createFactorizationMachinesBinaryClassifier(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/factorization-machines:1")

val estimatorCNNorth1 =
createFactorizationMachinesBinaryClassifier(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/factorization-machines:1")

val estimatorCNNorthWest1 =
createFactorizationMachinesBinaryClassifier(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/factorization-machines:1")
}

it should "use the correct defaults for regressor" in {
Expand Down Expand Up @@ -253,6 +263,16 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
createFactorizationMachinesRegressor(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/factorization-machines:1")

val estimatorCNNorth1 =
createFactorizationMachinesRegressor(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/factorization-machines:1")

val estimatorCNNorthWest1 =
createFactorizationMachinesRegressor(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/factorization-machines:1")
}

it should "setFeatureDim" in {
Expand Down
8 changes: 8 additions & 0 deletions .../com/amazonaws/services/sagemaker/sparksdk/algorithms/KMeansSageMakerEstimatorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ class KMeansSageMakerEstimatorTests extends FlatSpec with Matchers with MockitoS
val estimatorMESouth1 = createKMeansEstimator(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/kmeans:1")

val estimatorCNNorth1 = createKMeansEstimator(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/kmeans:1")

val estimatorCNNorthWest1 = createKMeansEstimator(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/kmeans:1")
}

it should "setK" in {
Expand Down
30 changes: 30 additions & 0 deletions ...azonaws/services/sagemaker/sparksdk/algorithms/LinearLearnerSageMakerEstimatorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
createLinearLearnerBinaryClassifier(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/linear-learner:1")

val estimatorCNNorth1 =
createLinearLearnerBinaryClassifier(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/linear-learner:1")

val estimatorCNNorthWest1 =
createLinearLearnerBinaryClassifier(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/linear-learner:1")
}

it should "use the correct defaults for multiclass classifier" in {
Expand Down Expand Up @@ -261,6 +271,16 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
createLinearLearnerMultiClassClassifier(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/linear-learner:1")

val estimatorCNNorth1 =
createLinearLearnerMultiClassClassifier(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/linear-learner:1")

val estimatorCNNorthWest1 =
createLinearLearnerMultiClassClassifier(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/linear-learner:1")
}

it should "use the correct defaults for regressor" in {
Expand Down Expand Up @@ -362,6 +382,16 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
createLinearLearnerRegressor(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/linear-learner:1")

val estimatorCNNorth1 =
createLinearLearnerRegressor(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/linear-learner:1")

val estimatorCNNorthWest1 =
createLinearLearnerRegressor(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/linear-learner:1")
}

it should "setFeatureDim" in {
Expand Down
8 changes: 8 additions & 0 deletions ...ala/com/amazonaws/services/sagemaker/sparksdk/algorithms/PCASageMakerEstimatorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ class PCASageMakerEstimatorTests extends FlatSpec with MockitoSugar {
val estimatorMESouth1 = createPCAEstimator(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/pca:1")

val estimatorCNNorth1 = createPCAEstimator(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/pca:1")

val estimatorCNNorthWest1 = createPCAEstimator(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/pca:1")
}

it should "use the correct defaults" in {
Expand Down
8 changes: 8 additions & 0 deletions ...com/amazonaws/services/sagemaker/sparksdk/algorithms/XGBoostSageMakerEstimatorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ class XGBoostSageMakerEstimatorTests extends FlatSpec with Matchers with Mockito
val estimatorMESouth1 = createXGBoostEstimator(region = Regions.ME_SOUTH_1.getName)
assert(estimatorMESouth1.trainingImage ==
"249704162688.dkr.ecr.me-south-1.amazonaws.com/xgboost:1")

val estimatorCNNorth1 = createXGBoostEstimator(region = Regions.CN_NORTH_1.getName)
assert(estimatorCNNorth1.trainingImage ==
"390948362332.dkr.ecr.cn-north-1.amazonaws.com.cn/xgboost:1")

val estimatorCNNorthWest1 = createXGBoostEstimator(region = Regions.CN_NORTHWEST_1.getName)
assert(estimatorCNNorthWest1.trainingImage ==
"387376663083.dkr.ecr.cn-northwest-1.amazonaws.com.cn/xgboost:1")
}

it should "setBooster" in {
Expand Down