Skip to content

Commit 899daa3

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

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

gklearn/kernels/common_walk.py

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def _compute_gm_imap_unordered(self):
7575
# compute Gram matrix.
7676
gram_matrix = np.zeros((len(self._graphs), len(self._graphs)))
7777

78-
def init_worker(gn_toshare):
79-
global G_gn
80-
G_gn = gn_toshare
78+
# def init_worker(gn_toshare):
79+
# global G_gn
80+
# G_gn = gn_toshare
8181

8282
# direct product graph method - exponential
8383
if self.__compute_method == 'exp':
@@ -86,12 +86,17 @@ def init_worker(gn_toshare):
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=init_worker,
90-
glbv=(self._graphs,), n_jobs=self._n_jobs, verbose=self._verbose)
89+
parallel_gm(do_fun, gram_matrix, self._graphs, init_worker=self._init_worker_gm,
90+
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+
95100
def _compute_kernel_list_series(self, g1, g_list):
96101
self.__check_graphs(g_list + [g1])
97102
self.__add_dummy_labels(g_list + [g1])
@@ -130,10 +135,10 @@ def _compute_kernel_list_imap_unordered(self, g1, g_list):
130135
# compute kernel list.
131136
kernel_list = [None] * len(g_list)
132137

133-
def init_worker(g1_toshare, g_list_toshare):
134-
global G_g1, G_g_list
135-
G_g1 = g1_toshare
136-
G_g_list = g_list_toshare
138+
# def init_worker(g1_toshare, g_list_toshare):
139+
# global G_g1, G_g_list
140+
# G_g1 = g1_toshare
141+
# G_g_list = g_list_toshare
137142

138143
# direct product graph method - exponential
139144
if self.__compute_method == 'exp':
@@ -147,12 +152,19 @@ def func_assign(result, var_to_assign):
147152
itr = range(len(g_list))
148153
len_itr = len(g_list)
149154
parallel_me(do_fun, func_assign, kernel_list, itr, len_itr=len_itr,
150-
init_worker=init_worker, glbv=(g1, g_list), method='imap_unordered',
155+
init_worker=self._init_worker_list, glbv=(g1, g_list), method='imap_unordered',
151156
n_jobs=self._n_jobs, itr_desc='calculating kernels', verbose=self._verbose)
152157

153158
return kernel_list
154159

155160

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+
156168
def _wrapper_kernel_list_do_exp(self, itr):
157169
return itr, self.__kernel_do_exp(G_g1, G_g_list[itr], self.__weight)
158170

0 commit comments

Comments
 (0)