Some bugfixes (7576a450) · Commits · 钟慕尧 / deepchem

deepchem/nn/init.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ from __future__ import division
		from __future__ import unicode_literals

		from deepchem.nn.copy import Input
		from deepchem.nn.copy import Dense
		from deepchem.nn.copy import BatchNormalization
		from deepchem.nn.layers import GraphConv
		from deepchem.nn.layers import GraphPool

+10 −9

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ def get_from_module(identifier, module_params, module_name,
		# Raises
		ValueError: if the identifier cannot be found.
		"""
		if isinstance(identifier, str) or isinstance(identifier, unicode):
		#if isinstance(identifier, str) or isinstance(identifier, unicode):
		assert not isinstance(identifier, dict)
		res = module_params.get(identifier)
		if not res:
		raise ValueError('Invalid ' + str(module_name) + ': ' +
		@@ -35,14 +36,14 @@ def get_from_module(identifier, module_params, module_name,
		return res(**kwargs)
		else:
		return res
		elif isinstance(identifier, dict):
		name = identifier.pop('name')
		res = module_params.get(name)
		if res:
		return res(**identifier)
		else:
		raise ValueError('Invalid ' + str(module_name) + ': ' +
		str(identifier))
		#elif isinstance(identifier, dict):
		# name = identifier.pop('name')
		# res = module_params.get(name)
		# if res:
		# return res(**identifier)
		# else:
		# raise ValueError('Invalid ' + str(module_name) + ': ' +
		# str(identifier))
		return identifier

		def softmax(x):