Merge remote-tracking branch 'upstream/master' into DmlDev

This commit is contained in:
ISS Build Account 2020-08-15 12:28:10 +00:00
commit 19494aba7a
5 changed files with 10 additions and 8 deletions

View file

@ -12,7 +12,8 @@ ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime
ARG ONNXRUNTIME_BRANCH=master
RUN apt-get update &&\
apt-get install -y sudo git bash
apt-get install -y sudo git bash unattended-upgrades
RUN unattended-upgrade
WORKDIR /code
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:/opt/miniconda/bin:${PATH}

View file

@ -12,7 +12,8 @@ ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime
ARG ONNXRUNTIME_BRANCH=master
RUN apt-get update &&\
apt-get install -y sudo git bash
apt-get install -y sudo git bash unattended-upgrades
RUN unattended-upgrade
WORKDIR /code
ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.14.3-Linux-x86_64/bin:/opt/miniconda/bin:${PATH}

View file

@ -37,7 +37,7 @@ typedef std::vector<NodeDef> GradientDef;
class GradientBuilderBase {
public:
GradientBuilderBase(const GradientGraphConfiguration& gradient_graph_config,
const Graph* graph,
Graph* graph,
const Node* node,
const std::unordered_set<std::string>& gradient_inputs,
const std::unordered_set<std::string>& gradient_outputs,
@ -217,13 +217,13 @@ class GradientBuilderBase {
if (!name.empty()) {
unique_prefix << name << "_Grad/";
} else {
unique_prefix << node_->OpType() << "_" << node_->Index() << "_Grad/";
unique_prefix << graph_->GenerateNodeName(node_->OpType()) << "_Grad/";
}
return unique_prefix.str();
}
const GradientGraphConfiguration& gradient_graph_config_;
const Graph* graph_;
Graph* graph_;
const Node* node_;
std::string unique_node_prefix_;

View file

@ -9,7 +9,7 @@ namespace onnxruntime {
namespace training {
GradientDef GetGradientForOp(const GradientGraphConfiguration& gradient_graph_config,
const Graph* graph,
Graph* graph,
const Node* node,
const std::unordered_set<std::string>& output_args_need_grad,
const std::unordered_set<std::string>& input_args_need_grad,

View file

@ -13,7 +13,7 @@ namespace training {
typedef GenericRegistry<GradientBuilderBase,
const GradientGraphConfiguration&,
const Graph*&, // graph
Graph*&, // graph
const Node*&, // node
const std::unordered_set<std::string>&, // gradient_inputs
const std::unordered_set<std::string>&, // gradient_outputs
@ -35,7 +35,7 @@ class GradientBuilderRegistry : public GradientRegistryType {
};
GradientDef GetGradientForOp(const GradientGraphConfiguration& gradient_graph_config,
const Graph* graph,
Graph* graph,
const Node* node,
const std::unordered_set<std::string>& output_args_need_grad,
const std::unordered_set<std::string>& input_args_need_grad,