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

Replace depreciated Flux.ADAM with Flux.Adam #203

Merged
merged 2 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Adapt = "3"
CUDA = "3.3"
ChainRulesCore = "1"
DataStructures = "0.18"
Flux = "0.13"
Flux = "0.13.4"
Functors = "0.2, 0.3"
Graphs = "1.4"
KrylovKit = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ model = GNNChain(GCNConv(16 => 64),
Dense(64, 1)) |> device

ps = Flux.params(model)
opt = ADAM(1f-4)
opt = Adam(1f-4)
```

### Training
Expand Down
4 changes: 2 additions & 2 deletions docs/src/tutorials/gnn_intro_pluto.jl
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Since everything in our model is differentiable and parameterized, we can add so
Here, we make use of a semi-supervised or transductive learning procedure: We simply train against one node per class, but are allowed to make use of the complete input graph data.

Training our model is very similar to any other Flux model.
In addition to defining our network architecture, we define a loss criterion (here, `logitcrossentropy` and initialize a stochastic gradient optimizer (here, `ADAM`).
In addition to defining our network architecture, we define a loss criterion (here, `logitcrossentropy` and initialize a stochastic gradient optimizer (here, `Adam`).
After that, we perform multiple rounds of optimization, where each round consists of a forward and backward pass to compute the gradients of our model parameters w.r.t. to the loss derived from the forward pass.
If you are not new to Flux, this scheme should appear familar to you.

Expand All @@ -285,7 +285,7 @@ Let us now start training and see how our node embeddings evolve over time (best
begin
model = GCN(num_features, num_classes)
ps = Flux.params(model)
opt = ADAM(1e-2)
opt = Adam(1e-2)
epochs = 2000

emb = h
Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/graph_classification_pluto.jl
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function train!(model; epochs=200, η=1e-2, infotime=10)
device = Flux.cpu
model = model |> device
ps = Flux.params(model)
opt = ADAM(1e-3)
opt = Adam(1e-3)


function report(epoch)
Expand Down
2 changes: 1 addition & 1 deletion examples/graph_classification_tudataset.jl
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function train(; kws...)
Dense(nhidden, 1)) |> device

ps = Flux.params(model)
opt = ADAM(args.η)
opt = Adam(args.η)

# LOGGING FUNCTION

Expand Down
2 changes: 1 addition & 1 deletion examples/link_prediction_pubmed.jl
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function train(; kws...)
pred = DotPredictor()

ps = Flux.params(model)
opt = ADAM(args.η)
opt = Adam(args.η)

### LOSS FUNCTION ############

Expand Down
2 changes: 1 addition & 1 deletion examples/neural_ode_cora.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ model = GNNChain(GCNConv(nin => nhidden, relu),
ps = Flux.params(model);

# ## Optimizer
opt = ADAM(0.01)
opt = Adam(0.01)


function eval_loss_accuracy(X, y, mask)
Expand Down
2 changes: 1 addition & 1 deletion examples/node_classification_cora.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function train(; kws...)
Dense(nhidden, nout)) |> device

ps = Flux.params(model)
opt = ADAM(args.η)
opt = Adam(args.η)

display(g)

Expand Down
2 changes: 1 addition & 1 deletion perf/neural_ode_mnist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ model = Chain(Flux.flatten,
ps = Flux.params(model);

# ## Optimizer
opt = ADAM(0.01)
opt = Adam(0.01)

function eval_loss_accuracy(X, y)
ŷ = model(X)
Expand Down
2 changes: 1 addition & 1 deletion perf/node_classification_cora_geometricflux.jl
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function train(; kws...)
Dense(nhidden, nout)) |> device

ps = Flux.params(model)
opt = ADAM(args.η)
opt = Adam(args.η)

@info g

Expand Down
2 changes: 1 addition & 1 deletion test/examples/node_classification_cora.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function train(Layer; verbose=false, kws...)
Dense(nhidden, nout)) |> device

ps = Flux.params(model)
opt = ADAM(args.η)
opt = Adam(args.η)


## TRAINING
Expand Down