Merge branch 'master' of https://github.com/ECP-CANDLE/Benchmarks

ECP-CANDLE · Apr 24, 2017 · ea14ed8 · ea14ed8
2 parents eafe78d + f6ffe0b
commit ea14ed8
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 27 deletions.
diff --git a/Pilot2/P2B1/p2b1.py b/Pilot2/P2B1/p2b1.py
@@ -138,7 +138,7 @@ def dense_auto(weights_path=None,input_shape=(784,),hidden_layers=None,nonlinear
     else:
         decoded=Dense(input_shape[0],kernel_regularizer=l2(l2_reg))(input_img)
 
-    model=Model(input=input_img,output=decoded)
+    model=Model(outputs=decoded,inputs=input_img)
 
     if weights_path:
         print('Loading Model')

diff --git a/Pilot2/P2B2/p2b2.py b/Pilot2/P2B2/p2b2.py
@@ -158,7 +158,7 @@ def simple_test_rnn(T=1,D=1):
     encoder=TimeDistributed(Dense(20,activation='relu'))(input_img)
     rnn=LSTM(10,activation='elu',return_sequences=True, stateful=False)(encoder)
     decoder=TimeDistributed(Dense(20,activation='relu'))(rnn)
-    model=Model(input=input_img,output=decoder)
+    model=Model(outputs=decoder,inputs=input_img)
     return model
 
 
@@ -184,7 +184,7 @@ def dense_auto(weights_path=None,input_shape=(784,),hidden_layers=None,nonlinear
     else:
         decoded=Dense(input_shape[0])(input_img)
 
-    model=Model(input=input_img,output=decoded)
+    model=Model(outputs=decoded,inputs=input_img)
 
     if weights_path:
         print('Loading Model')
@@ -221,7 +221,7 @@ def rnn_dense_auto(weights_path=None,T=1,D=1,nonlinearity='relu',hidden_layers=N
     else:
         decoded=TimeDistributed(Dense(D))(input_img)
 
-    model=Model(input=input_img,output=decoded)
+    model=Model(outputs=decoded,inputs=input_img)
 
     if weights_path:
         print('Loading Model')

diff --git a/README.setup.linux b/README.setup.linux
@@ -16,29 +16,18 @@ export PATH=$HOME/anaconda2/bin:$PATH
 # Install additonal modules not shipped with Anaconda
 conda install -c conda-forge tensorflow
 conda install -c anaconda hdf5=1.8.17
-pip install git+git://github.com/Theano/Theano.git
-pip install git+git://github.com/fchollet/keras.git
+conda install -c anaconda theano
+conda install -c conda-forge keras=2
 
+# Install additional modules for Pilot2 benchmarks
+conda install -c conda-forge opencv
+conda install -c conda-forge tqdm
+conda update -c conda-forge numpy
 
-# Set up special environment for Pilot2 benchmars using keras version 1
-# This will go away when Pilot2 benchmarks are upgraded to keras version 2
-conda create --name keras1
-source activate
-conda install opencv
-conda install -c conda-forge keras=1
-conda install -c conda-forge tensorflow
-conda install matplotlib
-conda install PIL
-conda install tqdm
-conda install scikit-learn
-conda install mkl-service
-
-source deactivate keras1
-
-# Download the source files for the tutorial
+# Download the source files for the benchmarks
 git clone https://github.com/ECP-Candle/benchmarks
 
-# Run the Pilot1  benchmark
+# Run the Pilot1 benchmark
 pushd benchmarks/Pilot1/P1B1/
 python p1b1_baseline_keras2.py 
 popd
@@ -52,8 +41,6 @@ python p1b3_baseline_keras2.py
 popd
 
 # Run the Pilot2 benchmarks
-source activate keras1
-
 pushd benchmarks/Pilot2/P2B1/
 python p2b1_baseline_keras1.py
 popd
@@ -62,8 +49,6 @@ pushd benchmarks/Pilot2/P2B2/
 python p2b2_baseline_keras1.py
 popd
 
-source deactivate keras1
-
 # Run the Pilot3 benchmarks
 pushd benchmarks/Pilot3/P3B1/
 python p3b1_baseline_keras2.py

diff --git a/README.setup.mac b/README.setup.mac
@@ -0,0 +1,60 @@
+# Set up your python environment
+# ------------------------------
+
+# Download the Anaconda installer
+curl -o Anaconda2-4.3.1-MacOSX-x86_64.sh https://repo.continuum.io/archive/Anaconda2-4.3.1-MacOSX-x86_64.sh
+
+# Make the installer executable
+chmod u+x ./Anaconda2-4.3.1-MacOSX-x86_64.sh
+
+# Run the installer, accepting the defaults.
+./Anaconda2-4.3.1-MacOSX-x86_64.sh
+
+# Add anaconda2/bin to your path (assumes default install location)
+export PATH=$HOME/anaconda2/bin:$PATH
+
+# Install additonal modules not shipped with Anaconda
+conda install -c conda-forge tensorflow
+conda install -c anaconda hdf5=1.8.17
+conda install -c anaconda theano
+conda install -c conda-forge keras=2
+
+# Install additional modules for Pilot2 benchmarks
+conda install -c conda-forge opencv
+conda install -c conda-forge tqdm
+conda update -c conda-forge numpy
+
+# Download the source files for the benchmarks
+git clone https://github.com/ECP-Candle/benchmarks
+
+# Run the Pilot1 benchmarks
+pushd benchmarks/Pilot1/P1B1/
+python p1b1_baseline_keras2.py 
+popd
+
+pushd benchmarks/Pilot1/P1B2/
+python p1b2_baseline_keras2.py
+popd
+
+pushd benchmarks/Pilot1/P1B3/
+python p1b3_baseline_keras2.py
+popd
+
+# Run the Pilot2 benchmarks
+pushd benchmarks/Pilot2/P2B1/
+python p2b1_baseline_keras1.py
+popd
+
+pushd benchmarks/Pilot2/P2B2/
+python p2b2_baseline_keras1.py
+popd
+
+# Run the Pilot3 benchmarks
+pushd benchmarks/Pilot3/P3B1/
+python p3b1_baseline_keras2.py
+popd
+
+pushd benchmarks/Pilot3/P3B2/
+python p3b2_baseline_keras2.py
+popd 
+