Update ICN account id (#53)

aws · Jun 21, 2018 · 0f8b920 · 0f8b920
1 parent b24e14b
commit 0f8b920
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 CHANGELOG
 =========
 
+1.1.1
+=====
+
+* spark/pyspark: Enable ICN region support for spark SDK
+
 1.1.0
 =====
 

diff --git a/sagemaker-pyspark-sdk/setup.py b/sagemaker-pyspark-sdk/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-VERSION = "1.1.0"
+VERSION = "1.1.1"
 
 TEMP_PATH = "deps"
 JARS_TARGET = os.path.join(TEMP_PATH, "jars")

diff --git a/sagemaker-spark-sdk/build.sbt b/sagemaker-spark-sdk/build.sbt
@@ -19,7 +19,7 @@ scalaVersion := "2.11.7"
 // to change the version of spark add -DSPARK_VERSION=2.x.x when running sbt
 // for example: "sbt -DSPARK_VERSION=2.1.1 clean compile test doc package"
 val sparkVersion = System.getProperty("SPARK_VERSION", "2.2.0")
-version := "spark_" + sparkVersion + "-1.1.0"
+version := "spark_" + sparkVersion + "-1.1.1"
 
 lazy val SageMakerSpark = (project in file("."))
 

diff --git a/...rc/main/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/ImageURIProvider.scala b/...rc/main/scala/com/amazonaws/services/sagemaker/sparksdk/algorithms/ImageURIProvider.scala
@@ -37,7 +37,8 @@ private[algorithms] object SagerMakerRegionAccountMaps {
     Regions.US_EAST_1.getName -> "382416733822",
     Regions.US_EAST_2.getName -> "404615174143",
     Regions.US_WEST_2.getName -> "174872318107",
-    Regions.AP_NORTHEAST_1.getName -> "351501993468"
+    Regions.AP_NORTHEAST_1.getName -> "351501993468",
+    Regions.AP_NORTHEAST_2.getName -> "835164637446"
   )
 
   // For LDA
@@ -46,7 +47,8 @@ private[algorithms] object SagerMakerRegionAccountMaps {
     Regions.US_EAST_1.getName -> "766337827248",
     Regions.US_EAST_2.getName -> "999911452149",
     Regions.US_WEST_2.getName -> "266724342769",
-    Regions.AP_NORTHEAST_1.getName -> "258307448986"
+    Regions.AP_NORTHEAST_1.getName -> "258307448986",
+    Regions.AP_NORTHEAST_2.getName -> "293181348795"
   )
 
   // For XGBoost
@@ -55,7 +57,8 @@ private[algorithms] object SagerMakerRegionAccountMaps {
     Regions.US_EAST_1.getName -> "811284229777",
     Regions.US_EAST_2.getName -> "825641698319",
     Regions.US_WEST_2.getName -> "433757028032",
-    Regions.AP_NORTHEAST_1.getName -> "501404015308"
+    Regions.AP_NORTHEAST_1.getName -> "501404015308",
+    Regions.AP_NORTHEAST_2.getName -> "306986355934"
   )
 }
 
