From bb75bdf87ba3f4094115cdcb387febe71f3f2319 Mon Sep 17 00:00:00 2001 From: William Falcon Date: Sun, 21 Apr 2019 13:02:11 -0400 Subject: [PATCH] fixing setup --- .../models => pytorch-lightning}/__init__.py | 0 .../models}/__init__.py | 0 .../models/sample_model_template}/__init__.py | 0 .../models/sample_model_template/model_template.py | 0 .../models/trainer.py | 0 .../root_module}/__init__.py | 0 .../root_module/grads.py | 0 .../root_module/hooks.py | 0 .../root_module/memory.py | 0 .../root_module/model_saving.py | 0 .../root_module/optimization.py | 0 .../root_module/root_module.py | 0 .../trainer_main.py | 0 pytorch-lightning/utils/__init__.py | 0 .../utils/arg_parse.py | 0 .../utils/embeddings.py | 0 .../utils/plotting.py | 0 .../utils/pt_callbacks.py | 0 setup.py | 8 ++------ src/pytorch-lightning/__init__.py | 10 ---------- 20 files changed, 2 insertions(+), 16 deletions(-) rename {src/pytorch-lightning/models => pytorch-lightning}/__init__.py (100%) rename {src/pytorch-lightning/models/sample_model_template => pytorch-lightning/models}/__init__.py (100%) rename {src/pytorch-lightning/root_module => pytorch-lightning/models/sample_model_template}/__init__.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/models/sample_model_template/model_template.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/models/trainer.py (100%) rename {src/pytorch-lightning/utils => pytorch-lightning/root_module}/__init__.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/grads.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/hooks.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/memory.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/model_saving.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/optimization.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/root_module/root_module.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/trainer_main.py (100%) create mode 100644 pytorch-lightning/utils/__init__.py rename {src/pytorch-lightning => pytorch-lightning}/utils/arg_parse.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/utils/embeddings.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/utils/plotting.py (100%) rename {src/pytorch-lightning => pytorch-lightning}/utils/pt_callbacks.py (100%) delete mode 100644 src/pytorch-lightning/__init__.py diff --git a/src/pytorch-lightning/models/__init__.py b/pytorch-lightning/__init__.py similarity index 100% rename from src/pytorch-lightning/models/__init__.py rename to pytorch-lightning/__init__.py diff --git a/src/pytorch-lightning/models/sample_model_template/__init__.py b/pytorch-lightning/models/__init__.py similarity index 100% rename from src/pytorch-lightning/models/sample_model_template/__init__.py rename to pytorch-lightning/models/__init__.py diff --git a/src/pytorch-lightning/root_module/__init__.py b/pytorch-lightning/models/sample_model_template/__init__.py similarity index 100% rename from src/pytorch-lightning/root_module/__init__.py rename to pytorch-lightning/models/sample_model_template/__init__.py diff --git a/src/pytorch-lightning/models/sample_model_template/model_template.py b/pytorch-lightning/models/sample_model_template/model_template.py similarity index 100% rename from src/pytorch-lightning/models/sample_model_template/model_template.py rename to pytorch-lightning/models/sample_model_template/model_template.py diff --git a/src/pytorch-lightning/models/trainer.py b/pytorch-lightning/models/trainer.py similarity index 100% rename from src/pytorch-lightning/models/trainer.py rename to pytorch-lightning/models/trainer.py diff --git a/src/pytorch-lightning/utils/__init__.py b/pytorch-lightning/root_module/__init__.py similarity index 100% rename from src/pytorch-lightning/utils/__init__.py rename to pytorch-lightning/root_module/__init__.py diff --git a/src/pytorch-lightning/root_module/grads.py b/pytorch-lightning/root_module/grads.py similarity index 100% rename from src/pytorch-lightning/root_module/grads.py rename to pytorch-lightning/root_module/grads.py diff --git a/src/pytorch-lightning/root_module/hooks.py b/pytorch-lightning/root_module/hooks.py similarity index 100% rename from src/pytorch-lightning/root_module/hooks.py rename to pytorch-lightning/root_module/hooks.py diff --git a/src/pytorch-lightning/root_module/memory.py b/pytorch-lightning/root_module/memory.py similarity index 100% rename from src/pytorch-lightning/root_module/memory.py rename to pytorch-lightning/root_module/memory.py diff --git a/src/pytorch-lightning/root_module/model_saving.py b/pytorch-lightning/root_module/model_saving.py similarity index 100% rename from src/pytorch-lightning/root_module/model_saving.py rename to pytorch-lightning/root_module/model_saving.py diff --git a/src/pytorch-lightning/root_module/optimization.py b/pytorch-lightning/root_module/optimization.py similarity index 100% rename from src/pytorch-lightning/root_module/optimization.py rename to pytorch-lightning/root_module/optimization.py diff --git a/src/pytorch-lightning/root_module/root_module.py b/pytorch-lightning/root_module/root_module.py similarity index 100% rename from src/pytorch-lightning/root_module/root_module.py rename to pytorch-lightning/root_module/root_module.py diff --git a/src/pytorch-lightning/trainer_main.py b/pytorch-lightning/trainer_main.py similarity index 100% rename from src/pytorch-lightning/trainer_main.py rename to pytorch-lightning/trainer_main.py diff --git a/pytorch-lightning/utils/__init__.py b/pytorch-lightning/utils/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/pytorch-lightning/utils/arg_parse.py b/pytorch-lightning/utils/arg_parse.py similarity index 100% rename from src/pytorch-lightning/utils/arg_parse.py rename to pytorch-lightning/utils/arg_parse.py diff --git a/src/pytorch-lightning/utils/embeddings.py b/pytorch-lightning/utils/embeddings.py similarity index 100% rename from src/pytorch-lightning/utils/embeddings.py rename to pytorch-lightning/utils/embeddings.py diff --git a/src/pytorch-lightning/utils/plotting.py b/pytorch-lightning/utils/plotting.py similarity index 100% rename from src/pytorch-lightning/utils/plotting.py rename to pytorch-lightning/utils/plotting.py diff --git a/src/pytorch-lightning/utils/pt_callbacks.py b/pytorch-lightning/utils/pt_callbacks.py similarity index 100% rename from src/pytorch-lightning/utils/pt_callbacks.py rename to pytorch-lightning/utils/pt_callbacks.py diff --git a/setup.py b/setup.py index 5d6cbf00..49a4cd43 100755 --- a/setup.py +++ b/setup.py @@ -3,14 +3,11 @@ from setuptools import setup, find_packages, os # https://packaging.python.org/guides/single-sourcing-package-version/ -version = {} -with open(os.path.join("src", "pytorch-lightning", "__init__.py")) as fp: - exec(fp.read(), version) # http://blog.ionelmc.ro/2014/05/25/python-packaging/ setup( name="pytorch-lightning", - version=version["__version__"], + version='0.1.dev11', description="The Keras for ML researchers using PyTorch", author="William Falcon", author_email="waf2107@columbia.edu", @@ -38,8 +35,7 @@ setup( "jupyter-client", ] }, - packages=find_packages("src"), - package_dir={"": "src"}, + packages=find_packages(), classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Education", diff --git a/src/pytorch-lightning/__init__.py b/src/pytorch-lightning/__init__.py deleted file mode 100644 index c3f8c57d..00000000 --- a/src/pytorch-lightning/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -""" -================= -pytorch-lightning -================= - -The Keras for ML researchers using PyTorch. More control. Less boilerplate. - -""" - -__version__ = "0.1.dev11"