Include bin and headers to packaging and provide option to ensure tests can use precompiled trtorch libs #670
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tarball so that users can just load it as an HTTP archive Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
Signed-off-by: Dheeraj Peri <[email protected]>
Signed-off-by: Dheeraj Peri <[email protected]>
Signed-off-by: Dheeraj Peri <[email protected]>
Signed-off-by: Dheeraj Peri <[email protected]>
Signed-off-by: Dheeraj Peri <[email protected]>
github-actions
bot
added
component: api [Python]
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
There are some changes that do not conform to Python style guidelines:
Reformatting /workspace/py/trtorch/logging.py
Reformatting /workspace/py/trtorch/_compile_spec.py
Reformatting /workspace/py/trtorch/__init__.py
Reformatting /workspace/py/trtorch/ptq.py
Reformatting /workspace/py/trtorch/Input.py
Reformatting /workspace/py/trtorch/_types.py
Reformatting /workspace/py/trtorch/_compiler.py
Reformatting /workspace/py/trtorch/Device.py
--- /workspace/py/setup.py (original)
+++ /workspace/py/setup.py (reformatted)
@@ -105,6 +105,7 @@
with open(dir_path + '/trtorch/_version.py', 'w') as f:
print("creating version file")
f.write("__version__ = \"" + __version__ + '\"')
+
def copy_libtrtorch(multilinux=False):
if not os.path.exists(dir_path + '/trtorch/lib'):
@@ -257,27 +258,16 @@
python_requires='>=3.6',
include_package_data=True,
package_data={
- 'trtorch': ['lib/*',
- 'include/trtorch/*.h',
- 'include/trtorch/core/*.h',
- 'include/trtorch/core/conversion/*.h',
- 'include/trtorch/core/conversion/conversionctx/*.h',
- 'include/trtorch/core/conversion/converters/*.h',
- 'include/trtorch/core/conversion/evaluators/*.h',
- 'include/trtorch/core/conversion/tensorcontainer/*.h',
- 'include/trtorch/core/conversion/var/*.h',
- 'include/trtorch/core/ir/*.h',
- 'include/trtorch/core/lowering/*.h',
- 'include/trtorch/core/lowering/passes/*.h',
- 'include/trtorch/core/partitioning/*.h',
- 'include/trtorch/core/plugins/*.h',
- 'include/trtorch/core/plugins/impl/*.h',
- 'include/trtorch/core/runtime/*.h',
- 'include/trtorch/core/util/*.h',
- 'include/trtorch/core/util/logging/*.h',
- 'bin/*',
- 'BUILD',
- 'WORKSPACE'],
+ 'trtorch': [
+ 'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+ 'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+ 'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+ 'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+ 'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+ 'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+ 'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+ 'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+ ],
},
exclude_package_data={
'': ['*.cpp'],
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines
There was a problem hiding this comment.
There are some changes that do not conform to Python style guidelines:
Reformatting /workspace/py/trtorch/logging.py
Reformatting /workspace/py/trtorch/_compile_spec.py
Reformatting /workspace/py/trtorch/__init__.py
Reformatting /workspace/py/trtorch/ptq.py
Reformatting /workspace/py/trtorch/Input.py
Reformatting /workspace/py/trtorch/_types.py
Reformatting /workspace/py/trtorch/_compiler.py
Reformatting /workspace/py/trtorch/Device.py
--- /workspace/py/setup.py (original)
+++ /workspace/py/setup.py (reformatted)
@@ -105,6 +105,7 @@
with open(dir_path + '/trtorch/_version.py', 'w') as f:
print("creating version file")
f.write("__version__ = \"" + __version__ + '\"')
+
def copy_libtrtorch(multilinux=False):
if not os.path.exists(dir_path + '/trtorch/lib'):
@@ -257,27 +258,16 @@
python_requires='>=3.6',
include_package_data=True,
package_data={
- 'trtorch': ['lib/*',
- 'include/trtorch/*.h',
- 'include/trtorch/core/*.h',
- 'include/trtorch/core/conversion/*.h',
- 'include/trtorch/core/conversion/conversionctx/*.h',
- 'include/trtorch/core/conversion/converters/*.h',
- 'include/trtorch/core/conversion/evaluators/*.h',
- 'include/trtorch/core/conversion/tensorcontainer/*.h',
- 'include/trtorch/core/conversion/var/*.h',
- 'include/trtorch/core/ir/*.h',
- 'include/trtorch/core/lowering/*.h',
- 'include/trtorch/core/lowering/passes/*.h',
- 'include/trtorch/core/partitioning/*.h',
- 'include/trtorch/core/plugins/*.h',
- 'include/trtorch/core/plugins/impl/*.h',
- 'include/trtorch/core/runtime/*.h',
- 'include/trtorch/core/util/*.h',
- 'include/trtorch/core/util/logging/*.h',
- 'bin/*',
- 'BUILD',
- 'WORKSPACE'],
+ 'trtorch': [
+ 'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+ 'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+ 'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+ 'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+ 'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+ 'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+ 'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+ 'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+ ],
},
exclude_package_data={
'': ['*.cpp'],
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines
There was a problem hiding this comment.
There are some changes that do not conform to Python style guidelines:
Reformatting /workspace/py/trtorch/logging.py
Reformatting /workspace/py/trtorch/_compile_spec.py
Reformatting /workspace/py/trtorch/__init__.py
Reformatting /workspace/py/trtorch/ptq.py
Reformatting /workspace/py/trtorch/Input.py
Reformatting /workspace/py/trtorch/_types.py
Reformatting /workspace/py/trtorch/_compiler.py
Reformatting /workspace/py/trtorch/Device.py
--- /workspace/py/setup.py (original)
+++ /workspace/py/setup.py (reformatted)
@@ -105,6 +105,7 @@
with open(dir_path + '/trtorch/_version.py', 'w') as f:
print("creating version file")
f.write("__version__ = \"" + __version__ + '\"')
+
def copy_libtrtorch(multilinux=False):
if not os.path.exists(dir_path + '/trtorch/lib'):
@@ -257,27 +258,16 @@
python_requires='>=3.6',
include_package_data=True,
package_data={
- 'trtorch': ['lib/*',
- 'include/trtorch/*.h',
- 'include/trtorch/core/*.h',
- 'include/trtorch/core/conversion/*.h',
- 'include/trtorch/core/conversion/conversionctx/*.h',
- 'include/trtorch/core/conversion/converters/*.h',
- 'include/trtorch/core/conversion/evaluators/*.h',
- 'include/trtorch/core/conversion/tensorcontainer/*.h',
- 'include/trtorch/core/conversion/var/*.h',
- 'include/trtorch/core/ir/*.h',
- 'include/trtorch/core/lowering/*.h',
- 'include/trtorch/core/lowering/passes/*.h',
- 'include/trtorch/core/partitioning/*.h',
- 'include/trtorch/core/plugins/*.h',
- 'include/trtorch/core/plugins/impl/*.h',
- 'include/trtorch/core/runtime/*.h',
- 'include/trtorch/core/util/*.h',
- 'include/trtorch/core/util/logging/*.h',
- 'bin/*',
- 'BUILD',
- 'WORKSPACE'],
+ 'trtorch': [
+ 'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+ 'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+ 'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+ 'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+ 'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+ 'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+ 'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+ 'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+ ],
},
exclude_package_data={
'': ['*.cpp'],
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelinesSigned-off-by: Dheeraj Peri <[email protected]>
There was a problem hiding this comment.
There are some changes that do not conform to Python style guidelines:
Reformatting /workspace/py/trtorch/logging.py
Reformatting /workspace/py/trtorch/_compile_spec.py
Reformatting /workspace/py/trtorch/__init__.py
Reformatting /workspace/py/trtorch/ptq.py
Reformatting /workspace/py/trtorch/Input.py
Reformatting /workspace/py/trtorch/_types.py
Reformatting /workspace/py/trtorch/_compiler.py
Reformatting /workspace/py/trtorch/Device.py
--- /workspace/py/setup.py (original)
+++ /workspace/py/setup.py (reformatted)
@@ -105,6 +105,7 @@
with open(dir_path + '/trtorch/_version.py', 'w') as f:
print("creating version file")
f.write("__version__ = \"" + __version__ + '\"')
+
def copy_libtrtorch(multilinux=False):
if not os.path.exists(dir_path + '/trtorch/lib'):
@@ -257,27 +258,16 @@
python_requires='>=3.6',
include_package_data=True,
package_data={
- 'trtorch': ['lib/*',
- 'include/trtorch/*.h',
- 'include/trtorch/core/*.h',
- 'include/trtorch/core/conversion/*.h',
- 'include/trtorch/core/conversion/conversionctx/*.h',
- 'include/trtorch/core/conversion/converters/*.h',
- 'include/trtorch/core/conversion/evaluators/*.h',
- 'include/trtorch/core/conversion/tensorcontainer/*.h',
- 'include/trtorch/core/conversion/var/*.h',
- 'include/trtorch/core/ir/*.h',
- 'include/trtorch/core/lowering/*.h',
- 'include/trtorch/core/lowering/passes/*.h',
- 'include/trtorch/core/partitioning/*.h',
- 'include/trtorch/core/plugins/*.h',
- 'include/trtorch/core/plugins/impl/*.h',
- 'include/trtorch/core/runtime/*.h',
- 'include/trtorch/core/util/*.h',
- 'include/trtorch/core/util/logging/*.h',
- 'bin/*',
- 'BUILD',
- 'WORKSPACE'],
+ 'trtorch': [
+ 'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+ 'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+ 'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+ 'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+ 'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+ 'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+ 'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+ 'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+ ],
},
exclude_package_data={
'': ['*.cpp'],
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelines
narendasan
reviewed
Oct 19, 2021
py/setup.py
Outdated
| @@ -258,9 +257,29 @@ def run(self): | |||
| python_requires='>=3.6', | |||
| include_package_data=True, | |||
| package_data={ | |||
| 'trtorch': ['lib/*.so'], | |||
| 'trtorch': ['lib/*', | |||
There was a problem hiding this comment.
Do we need to list every directory, can we not glob?
There was a problem hiding this comment.
We probably can use python glob library (glob.glob(pattern) - requires 3/4 patterns).
Naive globbing (eg: providing directly include/**/*.h, include/**/**/*.h etc in trtorch key doesn't work. Referred to pytorch setup.py which included all directories https://github.com/pytorch/pytorch/blob/master/setup.py#L918
narendasan
reviewed
Oct 19, 2021
| @@ -76,7 +76,6 @@ cc_test( | |||
| "//tests/modules:jit_models", | |||
| ], | |||
| deps = [ | |||
| "//cpp:trtorch", | |||
There was a problem hiding this comment.
did we not have to replace any of these dependencies?
There was a problem hiding this comment.
I didn't get your question. We replaced //cpp:trtorch with //tests/util which adds //cpp:trtorch based on the trtorch_src flag
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
There was a problem hiding this comment.
There are some changes that do not conform to Python style guidelines:
Reformatting /workspace/py/trtorch/logging.py
Reformatting /workspace/py/trtorch/_compile_spec.py
Reformatting /workspace/py/trtorch/__init__.py
Reformatting /workspace/py/trtorch/ptq.py
Reformatting /workspace/py/trtorch/Input.py
Reformatting /workspace/py/trtorch/_types.py
Reformatting /workspace/py/trtorch/_compiler.py
Reformatting /workspace/py/trtorch/Device.py
--- /workspace/py/setup.py (original)
+++ /workspace/py/setup.py (reformatted)
@@ -106,6 +106,7 @@
print("creating version file")
f.write("__version__ = \"" + __version__ + '\"')
+
def copy_libtrtorch(multilinux=False):
if not os.path.exists(dir_path + '/trtorch/lib'):
os.makedirs(dir_path + '/trtorch/lib')
@@ -171,15 +172,8 @@
class CleanCommand(Command):
"""Custom clean command to tidy up the project root."""
PY_CLEAN_FILES = [
- './build',
- './dist',
- './trtorch/__pycache__',
- './trtorch/lib',
- './trtorch/include',
- './trtorch/bin',
- './*.pyc',
- './*.tgz',
- './*.egg-info'
+ './build', './dist', './trtorch/__pycache__', './trtorch/lib', './trtorch/include', './trtorch/bin', './*.pyc',
+ './*.tgz', './*.egg-info'
]
description = "Command to tidy up the project root"
user_options = []
@@ -265,27 +259,16 @@
python_requires='>=3.6',
include_package_data=True,
package_data={
- 'trtorch': ['lib/*',
- 'include/trtorch/*.h',
- 'include/trtorch/core/*.h',
- 'include/trtorch/core/conversion/*.h',
- 'include/trtorch/core/conversion/conversionctx/*.h',
- 'include/trtorch/core/conversion/converters/*.h',
- 'include/trtorch/core/conversion/evaluators/*.h',
- 'include/trtorch/core/conversion/tensorcontainer/*.h',
- 'include/trtorch/core/conversion/var/*.h',
- 'include/trtorch/core/ir/*.h',
- 'include/trtorch/core/lowering/*.h',
- 'include/trtorch/core/lowering/passes/*.h',
- 'include/trtorch/core/partitioning/*.h',
- 'include/trtorch/core/plugins/*.h',
- 'include/trtorch/core/plugins/impl/*.h',
- 'include/trtorch/core/runtime/*.h',
- 'include/trtorch/core/util/*.h',
- 'include/trtorch/core/util/logging/*.h',
- 'bin/*',
- 'BUILD',
- 'WORKSPACE'],
+ 'trtorch': [
+ 'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+ 'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+ 'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+ 'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+ 'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+ 'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+ 'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+ 'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+ ],
},
exclude_package_data={
'': ['*.cpp'],
Reformatting /workspace/py/setup.py
ERROR: Some files do not conform to style guidelinesSigned-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Include bin and headers to packaging and provide option to ensure tests can use precompiled trtorch libs
Type of change
Checklist: