Added tests; Added missing warnings import in layers.py (c9c38037) · Commits · 钟慕尧 / deepchem

deepchem/models/tensorgraph/layers.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		from __future__ import division
		import random
		import string
		import warnings
		from collections import Sequence
		from copy import deepcopy

deepchem/models/tensorgraph/tensor_graph.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -984,15 +984,15 @@ class TensorGraph(Model):
		return tf.get_collection(
		tf.GraphKeys.TRAINABLE_VARIABLES, scope=layer.variable_scope)

		def get_layer_weights(self, layer):
		def get_layer_variable_values(self, layer):
		"""Get the variable values associated with a given layer """

		layer_variables = self.get_layer_variables(layer)
		if tfe.in_eager_mode():
		return layer_variables
		return [v.numpy() for v in layer_variables]
		if len(layer_variables) == 0:
		return []
		layer_weights = self.session.run(layer_variables)
		return layer_weights
		return self.session.run(layer_variables)

		def get_variables(self):
		"""Get the list of all trainable variables in the graph."""

deepchem/models/tensorgraph/tests/test_tensor_graph.py

+40 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ import deepchem as dc
		from deepchem.data import NumpyDataset
		from deepchem.data.datasets import Databag
		from deepchem.models.tensorgraph.layers import Dense, SoftMaxCrossEntropy, ReduceMean, ReduceSum, SoftMax, Constant, Variable
		from deepchem.models.tensorgraph.layers import Feature, Label
		from deepchem.models.tensorgraph.layers import Feature, Label, Input
		from deepchem.models.tensorgraph.layers import ReduceSquareDifference, Add, GRU
		from deepchem.models.tensorgraph.tensor_graph import TensorGraph
		from deepchem.models.tensorgraph.optimizers import GradientDescent, ExponentialDecay, Adam
		@@ -576,3 +576,42 @@ class TestTensorGraph(unittest.TestCase):
		(1, n_features))).flatten()
		self.assertAlmostEqual(
		pred1[task], (pred2 + norm * delta)[task], places=4)

		def test_get_layer_variable_values(self):
		"""Test to get the variable values associated with a layer"""
		# Test for correct value return (normal mode)
		tg = dc.models.TensorGraph()
		var = Variable([10.0, 12.0])
		tg.add_output(var)
		expected = [10.0, 12.0]
		obtained = tg.get_layer_variable_values(var)[0]
		np.testing.assert_array_almost_equal(expected, obtained)

		# Test for shapes (normal mode)
		tg = dc.models.TensorGraph()
		input_tensor = Input(shape=(10, 100))
		output = Dense(out_channels=20, in_layers=[input_tensor])
		tg.add_output(output)
		expected_shape = (100, 20)
		obtained_shape = tg.get_layer_variable_values(output)[0].shape
		assert expected_shape == obtained_shape

		with context.eager_mode():
		# Test for correct value return (eager mode)
		tg = dc.models.TensorGraph()
		var = Variable([10.0, 12.0])
		tg.add_output(var)
		tg.build()
		expected = [10.0, 12.0]
		obtained = tg.get_layer_variable_values(var)[0]
		np.testing.assert_array_almost_equal(expected, obtained)

		# Test for shape (eager mode)
		tg = dc.models.TensorGraph()
		input_tensor = Input(shape=(10, 100))
		output = Dense(out_channels=20, in_layers=[input_tensor])
		tg.add_output(output)
		tg.build()
		expected_shape = (100, 20)
		obtained_shape = tg.get_layer_variable_values(output)[0].shape
		assert expected_shape == obtained_shape

Admin message