fix new GraphConv methods' arguments bug. (e704aa98) · Commits · 钟慕尧 / deepchem

examples/benchmark.py

+8 −8

Original line number	Diff line number	Diff line
		@@ -498,22 +498,22 @@ def benchmark_classification(train_dataset,
		with g.as_default():
		tf.set_random_seed(seed)
		graph_model = dc.nn.SequentialGraph(n_features)
		graph_model.add(dc.nn.GraphConv(int(n_filters), activation='relu'))
		graph_model.add(dc.nn.GraphConv(int(n_filters), n_features, activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphPool())
		graph_model.add(dc.nn.GraphConv(int(n_filters), activation='relu'))
		graph_model.add(dc.nn.GraphConv(int(n_filters), int(n_filters), activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphPool())
		# Gather Projection
		graph_model.add(
		dc.nn.Dense(int(n_fully_connected_nodes), activation='relu'))
		dc.nn.Dense(int(n_fully_connected_nodes), int(n_filters), activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphGather(batch_size, activation="tanh"))
		with tf.Session() as sess:
		model_graphconv = dc.models.MultitaskGraphClassifier(
		sess,
		graph_model,
		len(tasks),
		n_features,
		batch_size=batch_size,
		learning_rate=learning_rate,
		optimizer_type="adam",
		@@ -696,22 +696,22 @@ def benchmark_regression(train_dataset,
		with g.as_default():
		tf.set_random_seed(seed)
		graph_model = dc.nn.SequentialGraph(n_features)
		graph_model.add(dc.nn.GraphConv(int(n_filters), activation='relu'))
		graph_model.add(dc.nn.GraphConv(int(n_filters), n_features, activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphPool())
		graph_model.add(dc.nn.GraphConv(int(n_filters), activation='relu'))
		graph_model.add(dc.nn.GraphConv(int(n_filters), int(n_filters), activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphPool())
		# Gather Projection
		graph_model.add(
		dc.nn.Dense(int(n_fully_connected_nodes), activation='relu'))
		dc.nn.Dense(int(n_fully_connected_nodes), int(n_filters), activation='relu'))
		graph_model.add(dc.nn.BatchNormalization(epsilon=1e-5, mode=1))
		graph_model.add(dc.nn.GraphGather(batch_size, activation="tanh"))
		with tf.Session() as sess:
		model_graphconvreg = dc.models.MultitaskGraphRegressor(
		sess,
		graph_model,
		len(tasks),
		n_features,
		batch_size=batch_size,
		learning_rate=learning_rate,
		optimizer_type="adam",

Admin message