From 4a89b4735640e3c2aa804163bc7b199f1d06a6be Mon Sep 17 00:00:00 2001
From: Stefan Wunsch <stefan.wunsch@student.kit.edu>
Date: Wed, 26 Jul 2017 13:01:52 +0200
Subject: [PATCH] [PyMVA] Make PyKeras tests compatible with Keras v1.x and
 v2.x API

---
 tmva/pymva/test/testPyKerasClassification.C | 5 ++---
 tmva/pymva/test/testPyKerasMulticlass.C     | 5 ++---
 tmva/pymva/test/testPyKerasRegression.C     | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tmva/pymva/test/testPyKerasClassification.C b/tmva/pymva/test/testPyKerasClassification.C
index 8e71e29eafe..67b2a183935 100644
--- a/tmva/pymva/test/testPyKerasClassification.C
+++ b/tmva/pymva/test/testPyKerasClassification.C
@@ -12,12 +12,11 @@
 TString pythonSrc = "\
 from keras.models import Sequential\n\
 from keras.layers.core import Dense, Activation\n\
-from keras import initializations\n\
 from keras.optimizers import SGD\n\
 \n\
 model = Sequential()\n\
-model.add(Dense(64, init=\"normal\", activation=\"relu\", input_dim=4))\n\
-model.add(Dense(2, init=\"normal\", activation=\"softmax\"))\n\
+model.add(Dense(64, activation=\"relu\", input_dim=4))\n\
+model.add(Dense(2, activation=\"softmax\"))\n\
 model.compile(loss=\"categorical_crossentropy\", optimizer=SGD(lr=0.01), metrics=[\"accuracy\",])\n\
 model.save(\"kerasModelClassification.h5\")\n";
 
diff --git a/tmva/pymva/test/testPyKerasMulticlass.C b/tmva/pymva/test/testPyKerasMulticlass.C
index ddf88bd16ab..b62272732b7 100644
--- a/tmva/pymva/test/testPyKerasMulticlass.C
+++ b/tmva/pymva/test/testPyKerasMulticlass.C
@@ -13,12 +13,11 @@
 TString pythonSrc = "\
 from keras.models import Sequential\n\
 from keras.layers.core import Dense, Activation\n\
-from keras import initializations\n\
 from keras.optimizers import Adam\n\
 \n\
 model = Sequential()\n\
-model.add(Dense(64, init=\"glorot_normal\", activation=\"relu\", input_dim=4))\n\
-model.add(Dense(4, init=\"glorot_normal\", activation=\"softmax\"))\n\
+model.add(Dense(64, activation=\"relu\", input_dim=4))\n\
+model.add(Dense(4, activation=\"softmax\"))\n\
 model.compile(loss=\"categorical_crossentropy\", optimizer=Adam(), metrics=[\"accuracy\",])\n\
 model.save(\"kerasModelMulticlass.h5\")\n";
 
diff --git a/tmva/pymva/test/testPyKerasRegression.C b/tmva/pymva/test/testPyKerasRegression.C
index 4313ceba137..030ebb87b90 100644
--- a/tmva/pymva/test/testPyKerasRegression.C
+++ b/tmva/pymva/test/testPyKerasRegression.C
@@ -12,12 +12,11 @@
 TString pythonSrc = "\
 from keras.models import Sequential\n\
 from keras.layers.core import Dense, Activation\n\
-from keras import initializations\n\
 from keras.optimizers import SGD\n\
 \n\
 model = Sequential()\n\
-model.add(Dense(64, init=\"normal\", activation=\"tanh\", input_dim=2))\n\
-model.add(Dense(1, init=\"normal\", activation=\"linear\"))\n\
+model.add(Dense(64, activation=\"tanh\", input_dim=2))\n\
+model.add(Dense(1, activation=\"linear\"))\n\
 model.compile(loss=\"mean_squared_error\", optimizer=SGD(lr=0.01))\n\
 model.save(\"kerasModelRegression.h5\")\n";
 
-- 
GitLab