fix conflict

Author: yunlongdong

demo/craft_text_detector/main.py

@@ -1,6 +1,6 @@
 import sys
 sys.path.append('../../')
-from cnnumpy import read_onnx
+from npcnn import read_onnx
 import numpy as np
 from matplotlib import pyplot as plt
 from skimage import io, transform

demo/hed_edge_detector/main.py

@@ -1,4 +1,6 @@
-from cnnumpy import read_onnx
+import sys
+sys.path.append('../../')
+from npcnn import read_onnx
 import numpy as np
 from matplotlib import pyplot as plt
 from skimage import io, transform
@@ -24,7 +26,6 @@ def normal(img):
 img = makesize8(img)
 x = normal(img).transpose(2, 0, 1)[None, :, :, :].copy()
 
-
 # 2 files needed, hed.txt, hed.npy
 net = read_onnx('hed')
 y = net(x)

demo/resnet18/main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from cnnumpy import read_onnx
+from npcnn import read_onnx
 from imagenet_labels import classes
 from skimage import io, transform
 from matplotlib import pyplot as plt
@@ -21,4 +21,4 @@
 
 plt.imshow(img.astype('uint8'))
 plt.title(rst)
-plt.show()
+plt.show()

cnnumpy/__init__.py npcnn/__init__.pycnnumpy/__init__.py renamed to npcnn/__init__.py

@@ -43,7 +43,7 @@ def read_onnx(path):
 	with open(path+'.txt') as f:
 		cont = f.read()
 	for i in res: cont = i.sub(parse, cont)
-	#for i in cont.split('\n'): print(i)
+	# for i in cont.split('\n'): print(i)
 	cont = [eval(i) for i in cont.split('\n') if len(i)>0 and i[0]=='[']
 	cont = [[eval(j) if (',' in j) else j for j in i] for i in cont]
 

cnnumpy/io.py npcnn/io.pycnnumpy/io.py renamed to npcnn/io.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='cnnumpy',
+    name='npcnn',
     packages=find_packages()
 )