commit 9b6a68027feeaa339fe40a1cfa1b96819f11e15c
parent 29ff5487759d7371b98c2d713f2a1029319fd680
Author: David Freifeld <freifeld.david@gmail.com>
Date: Mon, 22 Jun 2020 14:21:25 -0700
Fixes to readme and execution of demos
Diffstat:
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/bpnn.cpp b/bpnn.cpp
@@ -298,8 +298,7 @@ void demo(int total_epochs)
net.batches=1;
epochs++;
- }
-
+ }
// float newvals[4] = {0};
// FILE* new = fopen("./predict.txt", "r");
// fscanf(new, "%f, %f, %f, %f", &newvals[0], &newvals[1], &newvals[2], &newvals[3]);
diff --git a/mr_bpnn_2.cpp b/mr_bpnn_2.cpp
@@ -107,10 +107,7 @@ int main(int argc, char** argv)
{
auto prog_begin = std::chrono::high_resolution_clock::now();
prep_file(argv[2], "./shuffled");
- //begin("./shuffled", map, reduce, translate, strtol(argv[1], NULL, 10), 1, argv[3], strtol(argv[4], NULL, 10));
- demo(50);
+ begin("./shuffled", map, reduce, translate, strtol(argv[1], NULL, 10), 1, argv[3], strtol(argv[4], NULL, 10));
auto prog_end = std::chrono::high_resolution_clock::now();
std::cout << "Time: " << std::chrono::duration_cast<std::chrono::nanoseconds>(prog_end-prog_begin).count() / pow(10,9) << "\n";
-
- // demo(50);
}
diff --git a/readme.md b/readme.md
@@ -11,10 +11,10 @@ Coming soon: A detailed rundown of the speed of "ML in Parallel" vs popular mach
As of now, a demo of a neural network with feedforward and backpropagation is available (as well as a Keras demo for reference). **Note: You'll need to add the `mapreduce` archive file to the project directory, which can be found [here](https://github.com/richardfeynmanrocks/mapreduce).**
### Sequential
-Build and run the sequential demo with the following commands:
+See the sequential demo by including the header file in you project, calling `demo`, and building/running with the following commands:
```
-g++ mr_bpnn_2.cpp bpnn.cpp mapreduce.a -O2 -o bpnn -std=c++11 -w
-./bpnn NUM_PARALLEL_NETWORKS PATH_TO_DATA YOUR_PUBLIC_IP 1
+g++ YOUR_FILE bpnn.cpp mapreduce.a -O2 -o bpnn -std=c++11 -w
+./bpnn
```
### Parallel
