update (f2d3d445) · Commits · 钟慕尧 / deepchem

deepchem/models/tensorflow_models/lr.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -243,8 +243,7 @@ class TensorflowLogisticRegression(TensorflowGraphModel):
		raise ValueError('Unrecognized rank combination for output: %s' %
		(batch_output.shape,))
		output.append(batch_output)

		outputs = np.array(
		from_one_hot(np.squeeze(np.concatenate(output)), axis=-1))
		from_one_hot(np.concatenate(output), axis=-1))

		return np.copy(outputs)

+2 −3

Original line number	Diff line number	Diff line
		@@ -160,7 +160,6 @@ class RobustMultitaskClassifier(TensorflowMultiTaskClassifier):
		task_layer_size = layer_sizes[-1]
		print("Adding output weights of shape %s" % str([task_layer_size, 1]))
		output.append(
		tf.squeeze(
		model_ops.logits(
		task_layer,
		num_classes=2,
		@@ -168,7 +167,7 @@ class RobustMultitaskClassifier(TensorflowMultiTaskClassifier):
		shape=[task_layer_size, 2],
		stddev=weight_init_stddevs[-1]),
		bias_init=tf.constant(
		value=bias_init_consts[-1], shape=[2]))))
		value=bias_init_consts[-1], shape=[2])))
		return (output, labels, weights)


		@@ -328,5 +327,5 @@ class RobustMultitaskRegressor(TensorflowMultiTaskRegressor):
		shape=[task_layer_size, 1],
		stddev=weight_init_stddevs[-1]),
		bias_init=tf.constant(
		value=bias_init_consts[-1], shape=[1]))))
		value=bias_init_consts[-1], shape=[1])), axis=1))
		return (output, labels, weights)

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@ export retval_delaney=$?
		python benchmark.py -d qm7 -m dtnn -m graphconvreg -m tf_regression_ft -m tf_regression --seed 123
		export retval_qm7=$?

		#cd ..
		#nosetests -v devtools/jenkins/compare_results.py --with-xunit \|\| true
		#export retval=$?
		cd ..
		nosetests -v devtools/jenkins/compare_results.py --with-xunit \|\| true
		export retval=$?

		source deactivate
		conda remove --name $envname --all