diff --git a/...services/sagemaker/sparksdk/algorithms/FactorizationMachinesSageMakerEstimatorTests.scala b/...services/sagemaker/sparksdk/algorithms/FactorizationMachinesSageMakerEstimatorTests.scala
@@ -81,6 +81,11 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
       createFactorizationMachinesBinaryClassifier(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/factorization-machines:1")
+
+    val estimatorAPNorthEast2 =
+      createFactorizationMachinesBinaryClassifier(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/factorization-machines:1")
   }
 
   it should "use the correct defaults for regressor" in {
@@ -112,6 +117,11 @@ class FactorizationMachinesSageMakerEstimatorTests extends FlatSpec with Mockito
       createFactorizationMachinesRegressor(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/factorization-machines:1")
+
+    val estimatorAPNorthEast2 =
+      createFactorizationMachinesRegressor(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/factorization-machines:1")
   }
 
   it should "setFeatureDim" in {

diff --git a/.../com/amazonaws/services/sagemaker/sparksdk/algorithms/KMeansSageMakerEstimatorTests.scala b/.../com/amazonaws/services/sagemaker/sparksdk/algorithms/KMeansSageMakerEstimatorTests.scala
@@ -72,6 +72,10 @@ class KMeansSageMakerEstimatorTests extends FlatSpec with Matchers with MockitoS
     val estimatorAPNorthEast1 = createKMeansEstimator(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage
       == "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/kmeans:1")
+
+    val estimatorAPNorthEast2 = createKMeansEstimator(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/kmeans:1")
   }
 
   it should "setK" in {

diff --git a/...ala/com/amazonaws/services/sagemaker/sparksdk/algorithms/LDASageMakerEstimatorTests.scala b/...ala/com/amazonaws/services/sagemaker/sparksdk/algorithms/LDASageMakerEstimatorTests.scala
@@ -71,6 +71,11 @@ class LDASageMakerEstimatorTests extends FlatSpec with MockitoSugar {
       createLDAEstimator(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "258307448986.dkr.ecr.ap-northeast-1.amazonaws.com/lda:1")
+
+    val estimatorAPNorthEast2 =
+      createLDAEstimator(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "293181348795.dkr.ecr.ap-northeast-2.amazonaws.com/lda:1")
   }
 
   it should "setFeatureDim" in {

diff --git a/...azonaws/services/sagemaker/sparksdk/algorithms/LinearLearnerSageMakerEstimatorTests.scala b/...azonaws/services/sagemaker/sparksdk/algorithms/LinearLearnerSageMakerEstimatorTests.scala
@@ -76,6 +76,11 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
       createLinearLearnerBinaryClassifier(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/linear-learner:1")
+
+    val estimatorAPNorthEast2 =
+      createLinearLearnerBinaryClassifier(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/linear-learner:1")
   }
 
   it should "use the correct defaults for regressor" in {
@@ -107,6 +112,11 @@ class LinearLearnerSageMakerEstimatorTests extends FlatSpec with MockitoSugar {
       createLinearLearnerRegressor(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/linear-learner:1")
+
+    val estimatorAPNorthEast2 =
+      createLinearLearnerRegressor(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/linear-learner:1")
   }
 
   it should "setFeatureDim" in {

diff --git a/...ala/com/amazonaws/services/sagemaker/sparksdk/algorithms/PCASageMakerEstimatorTests.scala b/...ala/com/amazonaws/services/sagemaker/sparksdk/algorithms/PCASageMakerEstimatorTests.scala
@@ -52,6 +52,10 @@ class PCASageMakerEstimatorTests extends FlatSpec with MockitoSugar {
     val estimatorAPNorthEast1 = createPCAEstimator(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "351501993468.dkr.ecr.ap-northeast-1.amazonaws.com/pca:1")
+
+    val estimatorAPNorthEast2 = createPCAEstimator(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "835164637446.dkr.ecr.ap-northeast-2.amazonaws.com/pca:1")
   }
 
   it should "use the correct defaults" in {

diff --git a/...com/amazonaws/services/sagemaker/sparksdk/algorithms/XGBoostSageMakerEstimatorTests.scala b/...com/amazonaws/services/sagemaker/sparksdk/algorithms/XGBoostSageMakerEstimatorTests.scala
@@ -71,6 +71,10 @@ class XGBoostSageMakerEstimatorTests extends FlatSpec with Matchers with Mockito
     val estimatorAPNorthEast1 = createXGBoostEstimator(region = Regions.AP_NORTHEAST_1.getName)
     assert(estimatorAPNorthEast1.trainingImage ==
       "501404015308.dkr.ecr.ap-northeast-1.amazonaws.com/xgboost:1")
+
+    val estimatorAPNorthEast2 = createXGBoostEstimator(region = Regions.AP_NORTHEAST_2.getName)
+    assert(estimatorAPNorthEast2.trainingImage ==
+      "306986355934.dkr.ecr.ap-northeast-2.amazonaws.com/xgboost:1")
   }
 
   it should "setBooster" in {