Merge pull request #37 from pesser/origin/hackday

Correct formatting and tests for hackday
pesser · Apr 25, 2019 · 298ac70 · 298ac70
2 parents 0220906 + 8751b80
commit 298ac70
Show file tree

Hide file tree

Showing 24 changed files with 450 additions and 608 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,8 @@
 
 # Playing around stuff
 **play**
-**logs**
-**log**
+logs/
+log/
 
 # Pictures
 **.png
@@ -27,3 +27,6 @@ docs/build/*
 docs/_*
 
 .nfs*
+
+# Generated output
+examples/data
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-#  - 2.7
   - 3.6
 notifications:
   email: false
@@ -18,18 +17,35 @@ before_install:
   - conda update -q conda
   - conda info -a
 
-install:
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION tensorflow=1.13.1
-  - source activate test-environment
-  - conda install pytorch-cpu torchvision-cpu -c pytorch  
-  - pip install tensorboardX
-  - python setup.py install
+install: true
 
 
 # Run test
 jobs:
   include:
-    - stage: example_tests
+    - stage: formatting
+      name: "formatting test"
+      install:
+        - pip install black
+      script:
+        - black --check .
+    - stage: tf_example_tests
+      name: "Tensorflow examples test"
+      install:
+        - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION tensorflow=1.13.1
+        - source activate test-environment
+        - python setup.py install
+      script:
+        - cd examples
+        - python -m pytest -k tf
+    - stage: torch_example_tests
+      name: "Pytorch examples test"
+      install:
+        - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
+        - source activate test-environment
+        - conda install pytorch-cpu torchvision-cpu -c pytorch
+        - pip install tensorboardX
+        - python setup.py install
       script:
         - cd examples
-        - python -m pytest
+        - python -m pytest -k torch
diff --git a/edflow/applications/__init__.py b/edflow/applications/__init__.py
diff --git a/edflow/iterators/deeploss.py → edflow/applications/tf_perceptual_loss.py b/edflow/iterators/deeploss.py → edflow/applications/tf_perceptual_loss.py
diff --git a/edflow/edflow b/edflow/edflow
@@ -23,7 +23,7 @@ import yaml  # noqa
 from edflow.main import train, test  # noqa
 from edflow.custom_logging import init_project, use_project, get_logger  # noqa
 from edflow.custom_logging import set_global_stdout_level  # noqa
-from edflow.hooks.evaluation_hooks import get_latest_checkpoint  # noqa
+from edflow.hooks.checkpoint_hooks.common import get_latest_checkpoint  # noqa
 
 
 def update_config(config, options):

diff --git a/edflow/evaluate.py b/edflow/evaluate.py
diff --git a/edflow/hooks/__init__.py b/edflow/hooks/__init__.py
@@ -1,3 +0,0 @@
-from edflow.hooks.train_hooks import *
-from edflow.hooks.evaluation_hooks import *
-from edflow.hooks.hook import Hook, match_frequency

diff --git a/edflow/hooks/checkpoint_hooks/__init__.py b/edflow/hooks/checkpoint_hooks/__init__.py