Skip to content

Commit

Permalink
refactor(logs): add better log config
Browse files Browse the repository at this point in the history
  • Loading branch information
matteo4diani committed Nov 18, 2023
1 parent 37dadf9 commit bd069ce
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 27 deletions.
3 changes: 0 additions & 3 deletions auton_survival/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,3 @@ class is a composite transform that does both Imputing ***and*** Scaling with

import warnings
from tqdm.auto import tqdm
import logging

logging.basicConfig()
6 changes: 4 additions & 2 deletions auton_survival/experiments.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
from sklearn.utils import shuffle

from tqdm import tqdm
import logging

logger = logging.getLogger(__name__)

from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


class SurvivalRegressionCV:
Expand Down
3 changes: 3 additions & 0 deletions auton_survival/logging.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import logging

LOGGER = logging.getLogger("auton_survival")
6 changes: 4 additions & 2 deletions auton_survival/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@
from scipy.optimize import fsolve
from sklearn.metrics import auc
from tqdm import tqdm
import logging

import warnings

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def treatment_effect(
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/cmhe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"""

import logging

import numpy as np
import torch

Expand All @@ -85,7 +85,9 @@

from auton_survival.utils import _dataframe_to_array

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


class DeepCoxMixturesHeterogenousEffects:
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/cmhe/cmhe_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

import logging

import torch
import numpy as np

Expand All @@ -40,7 +40,9 @@
smooth_bl_survival,
)

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def get_likelihood(model, breslow_splines, x, t, e, a):
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/cph/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
r""" Deep Cox Proportional Hazards Model"""

from collections import namedtuple
import logging

import torch
import numpy as np
import random
Expand All @@ -37,7 +37,9 @@
from auton_survival.models.utils.recurrent_nn_utils import _get_padded_targets


logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


DcphModel = namedtuple("DcphModel", ["module", "breslow"])
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/cph/dcph_utilities.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import torch
import numpy as np
import pandas as pd
import logging


from sksurv.linear_model.coxph import BreslowEstimator

Expand All @@ -19,7 +19,9 @@
partial_ll_loss,
)

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def fit_breslow(model, x, t, e):
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/dcm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"""

import logging

import torch
import numpy as np

Expand All @@ -59,7 +59,9 @@

from auton_survival.utils import _dataframe_to_array

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


class DeepCoxMixtures:
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/dcm/dcm_utilities.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import warnings
import logging

from matplotlib.pyplot import get

import torch
Expand All @@ -24,7 +24,9 @@
smooth_bl_survival,
)

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def get_likelihood(model, breslow_splines, x, t, e):
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/models/dsm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"""

import logging

import torch
import numpy as np

Expand All @@ -183,7 +183,9 @@
__pdoc__["DSMBase"] = False


logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


class DSMBase:
Expand Down
5 changes: 3 additions & 2 deletions auton_survival/models/dsm/dsm_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
import numpy as np

import gc
import logging


logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def pretrain_dsm(
Expand Down
6 changes: 4 additions & 2 deletions auton_survival/phenotyping.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"""Utilities to phenotype individuals based on similar survival
characteristics."""

import logging

from random import random
import warnings
import numpy as np
Expand All @@ -38,7 +38,9 @@
from auton_survival.utils import _get_method_kwargs
from auton_survival.experiments import CounterfactualSurvivalRegressionCV

logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


class Phenotyper:
Expand Down
5 changes: 3 additions & 2 deletions auton_survival/reporting.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import logging
import numpy as np
import pandas as pd

Expand All @@ -8,7 +7,9 @@
from lifelines.plotting import add_at_risk_counts


logger = logging.getLogger(__name__)
from auton_survival.logging import LOGGER

logger = LOGGER.getChild(__name__)


def plot_kaplanmeier(outcomes, groups=None, plot_counts=False, **kwargs):
Expand Down

0 comments on commit bd069ce

Please sign in to comment.