Bump smdebug version to 1.0.29 (#378)

* Bump smdebug version to 1.0.28

* Bump smdebug version to 1.0.28 ARM container

* Bump smdebug version to 1.0.28

* Bump smdebug version to 1.0.28

* Correct version check test condition

* Bump smdebug version to 1.0.29

---------

Co-authored-by: Malav Shastri <[email protected]>

Author: malav-shastri

docker/1.5-1/final/Dockerfile.cpu

@@ -11,6 +11,10 @@ ARG SAGEMAKER_XGBOOST_VERSION
 COPY requirements.txt /requirements.txt
 RUN python3 -m pip install -r /requirements.txt && rm /requirements.txt
 
+# Install smdebug from source
+RUN python3 -m pip install git+https://github.com/awslabs/[email protected]
+
+
 ###########################
 # Copy wheel to container #
 ###########################

docker/1.5-1/final/Dockerfile_arm64.cpu

@@ -11,6 +11,9 @@ ARG SAGEMAKER_XGBOOST_VERSION
 COPY requirements.txt /requirements.txt
 RUN python3 -m pip install -r /requirements.txt && rm /requirements.txt
 
+# Install smdebug from source
+RUN python3 -m pip install git+https://github.com/awslabs/[email protected]
+
 ###########################
 # Copy wheel to container #
 ###########################

requirements.txt

@@ -22,7 +22,6 @@ sagemaker-containers==2.8.6.post2
 sagemaker-inference==1.5.5
 scikit-learn==0.24.1
 scipy==1.6.2
-smdebug==1.0.10
 urllib3==1.26.5
 wheel==0.36.2
 jinja2==2.11.3

src/sagemaker_xgboost_container/callback.py

@@ -11,27 +11,6 @@
 logger = logging.getLogger(__name__)
 
 
-class SmeDebugHook(xgb.callback.TrainingCallback, Hook):
-    """Mix-in callback class. smedebug.xgboost.Hook uses legacy callback style
-    and since XGB-3.0.0 mixing legacy callback instances with new TrainingCallback
-    instances is not allowed.
-
-    See: https://github.com/dmlc/xgboost/blob/v1.3.0/python-package/xgboost/training.py#L92-L93
-
-    :param hyperparameters: Dict of hyperparamters.
-                            Same as `params` in xgb.train(params, dtrain).
-    :param train_dmatrix: Training data set.
-    :param val_dmatrix: Validation data set.
-    """
-
-    def __init__(self, json_config_path, hyperparameters, train_dmatrix, val_dmatrix):
-        self = self.hook_from_config(json_config_path)
-        self.hyperparameters = hyperparameters
-        self.train_data = train_dmatrix
-        if val_dmatrix is not None:
-            self.validation_data = val_dmatrix
-
-
 def add_debugging(callbacks, hyperparameters, train_dmatrix, val_dmatrix=None, json_config_path=None):
     """Add a sagemaker debug hook to a list of callbacks.
 
@@ -44,12 +23,16 @@ def add_debugging(callbacks, hyperparameters, train_dmatrix, val_dmatrix=None, j
                              instead of default config file.
     """
     try:
-        hook = SmeDebugHook(json_config_path, hyperparameters, train_dmatrix, val_dmatrix)
+        hook = Hook.hook_from_config(json_config_path)
+        hook.hyperparameters = hyperparameters
+        hook.train_data = train_dmatrix
+        if val_dmatrix is not None:
+            hook.validation_data = val_dmatrix
+        callbacks.append(hook)
         logging.info("Debug hook created from config")
     except Exception as e:
         logging.debug("Failed to create debug hook", e)
-    else:
-        callbacks.append(hook)
+        return
 
 
 def add_sigterm_handler(model_dir, is_master):

test/resources/versions/train.py

@@ -26,7 +26,7 @@
 sagemaker-inference==1.5.5
 scikit-learn==0.24.1
 scipy==1.6.2
-smdebug==1.0.10
+smdebug==1.0.29
 urllib3==1.26.5
 wheel==0.36.2
 jinja2==2.11.3