From 146d06e36235f213fc015daa40a23955fa41501d Mon Sep 17 00:00:00 2001 From: Ghislain Antony Vaillant Date: Fri, 28 May 2021 11:41:05 +0200 Subject: [PATCH] Replace tensorboardx with torch.utils.tensorboard (#158) * Replace tensorboardx with torch.utils.tensorboard * Add tensorboard to dependencies --- .../clinicadl/tools/deep_learning/autoencoder_utils.py | 2 +- clinicadl/clinicadl/tools/deep_learning/cnn_utils.py | 2 +- clinicadl/setup.py | 7 ++++--- requirements.txt | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/clinicadl/clinicadl/tools/deep_learning/autoencoder_utils.py b/clinicadl/clinicadl/tools/deep_learning/autoencoder_utils.py index 4aeefb2dd..1450f489d 100644 --- a/clinicadl/clinicadl/tools/deep_learning/autoencoder_utils.py +++ b/clinicadl/clinicadl/tools/deep_learning/autoencoder_utils.py @@ -43,7 +43,7 @@ def train( options: (Namespace) ensemble of other options given to the main script. logger: (logging object) writer to stdout and stderr """ - from tensorboardX import SummaryWriter + from torch.utils.tensorboard import SummaryWriter if logger is None: logger = logging diff --git a/clinicadl/clinicadl/tools/deep_learning/cnn_utils.py b/clinicadl/clinicadl/tools/deep_learning/cnn_utils.py index 3e4368208..f3b767f60 100644 --- a/clinicadl/clinicadl/tools/deep_learning/cnn_utils.py +++ b/clinicadl/clinicadl/tools/deep_learning/cnn_utils.py @@ -51,7 +51,7 @@ def train( """ from time import time - from tensorboardX import SummaryWriter + from torch.utils.tensorboard import SummaryWriter if logger is None: logger = logging diff --git a/clinicadl/setup.py b/clinicadl/setup.py index 0e77a96c9..aced61b6e 100644 --- a/clinicadl/setup.py +++ b/clinicadl/setup.py @@ -1,5 +1,6 @@ -from os.path import dirname, join, abspath, pardir -from setuptools import setup, find_packages +from os.path import abspath, dirname, join, pardir + +from setuptools import find_packages, setup with open(join(dirname(__file__), "clinicadl/VERSION"), "rb") as f: version = f.read().decode("ascii").strip() @@ -35,6 +36,6 @@ "Intended Audience :: Developers", "Programming Language :: Python", ], - install_requires=["numpy>=1.17", "clinica>=0.3.8", "tensorboardX"], + install_requires=["numpy>=1.17", "clinica>=0.3.8", "torch", "tensorboard"], python_requires=">=3.6", ) diff --git a/requirements.txt b/requirements.txt index 49eb5ecc6..ce6231567 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ clinica>=0.3.6 nilearn nipy -tensorboardX +torch pandas colorama +tensorboard