Skip to content

Commit 7d6d38c

Browse files
committed
Use relpaths in setup.py
The SOURCES.txt contained absolute paths which is not valid if you include_package_data. Therefore we switched to relpath.
1 parent ad79607 commit 7d6d38c

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include README.rst
22
include LICENSE
3+
include torchvision/assets/grace_hopper_517x606.jpg
34

45
recursive-exclude * __pycache__
56
recursive-exclude * *.py[co]

setup.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def get_dist(pkgname):
3434
sha = 'Unknown'
3535
package_name = 'torchvision'
3636

37-
cwd = os.path.dirname(os.path.abspath(__file__))
37+
cwd = os.path.dirname(os.path.relpath(__file__))
3838

3939
try:
4040
sha = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=cwd).decode('ascii').strip()
@@ -78,7 +78,7 @@ def write_version_file():
7878

7979

8080
def get_extensions():
81-
this_dir = os.path.dirname(os.path.abspath(__file__))
81+
this_dir = os.path.dirname(os.path.relpath(__file__))
8282
extensions_dir = os.path.join(this_dir, 'torchvision', 'csrc')
8383

8484
main_file = glob.glob(os.path.join(extensions_dir, '*.cpp'))
@@ -93,8 +93,6 @@ def get_extensions():
9393
test_file = glob.glob(os.path.join(test_dir, '*.cpp'))
9494
source_models = glob.glob(os.path.join(models_dir, '*.cpp'))
9595

96-
test_file = [os.path.join(test_dir, s) for s in test_file]
97-
source_models = [os.path.join(models_dir, s) for s in source_models]
9896
tests = test_file + source_models
9997

10098
define_macros = []
@@ -120,8 +118,6 @@ def get_extensions():
120118
extra_compile_args.setdefault('cxx', [])
121119
extra_compile_args['cxx'].append('/MP')
122120

123-
sources = [os.path.join(extensions_dir, s) for s in sources]
124-
125121
include_dirs = [extensions_dir]
126122
tests_include_dirs = [test_dir, models_dir]
127123

@@ -206,7 +202,8 @@ def run(self):
206202
# Package info
207203
packages=find_packages(exclude=('test',)),
208204

209-
zip_safe=True,
205+
zip_safe=False,
206+
include_package_data=True,
210207
install_requires=requirements,
211208
extras_require={
212209
"scipy": ["scipy"],

0 commit comments

Comments
 (0)