Updates to setup.py

PiperOrigin-RevId: 312001886

Author: taiya

.bazelrc

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 build --verbose_failures
 test --keep_going
 test --build_tests_only

.flake8

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 [flake8]
 inline-quotes = double
 max-line-length = 88

.github/workflows/pythonapp.yml

@@ -40,7 +40,7 @@ jobs:
         pytest tensorflow_graphics
     - name: Install
       run: |
-        python setup.py --compute_platform cpu sdist bdist_wheel
+        python setup.py sdist bdist_wheel
         pip install dist/tensorflow_graphics*.whl
     - name: Test install
       run: |

.gitignore

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 **/__pycache__/
 bazel-out
 bazel-testlogs

.pylintrc

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 [MASTER]
 
 # Specify a configuration file.

.travis.yml

@@ -37,7 +37,7 @@ script:
   - export PYTHONPATH=$PWD:$PYTHONPATH
   - pytest tensorflow_graphics
   # --- build pip package (installs in python path)
-  - python setup.py --compute_platform cpu sdist bdist_wheel --universal
+  - python setup.py sdist bdist_wheel
   - pip install dist/tensorflow_graphics*.whl
   # --- test the pip package
   - cd $(mktemp -d) && python -c 'import tensorflow_graphics as tfg'

README.md

@@ -61,8 +61,8 @@ and debug your machine learning models of choice.
 
 ## Installing TensorFlow Graphics
 
-See the [install](tensorflow_graphics/g3doc/install.md) documentation for instructions on how to
-install TensorFlow Graphics.
+See the [install](https://github.com/tensorflow/graphics/blob/master/tensorflow_graphics/g3doc/install.md)
+documentation for instructions on how to install TensorFlow Graphics.
 
 ## API Documentation
 

WORKSPACE

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 workspace(name = "tensorflow_graphics")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

build_pip_pkg.sh

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 [pytest]
 norecursedirs = tensorflow_graphics/rendering/opengl/tests tensorflow_graphics/submodules
 python_files = *_test.py

pytest.ini

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 absl-py >= 0.6.1
 h5py >= 2.10.0
 matplotlib >= 2.2.5

requirements.txt

@@ -11,68 +11,32 @@
 # 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."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+"""Setup for pip package.
+
+Usage:
+  python setup.py sdist bdist_wheel
+"""
+
 
 import os
 import sys
+import setuptools
 
-from setuptools import find_packages
-from setuptools import setup
-
-version_path = os.path.join(os.path.dirname(__file__), 'tensorflow_graphics')
-sys.path.append(version_path)
-from version import __version__  # pylint: disable=g-import-not-at-top
 
-tensorflow_version = '1.13.1'
+def get_version():
+  """NOTE: assumes this file lives at the root of the project."""
+  version_path = os.path.join(os.path.dirname(__file__), 'tensorflow_graphics')
+  sys.path.append(version_path)
+  from version import __version__  # pylint: disable=g-import-not-at-top
+  return __version__
 
 INSTALL_PACKAGES = [line.strip() for line in open('requirements.txt')]
 INSTALL_PACKAGES = [line for line in INSTALL_PACKAGES \
                     if not line.startswith('#')]
 
-if '--compute_platform' in sys.argv:
-  compute_platform_idx = sys.argv.index('--compute_platform')
-  compute_platform = sys.argv[compute_platform_idx + 1]
-  sys.argv.remove('--compute_platform')
-  sys.argv.pop(compute_platform_idx)
-else:
-  compute_platform = 'none'
-
-if compute_platform not in ('none', 'cpu', 'gpu'):
-  sys.exit('Supported compute platforms are none, cpu, or gpu')
-
-if compute_platform == 'cpu':
-  INSTALL_PACKAGES.append('tensorflow >= ' + tensorflow_version)
-  package_name = 'tensorflow-graphics'
-elif compute_platform == 'gpu':
-  INSTALL_PACKAGES.append('tensorflow-gpu >= ' + tensorflow_version)
-  package_name = 'tensorflow-graphics-gpu'
-else:
-  package_name = 'tensorflow-graphics'
-
-SETUP_PACKAGES = [
-    'pytest-runner',
-]
-
-TEST_PACKAGES = [
-    'pytest',
-    'pytest-mock',
-    'python-coveralls',
-]
-
-EXTRA_PACKAGES = {
-    'test': TEST_PACKAGES,
-    'tf': ['tensorflow >= ' + tensorflow_version],
-    'tf-gpu': ['tensorflow-gpu >= ' + tensorflow_version],
-    'tf-nightly': ['tf-nightly-2.0-preview'],
-    'tf-nightly-gpu': ['tf-nightly-gpu-2.0-preview'],
-}
-
-setup(
-    name=package_name,
-    version=__version__,
+setuptools.setup(
+    name='tensorflow-graphics',
+    version=get_version(),
     description=('A library that contains well defined, reusable and cleanly '
                  'written graphics related ops and utility functions for '
                  'TensorFlow.'),
@@ -81,21 +45,19 @@
     author='Google LLC',
     author_email='[email protected]',
     install_requires=INSTALL_PACKAGES,
-    setup_requires=SETUP_PACKAGES,
-    tests_require=TEST_PACKAGES,
-    extras_require=EXTRA_PACKAGES,
-    packages=find_packages(),
+    packages=setuptools.find_packages(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
         'Topic :: Scientific/Engineering :: Mathematics',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
     ],
     license='Apache 2.0',
     keywords=[
+        'machine learning',
         'tensorflow',
         'graphics',
-        'machine learning',
+        'geometry',
+        '3D',
     ],
 )

setup.py

@@ -16,4 +16,3 @@ bibtex describing how to cite your work.
 If you have specific needs or requests, feel free to contact us at
 [email protected]; we would love to work with you to find a
 solution that fits your project!
-

tensorflow_graphics/submodules/README.md submodules/README.md

@@ -1,16 +1,3 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
 # cube.obj
 #