update logging_util.py

qywu · Dec 16, 2022 · 8548c9b · 8548c9b
1 parent fe28385
commit 8548c9b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/._environment copy.yml b/._environment copy.yml
diff --git a/._environment.yml b/._environment.yml
diff --git a/environment copy.yml b/environment copy.yml
@@ -0,0 +1,20 @@
+name: torchfly
+channels:
+  - defaults
+  - conda-forge
+  - pytorch
+dependencies:
+  - pytorch
+  - torchvision
+#  - cudatoolkit=10.1
+  - pip:
+    - ray
+    - regex
+    - transformers
+    - colorlog
+    - tensorboard
+    - tqdm
+    - gdown
+    - scikit-learn
+    - overrides
+    - pyarrow
diff --git a/torchfly/utilities/logging_util.py b/torchfly/utilities/logging_util.py
@@ -2,6 +2,8 @@
 import sys
 import json
 import logging
+import logging.config
+
 import colorlog
 from omegaconf import DictConfig
 

diff --git a/tutorials/MNIST/main.py b/tutorials/MNIST/main.py
@@ -24,24 +24,6 @@ def train_loader_fn(self):
             "pin_memory": True,
         }
         with distributed.mutex() as rank:
-<<<<<<< HEAD
-
-            dataset = datasets.MNIST(os.path.join(self.config.task.datadir, 'MNIST'),
-                                     train=True,
-                                     download=True,
-                                     transform=transforms.Compose(
-                                         [transforms.ToTensor(),
-                                          transforms.Normalize((0.1307,), (0.3081,))]))
-
-
-        train_sampler = torch.utils.data.distributed.DistributedSampler(
-                dataset,
-                num_replicas=distributed.get_world_size(),
-                rank=distributed.get_rank()
-            )
-
-        dataloader = DataLoader(dataset, batch_size=self.config.training.batch_size, shuffle=True, **kwargs)
-=======
             dataset = datasets.MNIST(
                 os.path.join(self.config.task.datadir, "MNIST"),
                 train=True,
@@ -66,7 +48,6 @@ def train_loader_fn(self):
             sampler=train_sampler,
             **kwargs
         )
->>>>>>> 636da9083aee5a710364369ba369705325db670b
         return dataloader
 
     def valid_loader_fn(self):