FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Initialization imprvements by rnett · Pull Request #178 · tensorflow/java · GitHub

/ java Public

Initialization imprvements #178

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
karllessard merged 7 commits into from
Jan 7, 2021
Conversation 18 Commits 7 Checks 0 Files changed
Merged

Initialization imprvements #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e449b7a
No-op on initAdd in eager mode
rnett Dec 29, 2020
cbfe6eb
runInit() method in session
rnett Dec 29, 2020
7206741
add doInitialization() to Runner
rnett Dec 29, 2020
304dc00
fix javadoc
rnett Dec 30, 2020
8dfc449
assume only graph or eager environments
rnett Jan 1, 2021
b83b1bb
Remove doInit(), update javadocs
rnett Jan 3, 2021
a3fa53b
small fixes
rnett Jan 7, 2021
File filter

Filter by extension

Filter by extension .java  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
      • Ops.java
      • Session.java
        • Init.java
9 changes: 4 additions & 5 deletions tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,10 @@ public final class Ops {

public final SignalOps signal;

public final QuantizationOps quantization;

public final TrainOps train;

public final QuantizationOps quantization;

private final Scope scope;

private Ops(Scope scope) {
Expand All @@ -372,8 +372,8 @@ private Ops(Scope scope) {
math = new MathOps(this);
audio = new AudioOps(this);
signal = new SignalOps(this);
quantization = new QuantizationOps(this);
train = new TrainOps(this);
quantization = new QuantizationOps(this);
}

/**
Expand Down Expand Up @@ -2755,11 +2755,10 @@ public Init init() {
*
* <p>Registered initializers are then grouped as a single unit of computation by adding
* and executing an {@link org.tensorflow.op.core.Init#create(Scope) init} operation from a graph
* session.
* session. This is a no-op if executed in an eager session.
*
* @param scope
* @param initializer
* @throws IllegalArgumentException if the execution environment in scope is not a graph
* @see org.tensorflow.op.core.Init#create(Scope) init
*/
public void initAdd(Op initializer) {
Expand Down
13 changes: 13 additions & 0 deletions tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,19 @@ public void run(Op op) {
runner().addTarget(op.op()).run();
}


/**
* Execute the graph's initializers.
*
* <p>This method is equivalent to {@code session.run(Ops.create(session.graph).init())}.
*
*/
public void runInit(){
Runner runner = runner();
graph.initializers().forEach(runner::addTarget);
runner.run();
}

/**
* Saves the actual state of the variables of this session's graph.
*
Expand Down
10 changes: 4 additions & 6 deletions tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Init.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,19 @@ public static Init create(Scope scope) {
*
* <p>Registered initializers are then grouped as a single unit of computation by adding
* and executing an {@link org.tensorflow.op.core.Init#create(Scope) init} operation from a graph
* session.
* session. This is a no-op if executed in an eager session.
*
* @param scope
* @param initializer
* @throws IllegalArgumentException if the execution environment in scope is not a graph
* @see org.tensorflow.op.core.Init#create(Scope) init
*/
@Endpoint(name = "initAdd")
public static void add(Scope scope, Op initializer) {
ExecutionEnvironment exEnv = scope.env();
if (!(exEnv instanceof Graph)) {
throw new IllegalArgumentException("initAdd is only supported on Graph sessions.");

if (exEnv.isGraph()) {
((Graph) exEnv).addInitializer(initializer);
}
Graph graph = (Graph) exEnv;
graph.addInitializer(initializer);
}

private Init(Operation operation) {
Expand Down
Back | FazBrowse Home | New Git URL