Skip to content

chore: Move master to test nightly only #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 3, 2022
Merged

chore: Move master to test nightly only #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b57efd
chore: Fix centralized partititoning
peri044 Sep 22, 2022
93ec6b0
chore: Add new parititoning headers to py packaging
peri044 Sep 23, 2022
789be61
chore: Add partitioning headers to C++ tar package
peri044 Sep 23, 2022
7013e9d
chore: Move master to test nightly only
narendasan Sep 23, 2022
ca66b73
chore: Different build
narendasan Sep 23, 2022
a8ea3f5
Updated config.yml
narendasan Sep 23, 2022
1a106e3
Updated config.yml
narendasan Sep 23, 2022
cc1f43f
Update CI conf
narendasan Sep 23, 2022
0454664
Merge remote-tracking branch 'origin/partitioning_fix' into pyt_night…
narendasan Sep 29, 2022
5365f90
chore: reordering dep installation
narendasan Sep 29, 2022
2aefc7b
chore: Allow prerelease deps
narendasan Sep 29, 2022
fef2cbd
chore: relax torch version
narendasan Sep 29, 2022
e29b638
chore: update cudnn for pytorch
narendasan Sep 29, 2022
1f8eec4
chore: switch back to cuda 11.6 because tensorrt is pinned to cudnn 8.4
narendasan Sep 30, 2022
d5bc273
chore: release configs
narendasan Sep 30, 2022
dc6a7a2
chore: update build container
narendasan Sep 30, 2022
69d52a4
update ci release container
narendasan Oct 1, 2022
1edd66a
Downgrade default libtorch to cuda 11.6 due to torchvision / tensorrt…
narendasan Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
421 changes: 129 additions & 292 deletions .circleci/config.yml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ pkg_tar(
"//core/lowering:include",
"//core/lowering/passes:include",
"//core/partitioning:include",
"//core/partitioning/segmentedblock:include",
"//core/partitioning/partitioninginfo:include",
"//core/partitioning/partitioningctx:include",
"//core/plugins:impl_include",
"//core/plugins:include",
"//core/runtime:include",
Expand Down
8 changes: 4 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ new_local_repository(
http_archive(
name = "libtorch",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "5a392132fbff9db1482eae72a30f74b09f53a47edf8305fe9688d4ce7ddb0b6b",
sha256 = "486106ddc5b5ad532f030f447940a571b924da821b9534d25c0cef5503cdfaea",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu116/libtorch-cxx11-abi-shared-with-deps-1.12.1%2Bcu116.zip"],
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"],
)

http_archive(
name = "libtorch_pre_cxx11_abi",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "5e044cc56a29cd4f3a7198c0fe5b2f0fa8f4c38cd71a0491274b6a914e8f24a7",
sha256 = "b304ebf26effcbbefcec99134bcfb0127c499306343fbe2e2cd127213448a4a6",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu116/libtorch-shared-with-deps-1.12.1%2Bcu116.zip"],
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220921%2Bcu116.zip"],
)

# Download these tarballs manually from the NVIDIA website
Expand Down
3 changes: 2 additions & 1 deletion core/partitioning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ add_library(${lib_name} OBJECT)
set(CXX_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/partitioning.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/shape_analysis.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/stitching.cpp"
)

set(HEADER_FILES
Expand Down Expand Up @@ -36,4 +37,4 @@ add_subdirectory(partitioningctx)
add_subdirectory(partitioninginfo)
add_subdirectory(segmentedblock)

install(FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/torch_tensorrt/core/partitioning")
install(FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/torch_tensorrt/core/partitioning")
2 changes: 0 additions & 2 deletions core/partitioning/shape_analysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ std::unordered_map<const torch::jit::Value*, torch::jit::IValue> generateRandomI

for (auto& input : inputs) {
if (input.first->type()->kind() == torch::jit::TypeKind::ListType) {
// create list
std::vector<torch::jit::IValue> list;
c10::TypePtr elementType = c10::TensorType::get();
auto generic_list = c10::impl::GenericList(elementType);
for (size_t i = 0; i < input.second.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion py/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pytorch/manylinux-builder:cuda11.3
FROM pytorch/manylinux-builder:cuda11.6

RUN yum install -y ninja-build

Expand Down
2 changes: 1 addition & 1 deletion py/ci/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pytorch/manylinux-builder:cuda11.3
FROM pytorch/manylinux-builder:cuda11.6
ARG trt_version

RUN echo -e "Installing with TensorRT ${trt_version}"
Expand Down
2 changes: 1 addition & 1 deletion py/ci/build_whl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cd /workspace/project/py

export CXX=g++
export CUDA_HOME=/usr/local/cuda-11.3
export CUDA_HOME=/usr/local/cuda-11.6
PROJECT_DIR=/workspace/project

cp -r $CUDA_HOME /usr/local/cuda
Expand Down
3 changes: 2 additions & 1 deletion py/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
numpy
pybind11==2.6.2
--extra-index-url https://download.pytorch.org/whl/nightly/cu116
torch==1.13.0.dev20220825+cu116
torch==1.13.0.dev20220921+cu116
torchvision==0.14.0.dev20220921+cu116
--extra-index-url https://pypi.ngc.nvidia.com
nvidia-tensorrt==8.4.3.1
5 changes: 4 additions & 1 deletion py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def run(self):
long_description=long_description,
ext_modules=ext_modules,
install_requires=[
"torch>=1.12.0+cu113,<1.13.0",
"torch>=1.13.0.dev0,<1.14.0",
],
setup_requires=[],
cmdclass={
Expand Down Expand Up @@ -422,6 +422,9 @@ def run(self):
"include/torch_tensorrt/core/lowering/*.h",
"include/torch_tensorrt/core/lowering/passes/*.h",
"include/torch_tensorrt/core/partitioning/*.h",
"include/torch_tensorrt/core/partitioning/segmentedblock/*.h",
"include/torch_tensorrt/core/partitioning/partitioninginfo/*.h",
"include/torch_tensorrt/core/partitioning/partitioningctx/*.h",
"include/torch_tensorrt/core/plugins/*.h",
"include/torch_tensorrt/core/plugins/impl/*.h",
"include/torch_tensorrt/core/runtime/*.h",
Expand Down
10 changes: 5 additions & 5 deletions toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ local_repository(
new_local_repository(
name = "cuda",
build_file = "@//third_party/cuda:BUILD",
path = "/usr/local/cuda-11.3",
path = "/usr/local/cuda-11.6",
)

new_local_repository(
Expand All @@ -56,17 +56,17 @@ new_local_repository(
http_archive(
name = "libtorch",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "80f089939de20e68e3fcad4dfa72a26c8bf91b5e77b11042f671f39ebac35865",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.12.0%2Bcu113.zip"],
sha256 = "94573e4c5f84ee70dea00c39dc1afcd4173ef4454f4d7cb428b499cf4c3b86e1",
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"],
)

http_archive(
name = "libtorch_pre_cxx11_abi",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "8e35371403f7052d9e9b43bcff383980dbde4df028986dc1dab539953481d55f",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-shared-with-deps-1.12.0%2Bcu113.zip"],
sha256 = "5748ee06d81934a4bf7654653b34820365b264d16f6b99b56833cfdd3005da71",
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"],
)

####################################################################################
Expand Down
8 changes: 4 additions & 4 deletions toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ new_local_repository(
http_archive(
name = "libtorch",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "80f089939de20e68e3fcad4dfa72a26c8bf91b5e77b11042f671f39ebac35865",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.12.0%2Bcu113.zip"],
sha256 = "94573e4c5f84ee70dea00c39dc1afcd4173ef4454f4d7cb428b499cf4c3b86e1",
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"],
)

http_archive(
name = "libtorch_pre_cxx11_abi",
build_file = "@//third_party/libtorch:BUILD",
sha256 = "8e35371403f7052d9e9b43bcff383980dbde4df028986dc1dab539953481d55f",
strip_prefix = "libtorch",
urls = ["https://download.pytorch.org/libtorch/cu113/libtorch-shared-with-deps-1.12.0%2Bcu113.zip"],
sha256 = "5748ee06d81934a4bf7654653b34820365b264d16f6b99b56833cfdd3005da71",
urls = ["https://download.pytorch.org/libtorch/nightly/cu116/libtorch-shared-with-deps-1.13.0.dev20220922%2Bcu116.zip"],
)

####################################################################################
Expand Down