Skip to content

Commit ca1f2b5

Browse files
committed
Fix pickle problem.
1 parent 899daa3 commit ca1f2b5

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

gklearn/kernels/common_walk.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,12 @@ def _compute_gm_imap_unordered(self):
8686
elif self.__compute_method == 'geo':
8787
do_fun = self._wrapper_kernel_do_geo
8888

89-
parallel_gm(do_fun, gram_matrix, self._graphs, init_worker=self._init_worker_gm,
89+
parallel_gm(do_fun, gram_matrix, self._graphs, init_worker=_init_worker_gm,
9090
glbv=(self._graphs,), n_jobs=self._n_jobs, verbose=self._verbose)
9191

9292
return gram_matrix
9393

9494

95-
def _init_worker_gm(gn_toshare):
96-
global G_gn
97-
G_gn = gn_toshare
98-
99-
10095
def _compute_kernel_list_series(self, g1, g_list):
10196
self.__check_graphs(g_list + [g1])
10297
self.__add_dummy_labels(g_list + [g1])
@@ -152,19 +147,12 @@ def func_assign(result, var_to_assign):
152147
itr = range(len(g_list))
153148
len_itr = len(g_list)
154149
parallel_me(do_fun, func_assign, kernel_list, itr, len_itr=len_itr,
155-
init_worker=self._init_worker_list, glbv=(g1, g_list), method='imap_unordered',
150+
init_worker=_init_worker_list, glbv=(g1, g_list), method='imap_unordered',
156151
n_jobs=self._n_jobs, itr_desc='calculating kernels', verbose=self._verbose)
157152

158153
return kernel_list
159154

160155

161-
def _init_worker_list(g1_toshare, g_list_toshare):
162-
global G_g1, G_g_list
163-
G_g1 = g1_toshare
164-
G_g_list = g_list_toshare
165-
166-
167-
168156
def _wrapper_kernel_list_do_exp(self, itr):
169157
return itr, self.__kernel_do_exp(G_g1, G_g_list[itr], self.__weight)
170158

@@ -291,4 +279,15 @@ def __add_dummy_labels(self, Gn):
291279
if len(self.__edge_labels) == 0 or (len(self.__edge_labels) == 1 and self.__edge_labels[0] == SpecialLabel.DUMMY):
292280
for i in range(len(Gn)):
293281
nx.set_edge_attributes(Gn[i], '0', SpecialLabel.DUMMY)
294-
self.__edge_labels = [SpecialLabel.DUMMY]
282+
self.__edge_labels = [SpecialLabel.DUMMY]
283+
284+
285+
def _init_worker_gm(gn_toshare):
286+
global G_gn
287+
G_gn = gn_toshare
288+
289+
290+
def _init_worker_list(g1_toshare, g_list_toshare):
291+
global G_g1, G_g_list
292+
G_g1 = g1_toshare
293+
G_g_list = g_list_toshare

0 commit comments

Comments
 (0)