helpers.cpp suupport added, version changed, clean up

Signed-off-by: Evelina Bakhturina <[email protected]>

Author: ekmb

MANIFEST.in

@@ -0,0 +1,2 @@
+include megatron/data/Makefile
+include megatron/data/helpers.cpp

megatron/__init__.py

@@ -14,8 +14,6 @@
 # limitations under the License.
 
 from .package_info import (
-    __contact_emails__,
-    __contact_names__,
     __description__,
     __url__,
     __download_url__,

megatron/package_info.py

@@ -1,7 +1,6 @@
 # ! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
+# coding=utf-8
+# Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,17 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MAJOR = 0
-MINOR = 1
-PATCH = 0
+MAJOR = 1
+MINOR = 0
 
 # Use the following formatting: (major, minor, patch)
-VERSION = (MAJOR, MINOR, PATCH)
+VERSION = (MAJOR, MINOR)
 
 __version__ = '.'.join(map(str, VERSION))
-__package_name__ = 'megatron_lm'
-__contact_names__ = 'NVIDIA'
-__contact_emails__ = '[email protected]'
+__package_name__ = 'megatron-lm'
 __url__ = 'https://github.com/NVIDIA/Megatron-LM'
 __download_url__ = 'https://github.com/NVIDIA/Megatron-LM/releases'
 __description__ = 'Megatron-LM: Training Multi-Billion Parameter Language Models Using Model Parallelism.'

requirements.txt

@@ -1 +1,3 @@
-nltk
+pybind11
+torch
+torchvision

setup.py

@@ -1,7 +1,5 @@
-# ! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright 2020 NVIDIA. All Rights Reserved.
+# coding=utf-8
+# Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# =============================================================================
 
 """Setup for pip package."""
 
@@ -25,21 +22,7 @@
 if sys.version_info < (3,):
     raise Exception("Python 2 is not supported by Megatron.")
 
-def is_build_action():
-    if len(sys.argv) <= 1:
-        return False
-
-    BUILD_TOKENS = ["egg_info", "dist", "bdist", "sdist", "install", "build", "develop", "style"]
-
-    if any([sys.argv[1].startswith(x) for x in BUILD_TOKENS]):
-        return True
-    else:
-        return False
-
-
 from megatron.package_info import (
-    __contact_emails__,
-    __contact_names__,
     __description__,
     __url__,
     __download_url__,
@@ -49,6 +32,9 @@ def is_build_action():
     __version__,
 )
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
 ###############################################################################
 #                             Dependency Loading                              #
 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #
@@ -71,38 +57,21 @@ def req_file(filename):
     # https://packaging.python.org/en/latest/single_source_version.html
     version=__version__,
     description=__description__,
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     # The project's main homepage.
     url=__url__,
-    # Author details
-    author=__contact_names__,
-    author_email=__contact_emails__,
-    # maintainer Details
-    maintainer=__contact_names__,
-    maintainer_email=__contact_emails__,
     # The licence under which the project is released
     license=__license__,
     classifiers=[
-        # How mature is this project? Common values are
-        #  1 - Planning
-        #  2 - Pre-Alpha
-        #  3 - Alpha
-        #  4 - Beta
-        #  5 - Production/Stable
-        #  6 - Mature
-        #  7 - Inactive
         'Development Status :: 4 - Beta',
         # Indicate who your project is intended for
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'Intended Audience :: Information Technology',
         # Indicate what your project relates to
-        'Topic :: Scientific/Engineering',
-        'Topic :: Scientific/Engineering :: Mathematics',
-        'Topic :: Scientific/Engineering :: Image Recognition',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
-        'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Utilities',
         # Pick your license as you wish (should match "license" above)
         'License :: OSI Approved :: Apache Software License',
         # Supported python versions
@@ -114,6 +83,7 @@ def req_file(filename):
         'Natural Language :: English',
         'Operating System :: OS Independent',
     ],
+    python_requires='>=3.6',
     packages=setuptools.find_packages(),
     install_requires=install_requires,
     # Add in any packaged data.