Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed leak #253

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed leak #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions python/classy.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ from libc.string cimport *
import cython
cimport cython

from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free

ctypedef np.float_t DTYPE_t
ctypedef np.int_t DTYPE_i

Expand Down Expand Up @@ -115,17 +117,24 @@ cdef class Class:

def __cinit__(self, default=False):
cpdef char* dumc

self.ready = False
self.allocated = False
self._pars = {}
self.fc.size=0
self.fc.filename = <char*>malloc(sizeof(char)*30)
self.fc.filename = <char*>PyMem_Malloc(sizeof(char)*30)
assert(self.fc.filename!=NULL)
dumc = "NOFILE"
sprintf(self.fc.filename,"%s",dumc)
self.ncp = set()
if default: self.set_default()

def __dealloc__(self):
PyMem_Free(self.fc.filename)
PyMem_Free(self.fc.name)
PyMem_Free(self.fc.value)
PyMem_Free(self.fc.read)

# Set up the dictionary
def set(self,*pars,**kars):
if len(pars)==1:
Expand All @@ -146,17 +155,17 @@ cdef class Class:
cdef char* dumc

if self.fc.size!=0:
free(self.fc.name)
free(self.fc.value)
free(self.fc.read)
PyMem_Free(self.fc.name)
PyMem_Free(self.fc.value)
PyMem_Free(self.fc.read)
self.fc.size = len(self._pars)
self.fc.name = <FileArg*> malloc(sizeof(FileArg)*len(self._pars))
self.fc.name = <FileArg*> PyMem_Malloc(sizeof(FileArg)*len(self._pars))
assert(self.fc.name!=NULL)

self.fc.value = <FileArg*> malloc(sizeof(FileArg)*len(self._pars))
self.fc.value = <FileArg*> PyMem_Malloc(sizeof(FileArg)*len(self._pars))
assert(self.fc.value!=NULL)

self.fc.read = <short*> malloc(sizeof(short)*len(self._pars))
self.fc.read = <short*> PyMem_Malloc(sizeof(short)*len(self._pars))
assert(self.fc.read!=NULL)

# fill parameter file
Expand Down Expand Up @@ -1235,7 +1244,7 @@ cdef class Class:
number_of_titles = len(names)
timesteps = self.ba.bt_size

data = <double*>malloc(sizeof(double)*timesteps*number_of_titles)
data = <double*>PyMem_Malloc(sizeof(double)*timesteps*number_of_titles)

if background_output_data(&self.ba, number_of_titles, data)==_FAILURE_:
raise CosmoSevereError(self.ba.error_message)
Expand All @@ -1248,7 +1257,7 @@ cdef class Class:
background[names[i]][index] = data[index*number_of_titles+i]

free(titles)
free(data)
PyMem_Free(data)
return background

def get_thermodynamics(self):
Expand All @@ -1273,7 +1282,7 @@ cdef class Class:
number_of_titles = len(names)
timesteps = self.th.tt_size

data = <double*>malloc(sizeof(double)*timesteps*number_of_titles)
data = <double*>PyMem_Malloc(sizeof(double)*timesteps*number_of_titles)

if thermodynamics_output_data(&self.ba, &self.th, number_of_titles, data)==_FAILURE_:
raise CosmoSevereError(self.th.error_message)
Expand All @@ -1286,7 +1295,7 @@ cdef class Class:
thermodynamics[names[i]][index] = data[index*number_of_titles+i]

free(titles)
free(data)
PyMem_Free(data)
return thermodynamics

def get_primordial(self):
Expand All @@ -1312,7 +1321,7 @@ cdef class Class:
number_of_titles = len(names)
timesteps = self.pm.lnk_size

data = <double*>malloc(sizeof(double)*timesteps*number_of_titles)
data = <double*>PyMem_Malloc(sizeof(double)*timesteps*number_of_titles)

if primordial_output_data(&self.pt, &self.pm, number_of_titles, data)==_FAILURE_:
raise CosmoSevereError(self.pm.error_message)
Expand All @@ -1325,7 +1334,7 @@ cdef class Class:
primordial[names[i]][index] = data[index*number_of_titles+i]

free(titles)
free(data)
PyMem_Free(data)
return primordial


Expand Down Expand Up @@ -1448,7 +1457,7 @@ cdef class Class:
size_ic_data = timesteps*number_of_titles;
ic_num = self.sp.ic_size[index_md];

data = <double*>malloc(sizeof(double)*size_ic_data*ic_num)
data = <double*>PyMem_Malloc(sizeof(double)*size_ic_data*ic_num)

if spectra_output_tk_data(&self.ba, &self.pt, &self.sp, outf, <double> z, number_of_titles, data)==_FAILURE_:
raise CosmoSevereError(self.sp.error_message)
Expand All @@ -1472,7 +1481,7 @@ cdef class Class:
spectra[ic_key] = tmpdict

free(titles)
free(data)
PyMem_Free(data)

return spectra

Expand Down