Skip to content
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.

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

cherry-pick: Python Runtime Windows Builds on TRT 10 (#2764) #2776

Merged
merged 4 commits into from
May 1, 2024

Conversation

gs-olive
Copy link
Collaborator

Description

Type of change

Please delete options that are not relevant and/or add your own.

  • Cherry-pick

Checklist:

  • [ x ] My code follows the style guidelines of this project (You can use the linters)
  • [ x ] I have performed a self-review of my own code
  • [ x ] I have commented my code, particularly in hard-to-understand areas and hacks
  • [ x ] I have made corresponding changes to the documentation
  • [ x ] I have added tests to verify my fix or my feature
  • [ x ] New and existing unit tests pass locally with my changes
  • [ x ] I have added the relevant labels to my PR in so that relevant reviewers are notified

@gs-olive gs-olive self-assigned this Apr 25, 2024
@github-actions github-actions bot added component: tests Issues re: Tests component: lowering Issues re: The lowering / preprocessing passes component: conversion Issues re: Conversion stage component: core Issues re: The core compiler component: converters Issues re: Specific op converters component: build system Issues re: Build system component: api [Python] Issues re: Python API component: api [C++] Issues re: C++ API component: runtime labels Apr 25, 2024
@github-actions github-actions bot requested a review from narendasan April 25, 2024 17:42
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some changes that do not conform to C++ style guidelines:

diff --git a/home/runner/work/TensorRT/TensorRT/core/conversion/converters/impl/expand.cpp b/tmp/changes.txt
index 49f1815..0e68768 100644
--- a/home/runner/work/TensorRT/TensorRT/core/conversion/converters/impl/expand.cpp
+++ b/tmp/changes.txt
@@ -44,7 +44,8 @@ bool add_expand(ConversionCtx* ctx, const torch::jit::Node* n, nvinfer1::ITensor
      if (size != targetSize) {
        if (size != 1) {
          TORCHTRT_THROW_ERROR(
-              "The expanded size of tensor (" << targetSize << ")" << " must match the existing size (" << size << ")"
+              "The expanded size of tensor (" << targetSize << ")"
+                                              << " must match the existing size (" << size << ")"
                                              << " at dimension " << i);
        }
      }
@@ -131,7 +132,8 @@ bool add_expand_dynamic(
        // if size == -1, we can't validate the expansion before setBindingDimensions.
        if (!(size == -1 || size == 1)) {
          TORCHTRT_THROW_ERROR(
-              "The expanded size of tensor (" << targetSize << ")" << " must match the existing size (" << size << ")"
+              "The expanded size of tensor (" << targetSize << ")"
+                                              << " must match the existing size (" << size << ")"
                                              << " at dimension " << i);
        }
      }
diff --git a/home/runner/work/TensorRT/TensorRT/core/conversion/evaluators/eval_util.cpp b/tmp/changes.txt
index 2c6567a..9b61390 100644
--- a/home/runner/work/TensorRT/TensorRT/core/conversion/evaluators/eval_util.cpp
+++ b/tmp/changes.txt
@@ -165,7 +165,8 @@ c10::optional<torch::jit::IValue> toIValue(const torch::jit::Value* v) {
void checkListInputType(const c10::TypePtr& elem_type, bool empty_list) {
  if (!elem_type->isSubtypeOf(c10::NumberType::get()) && elem_type != c10::BoolType::get()) {
    std::stringstream error;
-    error << "Input must be of ints, floats, or bools, " << "got " << elem_type->repr_str();
+    error << "Input must be of ints, floats, or bools, "
+          << "got " << elem_type->repr_str();
    // special case empty list torch.tensor([])
    if (elem_type->isSubtypeOf(c10::TensorType::get())) {
      if (empty_list) {
diff --git a/home/runner/work/TensorRT/TensorRT/core/plugins/impl/normalize_plugin.h b/tmp/changes.txt
index 7e564b5..5d51a68 100644
--- a/home/runner/work/TensorRT/TensorRT/core/plugins/impl/normalize_plugin.h
+++ b/tmp/changes.txt
@@ -41,7 +41,7 @@ class NormalizePlugin : public nvinfer1::IPluginV2DynamicExt {

  const char* getPluginNamespace() const noexcept override;

-  void setPluginNamespace(const char* pluginNamespace) noexcept override {};
+  void setPluginNamespace(const char* pluginNamespace) noexcept override{};

  nvinfer1::IPluginV2DynamicExt* clone() const noexcept override;

@@ -101,7 +101,7 @@ class NormalizePluginCreator : public nvinfer1::IPluginCreator {

  const char* getPluginNamespace() const noexcept override;

-  void setPluginNamespace(const char* libNamespace) noexcept override {};
+  void setPluginNamespace(const char* libNamespace) noexcept override{};

  const char* getPluginName() const noexcept override;

diff --git a/home/runner/work/TensorRT/TensorRT/core/plugins/impl/interpolate_plugin.h b/tmp/changes.txt
index 661cee2..ce009af 100644
--- a/home/runner/work/TensorRT/TensorRT/core/plugins/impl/interpolate_plugin.h
+++ b/tmp/changes.txt
@@ -57,7 +57,7 @@ class InterpolatePlugin : public nvinfer1::IPluginV2DynamicExt {

  const char* getPluginNamespace() const noexcept override;

-  void setPluginNamespace(const char* pluginNamespace) noexcept override {};
+  void setPluginNamespace(const char* pluginNamespace) noexcept override{};

  nvinfer1::IPluginV2DynamicExt* clone() const noexcept override;

@@ -117,7 +117,7 @@ class InterpolatePluginCreator : public nvinfer1::IPluginCreator {

  const char* getPluginNamespace() const noexcept override;

-  void setPluginNamespace(const char* libNamespace) noexcept override {};
+  void setPluginNamespace(const char* libNamespace) noexcept override{};

  const char* getPluginName() const noexcept override;

ERROR: Some files do not conform to style guidelines

@gs-olive gs-olive force-pushed the windows_builds_cherry_pick branch from c01fc84 to bd90a99 Compare April 25, 2024 22:31
@gs-olive gs-olive changed the base branch from trt_10_cherry_pick to main April 25, 2024 22:31
@gs-olive gs-olive force-pushed the windows_builds_cherry_pick branch 2 times, most recently from 409795e to 6353d02 Compare April 25, 2024 22:37
@gs-olive gs-olive force-pushed the windows_builds_cherry_pick branch from 6e5f83b to a2d1836 Compare April 26, 2024 21:50
@gs-olive gs-olive requested review from github-actions[bot] and removed request for github-actions[bot] April 26, 2024 21:50
@gs-olive gs-olive force-pushed the windows_builds_cherry_pick branch from a2d1836 to 81d7c74 Compare April 29, 2024 17:13
@gs-olive gs-olive force-pushed the windows_builds_cherry_pick branch from 81d7c74 to 90d0226 Compare April 30, 2024 22:09
@narendasan narendasan merged commit ff8c872 into main May 1, 2024
36 checks passed
@narendasan narendasan deleted the windows_builds_cherry_pick branch May 1, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla signed component: api [C++] Issues re: C++ API component: api [Python] Issues re: Python API component: build system Issues re: Build system component: conversion Issues re: Conversion stage component: converters Issues re: Specific op converters component: core Issues re: The core compiler component: lowering Issues re: The lowering / preprocessing passes component: runtime component: tests Issues re: Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants