Skip to content

Whole archive libs with registerers #19

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 1 commit into from
Mar 20, 2020
Merged

Whole archive libs with registerers #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion core/conversion/converters/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,29 @@ cc_library(
name = "converters",
hdrs = [
"converters.h",
] + glob(["impl/**/*.cpp"]),
],
srcs = [
"NodeConverterRegistry.cpp",
"Weights.cpp",
"Arg.cpp",
"impl/activation.cpp",
"impl/batch_norm.cpp",
"impl/constant.cpp",
"impl/conv_deconv.cpp",
"impl/element_wise.cpp",
"impl/linear.cpp",
"impl/pooling.cpp",
"impl/scale.cpp",
"impl/softmax.cpp",
"impl/unary.cpp",
],
deps = [
"@libtorch//:libtorch",
"@tensorrt//:nvinfer",
"//core/util:prelude",
"//core/conversion/conversionctx"
],
alwayslink = True,
)

load("@rules_pkg//:pkg.bzl", "pkg_tar")
Expand Down
13 changes: 0 additions & 13 deletions core/conversion/converters/NodeConverterRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,3 @@ RegisterNodeConversionPatterns& RegisterNodeConversionPatterns::RegisterNodeConv
} // namespace conversion
} // namespace core
} // namespace trtorch

// Hack to keep the symbols live, need to get rid of this
#include "core/conversion/converters/impl/activation.cpp"
#include "core/conversion/converters/impl/batch_norm.cpp"
#include "core/conversion/converters/impl/constant.cpp"
#include "core/conversion/converters/impl/conv_deconv.cpp"
#include "core/conversion/converters/impl/element_wise.cpp"
#include "core/conversion/converters/impl/linear.cpp"
#include "core/conversion/converters/impl/pooling.cpp"
#include "core/conversion/converters/impl/scale.cpp"
#include "core/conversion/converters/impl/softmax.cpp"
#include "core/conversion/converters/impl/unary.cpp"

1 change: 0 additions & 1 deletion core/conversion/converters/impl/activation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/batch_norm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/constant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/conv_deconv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/element_wise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/linear.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/pooling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/scale.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/softmax.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
1 change: 0 additions & 1 deletion core/conversion/converters/impl/unary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "core/util/prelude.h"
#include "core/conversion/converters/converters.h"

Expand Down
5 changes: 3 additions & 2 deletions core/conversion/evaluators/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ cc_library(
name = "evaluators",
hdrs = [
"evaluators.h",
"prim.cpp"
],
srcs = [
"NodeEvaluatorRegistry.cpp",
"prim.cpp",
],
deps = [
"@libtorch//:libtorch",
"//core/util:prelude",
]
],
alwayslink = True,
)

load("@rules_pkg//:pkg.bzl", "pkg_tar")
Expand Down
3 changes: 0 additions & 3 deletions core/conversion/evaluators/NodeEvaluatorRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,3 @@ RegisterNodeEvaluators& RegisterNodeEvaluators::RegisterNodeEvaluators::operator
} // namespace conversion
} // namespace core
} // namespace trtorch

// Hack, remove when symbols don't get left out
#include "core/conversion/evaluators/prim.cpp"
1 change: 0 additions & 1 deletion core/conversion/evaluators/prim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once
#include "torch/csrc/jit/ir.h"
#include "torch/csrc/jit/constants.h"
#include "ATen/core/functional.h"
Expand Down