modified: cph/dcph_torch.py

	modified:   cph/dcph_utilities.py
	modified:   dcm/dcm_utilities.py
	modified:   dsm/__init__.py
	modified:   dsm/dsm_torch.py

auton_survival/models/cph/dcph_torch.py

@@ -1,7 +1,7 @@
 import torch
 import torch.nn as nn
 
-from dsm.dsm_torch import create_representation
+from auton_survival.models.dsm.dsm_torch import create_representation
 
 
 class DeepCoxPHTorch(nn.Module):

auton_survival/models/cph/dcph_utilities.py

@@ -8,7 +8,7 @@
 
 from tqdm import tqdm
 
-from dsm.utilities import get_optimizer, _reshape_tensor_with_nans
+from auton_survival.models.dsm.utilities import get_optimizer, _reshape_tensor_with_nans
 
 def randargmax(b,**kw):
   """ a random tie-breaking argmax"""

auton_survival/models/dcm/dcm_utilities.py

@@ -14,7 +14,7 @@
 from tqdm import tqdm
 
 
-from dsm.utilities import get_optimizer
+from auton_survival.models.dsm.utilities import get_optimizer
 
 def randargmax(b,**kw):
   """ a random tie-breaking argmax"""

auton_survival/models/dsm/__init__.py

@@ -262,7 +262,7 @@ def fit(self, x, t, e, vsize=0.15, val_data=None,
     self.torch_model = model.eval()
     self.fitted = True
 
-    return self 
+    return self
 
 
   def compute_nll(self, x, t, e):
@@ -491,11 +491,11 @@ class DeepRecurrentSurvivalMachines(DSMBase):
   time-dependent covariates.
 
   For full details on Deep Recurrent Survival Machines, refer to our paper [1].
-  
+
   References
   ----------
   [1] <a href="http://proceedings.mlr.press/v146/nagpal21a.html">
-  Deep Parametric Time-to-Event Regression with Time-Varying Covariates 
+  Deep Parametric Time-to-Event Regression with Time-Varying Covariates
   AAAI Spring Symposium on Survival Prediction</a>
 
   """

auton_survival/models/dsm/dsm_torch.py

@@ -103,7 +103,7 @@ class DeepSurvivalMachinesTorch(torch.nn.Module):
 
   .. warning::
     Not designed to be used directly.
-    Please use the API inferface `dsm.dsm_api.DeepSurvivalMachines` !!!
+    Please use the API inferface `dsm.DeepSurvivalMachines` !!!
 
   Parameters
   ----------
@@ -222,7 +222,7 @@ class DeepRecurrentSurvivalMachinesTorch(DeepSurvivalMachinesTorch):
 
   .. warning::
     Not designed to be used directly.
-    Please use the API inferface `dsm.dsm_api.DeepRecurrentSurvivalMachines`!!
+    Please use the API inferface `dsm.DeepRecurrentSurvivalMachines`!!
 
   Parameters
   ----------
@@ -379,7 +379,7 @@ class DeepConvolutionalSurvivalMachinesTorch(DeepSurvivalMachinesTorch):
   .. warning::
     Not designed to be used directly.
     Please use the API inferface
-    `dsm.dsm_api.DeepConvolutionalSurvivalMachines`!!
+    `dsm.DeepConvolutionalSurvivalMachines`!!
 
   Parameters
   ----------
@@ -460,7 +460,7 @@ class DeepCNNRNNSurvivalMachinesTorch(DeepRecurrentSurvivalMachinesTorch):
 
   .. warning::
     Not designed to be used directly.
-    Please use the API inferface `dsm.dsm_api.DeepCNNRNNSurvivalMachines`!!
+    Please use the API inferface `dsm.DeepCNNRNNSurvivalMachines`!!
 
   Parameters
   ----------