Commit c00f6ee7 authored by miaecle's avatar miaecle
Browse files

Merge remote-tracking branch 'remotes/origin/master' into tf0.12

parents ccd934f1 4c1c2bb8
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -23,14 +23,8 @@ install:
- pip install keras
- export KERAS_BACKEND=tensorflow
- conda install -c omnia mdtraj
- pip install tensorflow
- python setup.py install
#- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.12.0rc1-cp27-none-linux_x86_64.whl;
#  -O else export TF_BINARY_URL=https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.12.0rc1-cp35-cp35m-linux_x86_64.whl;
#  -O fi 
#- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then pip install --ignore-installed --upgrade $TF_BINARY_URL;
#  -O else pip3 install --ignore-installed --upgrade $TF_BINARY_URL;
#  -O fi
- conda install -c https://conda.anaconda.org/jjhelmus tensorflow=0.10.0rc0
script:
- nosetests -v deepchem --nologcapture
after_success:
+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ class ProgressiveJointRegressor(TensorflowMultiTaskRegressor):
      train_op = self.get_training_op(
          self.train_graph.graph, self.train_graph.loss)
      with self._get_shared_session(train=True) as sess:
        sess.run(tf.initialize_all_variables())
        sess.run(tf.global_variables_initializer())
        saver = tf.train.Saver(max_to_keep=max_checkpoints_to_keep)
        # Save an initial checkpoint.
        saver.save(sess, self._save_path, global_step=0)