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.

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

chore: bump deps #60

Merged
merged 1 commit into from
Sep 7, 2024
Merged

chore: bump deps #60

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
29 changes: 23 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,12 @@
package.version = "0.4.0"
members = ["crates/*"]
resolver = "2"

[workspace.dependencies]
cudarc = "0.9.14"
ndarray = "0.16.1"
ndarray-rand = "0.15.0"
safetensors = "0.4.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0.49"
96 changes: 29 additions & 67 deletions bench/netsaur_cpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,34 @@ import {

await setupBackend(CPU);

Deno.bench(
{ name: "xor 10000 epochs", permissions: "inherit" },
async () => {
const net = new Sequential({
size: [4, 2],
silent: true,
layers: [
DenseLayer({ size: [3] }),
SigmoidLayer(),
DenseLayer({ size: [1] }),
SigmoidLayer(),
],
cost: Cost.MSE,
});

net.train(
[
{
inputs: tensor2D([
[0, 0],
[1, 0],
[0, 1],
[1, 1],
]),
outputs: tensor2D([[0], [1], [1], [0]]),
},
],
10000,
);

console.log((await net.predict(tensor1D([0, 0]))).data);
console.log((await net.predict(tensor1D([1, 0]))).data);
console.log((await net.predict(tensor1D([0, 1]))).data);
console.log((await net.predict(tensor1D([1, 1]))).data);
},
const net = new Sequential({
size: [4, 2],
silent: true,
layers: [
DenseLayer({ size: [3] }),
SigmoidLayer(),
DenseLayer({ size: [1] }),
SigmoidLayer(),
],
cost: Cost.MSE,
});

net.train(
[
{
inputs: tensor2D([
[0, 0],
[1, 0],
[0, 1],
[1, 1],
]),
outputs: tensor2D([[0], [1], [1], [0]]),
},
],
10000,
);

// const net = new NeuralNetwork({
// size: [4, 2],
// silent: true,
// layers: [
// DenseLayer({ size: [3], activation: Activation.Sigmoid }),
// DenseLayer({ size: [1], activation: Activation.Sigmoid }),
// ],
// cost: Cost.MSE,
// });

// const time = performance.now();

// net.train(
// [
// {
// inputs: tensor2D([
// [0, 0],
// [1, 0],
// [0, 1],
// [1, 1],
// ]),
// outputs: tensor2D([[0], [1], [1], [0]]),
// },
// ],
// 10000,
// )

// console.log(`training time: ${performance.now() - time}ms`);
// console.log((await net.predict(tensor2D([[0, 0]]))).data);
// console.log((await net.predict(tensor2D([[1, 0]]))).data);
// console.log((await net.predict(tensor2D([[0, 1]]))).data);
// console.log((await net.predict(tensor2D([[1, 1]]))).data);
console.log((await net.predict(tensor1D([0, 0]))).data);
console.log((await net.predict(tensor1D([1, 0]))).data);
console.log((await net.predict(tensor1D([0, 1]))).data);
console.log((await net.predict(tensor1D([1, 1]))).data);
96 changes: 29 additions & 67 deletions bench/netsaur_wasm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,34 @@ import {

await setupBackend(WASM);

Deno.bench(
{ name: "xor 10000 epochs", permissions: "inherit" },
async () => {
const net = new Sequential({
size: [4, 2],
silent: true,
layers: [
DenseLayer({ size: [3] }),
SigmoidLayer(),
DenseLayer({ size: [1] }),
SigmoidLayer(),
],
cost: Cost.MSE,
});

net.train(
[
{
inputs: tensor2D([
[0, 0],
[1, 0],
[0, 1],
[1, 1],
]),
outputs: tensor2D([[0], [1], [1], [0]]),
},
],
10000,
);

console.log((await net.predict(tensor1D([0, 0]))).data);
console.log((await net.predict(tensor1D([1, 0]))).data);
console.log((await net.predict(tensor1D([0, 1]))).data);
console.log((await net.predict(tensor1D([1, 1]))).data);
},
const net = new Sequential({
size: [4, 2],
silent: true,
layers: [
DenseLayer({ size: [3] }),
SigmoidLayer(),
DenseLayer({ size: [1] }),
SigmoidLayer(),
],
cost: Cost.MSE,
});

net.train(
[
{
inputs: tensor2D([
[0, 0],
[1, 0],
[0, 1],
[1, 1],
]),
outputs: tensor2D([[0], [1], [1], [0]]),
},
],
10000,
);

// const net = new NeuralNetwork({
// size: [4, 2],
// silent: true,
// layers: [
// DenseLayer({ size: [3], activation: Activation.Sigmoid }),
// DenseLayer({ size: [1], activation: Activation.Sigmoid }),
// ],
// cost: Cost.MSE,
// });

// const time = performance.now();

// net.train(
// [
// {
// inputs: tensor2D([
// [0, 0],
// [1, 0],
// [0, 1],
// [1, 1],
// ]),
// outputs: tensor2D([[0], [1], [1], [0]]),
// },
// ],
// 10000,
// )

// console.log(`training time: ${performance.now() - time}ms`);
// console.log((await net.predict(tensor2D([[0, 0]]))).data);
// console.log((await net.predict(tensor2D([[1, 0]]))).data);
// console.log((await net.predict(tensor2D([[0, 1]]))).data);
// console.log((await net.predict(tensor2D([[1, 1]]))).data);
console.log((await net.predict(tensor1D([0, 0]))).data);
console.log((await net.predict(tensor1D([1, 0]))).data);
console.log((await net.predict(tensor1D([0, 1]))).data);
console.log((await net.predict(tensor1D([1, 1]))).data);
27 changes: 0 additions & 27 deletions bench/node/brain_cpu.js
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions bench/node/brain_gpu.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions bench/node/package.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions bench/node/tfjs_cpu.js
View file
Open in desktop

This file was deleted.

15 changes: 7 additions & 8 deletions crates/core-gpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ version = { workspace = true }
[lib]
crate-type = ["cdylib"]


[dependencies]
ndarray = "0.15.6"
ndarray-rand = "0.14.0"
serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0"
safetensors = "0.4.0"
cudarc = "0.9.14"
thiserror = "1.0.49"
cudarc = { workspace = true }
ndarray = { workspace = true }
ndarray-rand = { workspace = true }
safetensors = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
Loading
Loading