diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..cac63b0 --- /dev/null +++ b/setup.py @@ -0,0 +1,28 @@ +from setuptools import setup, find_packages + +from version import version + + +setup_info = dict( + name='simclr', + version=version, + author='google-research', + url='https://github.com/google-research/simclr', + download_url='https://github.com/google-research/simclr/tags', + project_urls={ + 'Source': 'https://github.com/google-research/simclr', + }, + description='A Simple Framework for Contrastive Learning of Visual Representations', + long_description=open('README.md').read(), + long_description_content_type='text/markdown', + license='Apache License Version 2.0', + + # Package info + packages=['simclr'] + ['simclr.' + pkg for pkg in find_packages('simclr')], + + # Add _ prefix to the names of temporary build dirs + options={'build': {'build_base': '_build'}, }, + zip_safe=True, +) + +setup(**setup_info) diff --git a/simclr/__init__.py b/simclr/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/data.py b/simclr/data.py similarity index 99% rename from data.py rename to simclr/data.py index dd58914..ac4a31f 100644 --- a/data.py +++ b/simclr/data.py @@ -22,7 +22,7 @@ import functools from absl import flags -import data_util as data_util +import simclr.data_util as data_util import tensorflow.compat.v1 as tf FLAGS = flags.FLAGS diff --git a/data_util.py b/simclr/data_util.py similarity index 100% rename from data_util.py rename to simclr/data_util.py diff --git a/lars_optimizer.py b/simclr/lars_optimizer.py similarity index 100% rename from lars_optimizer.py rename to simclr/lars_optimizer.py diff --git a/model.py b/simclr/model.py similarity index 98% rename from model.py rename to simclr/model.py index c780119..b82e8c7 100644 --- a/model.py +++ b/simclr/model.py @@ -21,9 +21,9 @@ from absl import flags -import data_util as data_util -import model_util as model_util -import objective as obj_lib +import simclr.data_util as data_util +import simclr.model_util as model_util +import simclr.objective as obj_lib import tensorflow.compat.v1 as tf import tensorflow.compat.v2 as tf2 diff --git a/model_util.py b/simclr/model_util.py similarity index 99% rename from model_util.py rename to simclr/model_util.py index e9caf63..eb6a8d0 100644 --- a/model_util.py +++ b/simclr/model_util.py @@ -22,7 +22,7 @@ import math from absl import flags -import resnet +import simclr.resnet from lars_optimizer import LARSOptimizer import tensorflow.compat.v1 as tf diff --git a/objective.py b/simclr/objective.py similarity index 100% rename from objective.py rename to simclr/objective.py diff --git a/resnet.py b/simclr/resnet.py similarity index 100% rename from resnet.py rename to simclr/resnet.py diff --git a/run.py b/simclr/run.py similarity index 99% rename from run.py rename to simclr/run.py index 9012db7..f9f118d 100644 --- a/run.py +++ b/simclr/run.py @@ -25,10 +25,10 @@ from absl import app from absl import flags -import resnet -import data as data_lib -import model as model_lib -import model_util as model_util +import simclr.resnet as resnet +import simclr.data as data_lib +import simclr.model as model_lib +import simclr.model_util as model_util import tensorflow.compat.v1 as tf import tensorflow_datasets as tfds diff --git a/tf2/README.md b/simclr/tf2/README.md similarity index 100% rename from tf2/README.md rename to simclr/tf2/README.md diff --git a/simclr/tf2/__init__.py b/simclr/tf2/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tf2/colabs/distillation_self_training.ipynb b/simclr/tf2/colabs/distillation_self_training.ipynb similarity index 100% rename from tf2/colabs/distillation_self_training.ipynb rename to simclr/tf2/colabs/distillation_self_training.ipynb diff --git a/tf2/colabs/finetuning.ipynb b/simclr/tf2/colabs/finetuning.ipynb similarity index 100% rename from tf2/colabs/finetuning.ipynb rename to simclr/tf2/colabs/finetuning.ipynb diff --git a/tf2/colabs/imagenet_results.ipynb b/simclr/tf2/colabs/imagenet_results.ipynb similarity index 100% rename from tf2/colabs/imagenet_results.ipynb rename to simclr/tf2/colabs/imagenet_results.ipynb diff --git a/tf2/colabs/load_and_inference.ipynb b/simclr/tf2/colabs/load_and_inference.ipynb similarity index 100% rename from tf2/colabs/load_and_inference.ipynb rename to simclr/tf2/colabs/load_and_inference.ipynb diff --git a/tf2/data.py b/simclr/tf2/data.py similarity index 99% rename from tf2/data.py rename to simclr/tf2/data.py index 968a7bc..5b4bd26 100644 --- a/tf2/data.py +++ b/simclr/tf2/data.py @@ -19,7 +19,7 @@ from absl import flags from absl import logging -import data_util +import simclr.tf2.data_util as data_util import tensorflow.compat.v2 as tf import tensorflow_datasets as tfds diff --git a/tf2/data_util.py b/simclr/tf2/data_util.py similarity index 100% rename from tf2/data_util.py rename to simclr/tf2/data_util.py diff --git a/tf2/lars_optimizer.py b/simclr/tf2/lars_optimizer.py similarity index 100% rename from tf2/lars_optimizer.py rename to simclr/tf2/lars_optimizer.py diff --git a/tf2/metrics.py b/simclr/tf2/metrics.py similarity index 100% rename from tf2/metrics.py rename to simclr/tf2/metrics.py diff --git a/tf2/model.py b/simclr/tf2/model.py similarity index 98% rename from tf2/model.py rename to simclr/tf2/model.py index 255434a..892546f 100644 --- a/tf2/model.py +++ b/simclr/tf2/model.py @@ -18,9 +18,9 @@ import math from absl import flags -import data_util -import lars_optimizer -import resnet +import simclr.tf2.data_util as data_util +import simclr.tf2.lars_optimizer as lars_optimizer +import simclr.tf2.resnet as resnet import tensorflow.compat.v2 as tf FLAGS = flags.FLAGS diff --git a/tf2/objective.py b/simclr/tf2/objective.py similarity index 100% rename from tf2/objective.py rename to simclr/tf2/objective.py diff --git a/tf2/requirements.txt b/simclr/tf2/requirements.txt similarity index 100% rename from tf2/requirements.txt rename to simclr/tf2/requirements.txt diff --git a/tf2/resnet.py b/simclr/tf2/resnet.py similarity index 100% rename from tf2/resnet.py rename to simclr/tf2/resnet.py diff --git a/tf2/run.py b/simclr/tf2/run.py similarity index 99% rename from tf2/run.py rename to simclr/tf2/run.py index fa39491..e55eaf6 100644 --- a/tf2/run.py +++ b/simclr/tf2/run.py @@ -22,10 +22,12 @@ from absl import app from absl import flags from absl import logging -import data as data_lib -import metrics -import model as model_lib -import objective as obj_lib + +import simclr.tf2.data as data_lib +import simclr.tf2.metrics as metrics +import simclr.tf2.model as model_lib +import simclr.tf2.objective as obj_lib + import tensorflow.compat.v2 as tf import tensorflow_datasets as tfds diff --git a/version.py b/version.py new file mode 100644 index 0000000..346c93f --- /dev/null +++ b/version.py @@ -0,0 +1 @@ +version = "1.0"