Skip to content

Commit c96ed7e

Browse files
Skylion007pytorchmergebot
Skylion007
authored and
pytorchmergebot
committed
[BE]: No include left behind - recursive glob setuptools support (pytorch#148258)
Fixes pytorch#148256 TestPlan check the printout from the setup.py build and verify the files are still included. Pull Request resolved: pytorch#148258 Approved by: https://github.com/malfet, https://github.com/benjaminglass1
1 parent 9d7945e commit c96ed7e

File tree

3 files changed

+16
-186
lines changed

3 files changed

+16
-186
lines changed

‎pyproject.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[build-system]
22
requires = [
3-
"setuptools",
3+
# After 75.8.2 dropped dep disttools API. Please fix
4+
# min version for recursive glob package data support
5+
"setuptools>=62.3.0,<75.9",
46
"wheel",
57
"astunparse",
68
"numpy",

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ psutil
1616
pyyaml
1717
requests
1818
# issue on Windows after >= 75.8.2 - https://github.com/pytorch/pytorch/issues/148877
19-
setuptools<=75.8.2
19+
setuptools>=62.3.0,<75.9
2020
sympy>=1.13.3
2121
types-dataclasses
2222
typing-extensions>=4.10.0

‎setup.py

+12-184
Original file line numberDiff line numberDiff line change
@@ -1193,175 +1193,19 @@ def main():
11931193
"bin/*",
11941194
"test/*",
11951195
"*.pyi",
1196-
"_C/*.pyi",
1197-
"cuda/*.pyi",
1198-
"fx/*.pyi",
1199-
"optim/*.pyi",
1200-
"autograd/*.pyi",
1201-
"jit/*.pyi",
1202-
"nn/*.pyi",
1203-
"nn/modules/*.pyi",
1204-
"nn/parallel/*.pyi",
1205-
"utils/data/*.pyi",
1206-
"utils/data/datapipes/*.pyi",
1196+
"**/*.pyi",
12071197
"lib/*.pdb",
1198+
"lib/**/*.pdb",
12081199
"lib/*shm*",
12091200
"lib/torch_shm_manager",
12101201
"lib/*.h",
1202+
"lib/**/*.h",
12111203
"include/*.h",
1212-
"include/ATen/*.h",
1213-
"include/ATen/cpu/*.h",
1214-
"include/ATen/cpu/vec/vec128/*.h",
1215-
"include/ATen/cpu/vec/vec256/*.h",
1216-
"include/ATen/cpu/vec/vec256/vsx/*.h",
1217-
"include/ATen/cpu/vec/vec256/zarch/*.h",
1218-
"include/ATen/cpu/vec/vec512/*.h",
1219-
"include/ATen/cpu/vec/*.h",
1220-
"include/ATen/cpu/vec/sve/*.h",
1221-
"include/ATen/core/*.h",
1222-
"include/ATen/cuda/*.cuh",
1223-
"include/ATen/cuda/*.h",
1224-
"include/ATen/cuda/detail/*.cuh",
1225-
"include/ATen/cuda/detail/*.h",
1226-
"include/ATen/cuda/tunable/*.h",
1227-
"include/ATen/cudnn/*.h",
1228-
"include/ATen/functorch/*.h",
1229-
"include/ATen/ops/*.h",
1230-
"include/ATen/hip/*.cuh",
1231-
"include/ATen/hip/*.h",
1232-
"include/ATen/hip/detail/*.cuh",
1233-
"include/ATen/hip/detail/*.h",
1234-
"include/ATen/hip/impl/*.h",
1235-
"include/ATen/hip/tunable/*.h",
1236-
"include/ATen/mps/*.h",
1237-
"include/ATen/miopen/*.h",
1238-
"include/ATen/detail/*.h",
1239-
"include/ATen/native/*.h",
1240-
"include/ATen/native/cpu/*.h",
1241-
"include/ATen/native/cuda/*.h",
1242-
"include/ATen/native/cuda/*.cuh",
1243-
"include/ATen/native/hip/*.h",
1244-
"include/ATen/native/hip/*.cuh",
1245-
"include/ATen/native/kleidiai/*.h",
1246-
"include/ATen/native/mps/*.h",
1247-
"include/ATen/native/mkldnn/xpu/*.h",
1248-
"include/ATen/native/mkldnn/xpu/detail/*.h",
1249-
"include/ATen/native/nested/*.h",
1250-
"include/ATen/native/quantized/*.h",
1251-
"include/ATen/native/quantized/cpu/*.h",
1252-
"include/ATen/native/transformers/*.h",
1253-
"include/ATen/native/sparse/*.h",
1254-
"include/ATen/native/utils/*.h",
1255-
"include/ATen/quantized/*.h",
1256-
"include/ATen/xpu/*.h",
1257-
"include/ATen/xpu/detail/*.h",
1258-
"include/caffe2/serialize/*.h",
1259-
"include/c10/*.h",
1260-
"include/c10/macros/*.h",
1261-
"include/c10/core/*.h",
1262-
"include/ATen/core/boxing/*.h",
1263-
"include/ATen/core/boxing/impl/*.h",
1264-
"include/ATen/core/dispatch/*.h",
1265-
"include/ATen/core/op_registration/*.h",
1266-
"include/c10/core/impl/*.h",
1267-
"include/c10/util/*.h",
1268-
"include/c10/cuda/*.h",
1269-
"include/c10/cuda/impl/*.h",
1270-
"include/c10/hip/*.h",
1271-
"include/c10/hip/impl/*.h",
1272-
"include/c10/metal/*.h",
1273-
"include/c10/xpu/*.h",
1274-
"include/c10/xpu/impl/*.h",
1275-
"include/torch/*.h",
1276-
"include/torch/csrc/*.h",
1277-
"include/torch/csrc/stable/*.h",
1278-
"include/torch/csrc/api/include/torch/*.h",
1279-
"include/torch/csrc/api/include/torch/data/*.h",
1280-
"include/torch/csrc/api/include/torch/data/dataloader/*.h",
1281-
"include/torch/csrc/api/include/torch/data/datasets/*.h",
1282-
"include/torch/csrc/api/include/torch/data/detail/*.h",
1283-
"include/torch/csrc/api/include/torch/data/samplers/*.h",
1284-
"include/torch/csrc/api/include/torch/data/transforms/*.h",
1285-
"include/torch/csrc/api/include/torch/detail/*.h",
1286-
"include/torch/csrc/api/include/torch/detail/ordered_dict.h",
1287-
"include/torch/csrc/api/include/torch/nn/*.h",
1288-
"include/torch/csrc/api/include/torch/nn/functional/*.h",
1289-
"include/torch/csrc/api/include/torch/nn/options/*.h",
1290-
"include/torch/csrc/api/include/torch/nn/modules/*.h",
1291-
"include/torch/csrc/api/include/torch/nn/modules/container/*.h",
1292-
"include/torch/csrc/api/include/torch/nn/parallel/*.h",
1293-
"include/torch/csrc/api/include/torch/nn/utils/*.h",
1294-
"include/torch/csrc/api/include/torch/optim/*.h",
1295-
"include/torch/csrc/api/include/torch/optim/schedulers/*.h",
1296-
"include/torch/csrc/api/include/torch/serialize/*.h",
1297-
"include/torch/csrc/autograd/*.h",
1298-
"include/torch/csrc/autograd/functions/*.h",
1299-
"include/torch/csrc/autograd/generated/*.h",
1300-
"include/torch/csrc/autograd/utils/*.h",
1301-
"include/torch/csrc/cuda/*.h",
1302-
"include/torch/csrc/distributed/c10d/*.h",
1303-
"include/torch/csrc/distributed/c10d/*.hpp",
1304-
"include/torch/csrc/distributed/rpc/*.h",
1305-
"include/torch/csrc/distributed/autograd/context/*.h",
1306-
"include/torch/csrc/distributed/autograd/functions/*.h",
1307-
"include/torch/csrc/distributed/autograd/rpc_messages/*.h",
1308-
"include/torch/csrc/dynamo/*.h",
1309-
"include/torch/csrc/inductor/*.h",
1310-
"include/torch/csrc/inductor/aoti_include/*.h",
1311-
"include/torch/csrc/inductor/aoti_package/*.h",
1312-
"include/torch/csrc/inductor/aoti_runner/*.h",
1313-
"include/torch/csrc/inductor/aoti_runtime/*.h",
1314-
"include/torch/csrc/inductor/aoti_torch/*.h",
1315-
"include/torch/csrc/inductor/aoti_torch/c/*.h",
1316-
"include/torch/csrc/inductor/aoti_torch/generated/*.h",
1317-
"include/torch/csrc/inductor/aoti_torch/generated/extend/*.h",
1318-
"include/torch/csrc/inductor/cpp_wrapper/*.h",
1319-
"include/torch/csrc/inductor/cpp_wrapper/device_internal/*.h",
1320-
"include/torch/csrc/jit/*.h",
1321-
"include/torch/csrc/jit/backends/*.h",
1322-
"include/torch/csrc/jit/generated/*.h",
1323-
"include/torch/csrc/jit/passes/*.h",
1324-
"include/torch/csrc/jit/passes/quantization/*.h",
1325-
"include/torch/csrc/jit/passes/utils/*.h",
1326-
"include/torch/csrc/jit/runtime/*.h",
1327-
"include/torch/csrc/jit/ir/*.h",
1328-
"include/torch/csrc/jit/frontend/*.h",
1329-
"include/torch/csrc/jit/api/*.h",
1330-
"include/torch/csrc/jit/serialization/*.h",
1331-
"include/torch/csrc/jit/python/*.h",
1332-
"include/torch/csrc/jit/mobile/*.h",
1333-
"include/torch/csrc/jit/testing/*.h",
1334-
"include/torch/csrc/jit/tensorexpr/*.h",
1335-
"include/torch/csrc/jit/tensorexpr/operators/*.h",
1336-
"include/torch/csrc/jit/codegen/cuda/*.h",
1337-
"include/torch/csrc/onnx/*.h",
1338-
"include/torch/csrc/profiler/*.h",
1339-
"include/torch/csrc/profiler/orchestration/*.h",
1340-
"include/torch/csrc/profiler/standalone/*.h",
1341-
"include/torch/csrc/profiler/stubs/*.h",
1342-
"include/torch/csrc/profiler/unwind/*.h",
1343-
"include/torch/csrc/profiler/python/*.h",
1344-
"include/torch/csrc/utils/*.h",
1345-
"include/torch/csrc/tensor/*.h",
1346-
"include/torch/csrc/lazy/backend/*.h",
1347-
"include/torch/csrc/lazy/core/*.h",
1348-
"include/torch/csrc/lazy/core/internal_ops/*.h",
1349-
"include/torch/csrc/lazy/core/ops/*.h",
1350-
"include/torch/csrc/lazy/python/python_util.h",
1351-
"include/torch/csrc/lazy/ts_backend/*.h",
1352-
"include/torch/csrc/xpu/*.h",
1353-
"include/pybind11/*.h",
1354-
"include/pybind11/detail/*.h",
1355-
"include/pybind11/eigen/*.h",
1356-
"include/TH/*.h*",
1357-
"include/TH/generic/*.h*",
1358-
"include/THC/*.cuh",
1359-
"include/THC/*.h*",
1360-
"include/THC/generic/*.h",
1361-
"include/THH/*.cuh",
1362-
"include/THH/*.h*",
1363-
"include/THH/generic/*.h",
1364-
"include/sleef.h",
1204+
"include/**/*.h",
1205+
"include/*.hpp",
1206+
"include/**/*.hpp",
1207+
"include/*.cuh",
1208+
"include/**/*.cuh",
13651209
"_inductor/codegen/*.h",
13661210
"_inductor/codegen/aoti_runtime/*.cpp",
13671211
"_inductor/script.ld",
@@ -1412,35 +1256,19 @@ def main():
14121256
torch_package_data.extend(
14131257
[
14141258
"include/tensorpipe/*.h",
1415-
"include/tensorpipe/channel/*.h",
1416-
"include/tensorpipe/channel/basic/*.h",
1417-
"include/tensorpipe/channel/cma/*.h",
1418-
"include/tensorpipe/channel/mpt/*.h",
1419-
"include/tensorpipe/channel/xth/*.h",
1420-
"include/tensorpipe/common/*.h",
1421-
"include/tensorpipe/core/*.h",
1422-
"include/tensorpipe/transport/*.h",
1423-
"include/tensorpipe/transport/ibv/*.h",
1424-
"include/tensorpipe/transport/shm/*.h",
1425-
"include/tensorpipe/transport/uv/*.h",
1259+
"include/tensorpipe/**/*.h",
14261260
]
14271261
)
14281262
if get_cmake_cache_vars()["USE_KINETO"]:
14291263
torch_package_data.extend(
14301264
[
14311265
"include/kineto/*.h",
1266+
"include/kineto/**/*.h",
14321267
]
14331268
)
14341269
torchgen_package_data = [
1435-
# Recursive glob doesn't work in setup.py,
1436-
# https://github.com/pypa/setuptools/issues/1806
1437-
# To make this robust we should replace it with some code that
1438-
# returns a list of everything under packaged/
1439-
"packaged/ATen/*",
1440-
"packaged/ATen/native/*",
1441-
"packaged/ATen/templates/*",
1442-
"packaged/autograd/*",
1443-
"packaged/autograd/templates/*",
1270+
"packaged/*",
1271+
"packaged/**/*",
14441272
]
14451273
package_data = {
14461274
"torch": torch_package_data,

0 commit comments

Comments
 (0)