diff options
author | Rico Sennrich <rico.sennrich@gmx.ch> | 2014-08-28 20:19:24 +0400 |
---|---|---|
committer | Rico Sennrich <rico.sennrich@gmx.ch> | 2014-08-28 20:19:24 +0400 |
commit | de2fdd92fd7a5f34200411b1447e914d4b0462f8 (patch) | |
tree | ebff0a4ac3458020592c2c5eaa884b79e177ad5c | |
parent | 52861f20f427ffa403966583ab2b637fd264228c (diff) | |
parent | e2b0468edd885530914cc5f484e1b7e63377c645 (diff) |
Merge pull request #1 from hieuhoang/master
osx compile
-rw-r--r-- | src/Makefile | 6 | ||||
-rw-r--r-- | src/trainNeuralNetwork.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 702b3ff..abc5335 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,19 +19,19 @@ OS:=$(shell uname -s) ### Required libraries. You must install these prior to building. # Set this to the root directory of Boost (should have a subdirectory named boost): -BOOST=/usr +BOOST=/Users/hieu/workspace/boost/boost_1_54_0 #BOOST=/usr #BOOST=/opt/local # Where to find Boost header files BOOST_INC=$(BOOST)/include # Set this to the root directory of Eigen (should have a subdirectory named Eigen): -EIGEN=/usr/include/eigen3 +EIGEN=/Users/hieu/workspace/eigen ### Optional libraries. # To disable multithreading, comment out the line below: -OMP=1 +#OMP=1 # To use the MKL library, uncomment the line below and set it to the MKL root: #MKL=/usr/usc/intel/12.1.1/mkl diff --git a/src/trainNeuralNetwork.cpp b/src/trainNeuralNetwork.cpp index f45bc71..50a6d64 100644 --- a/src/trainNeuralNetwork.cpp +++ b/src/trainNeuralNetwork.cpp @@ -256,7 +256,7 @@ int main(int argc, char** argv) // Randomly shuffle training data to improve learning for (data_size_t i=training_data_size-1; i>0; i--) { - data_size_t j = uniform_int_distribution<data_size_t>(0, i-1)(rng); + data_size_t j = boost::random::uniform_int_distribution<data_size_t>(0, i-1)(rng); training_data.col(i).swap(training_data.col(j)); } |