Skip to content

Numba Deprication warning and python fallback fix #3

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

Open
bmabir17-asj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Numba Deprication warning and python fallback fix #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85961f7
fix numba deprication warning
bmabir17-asj Apr 20, 2021
cef88a7
numba deprication warning and python fallback fix
bmabir17-asj Apr 20, 2021
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
52 changes: 30 additions & 22 deletions haze_removal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,24 @@ def open_image(self, img_path):
self.dst = np.zeros_like(self.src, dtype=np.double)


@jit
def get_dark_channel(self, radius=7):
print("Starting to compute dark channel prior...")
start = time.time()
tmp = self.src.min(axis=2)
for i in range(self.rows):
for j in range(self.cols):
@staticmethod
@jit(nopython=True)
def _get_dark_channel(rows,cols,tmp,dark, radius=7):

for i in range(rows):
for j in range(cols):
rmin = max(0,i-radius)
rmax = min(i+radius,self.rows-1)
rmax = min(i+radius,rows-1)
cmin = max(0,j-radius)
cmax = min(j+radius,self.cols-1)
self.dark[i,j] = tmp[rmin:rmax+1,cmin:cmax+1].min()
print("time:",time.time()-start)
cmax = min(j+radius,cols-1)
dark[i,j] = tmp[rmin:rmax+1,cmin:cmax+1].min()
return dark

def get_dark_channel(self, radius=7):
tmp = self.src.min(axis=2)
# get_dark_channel[blockspergrid, threadsperblock]()
# self.dark=self._get_dark_channel[self.blockspergrid, self.threadsperblock](self.rows,self.cols,tmp,self.dark,radius)
self.dark=self._get_dark_channel(self.rows,self.cols,tmp,self.dark,radius)

def get_air_light(self):
print("Starting to compute air light prior...")
Expand All @@ -48,19 +53,22 @@ def get_air_light(self):
# print(self.Alight)
print("time:",time.time()-start)

@jit
def get_transmission(self, radius=7, omega=0.95):
print("Starting to compute transmission...")
start = time.time()
for i in range(self.rows):
for j in range(self.cols):
@staticmethod
@jit(nopython=True)
def _get_transmission(rows,cols,Alight,src,tran,radius=7, omega=0.95):

for i in range(rows):
for j in range(cols):
rmin = max(0,i-radius)
rmax = min(i+radius,self.rows-1)
rmax = min(i+radius,rows-1)
cmin = max(0,j-radius)
cmax = min(j+radius,self.cols-1)
pixel = (self.src[rmin:rmax+1,cmin:cmax+1]/self.Alight).min()
self.tran[i,j] = 1. - omega * pixel
print("time:",time.time()-start)
cmax = min(j+radius,cols-1)
pixel = (src[rmin:rmax+1,cmin:cmax+1]/Alight).min()
tran[i,j] = 1. - omega * pixel
return tran

def get_transmission(self, radius=7, omega=0.95):
self.tran=self._get_transmission(self.rows,self.cols,self.Alight,self.src,self.tran,radius,omega)

def guided_filter(self, r=60, eps=0.001):
print("Starting to compute guided filter trainsmission...")
Expand Down